github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview2' into dev

Browse Source
This commit is contained in:
Steve Sanderson
2017-06-13 09:47:18 +01:00
parent 627da65692 a38d3bdc4b
commit a7a3a359fa
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/AngularSpa/AngularSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />

2
templates/AureliaSpa/AureliaSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />

2
templates/KnockoutSpa/KnockoutSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />

2
templates/ReactReduxSpa/ReactReduxSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />

2
templates/ReactSpa/ReactSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />

2
templates/VueSpa/VueSpa.csproj
View File

@@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25661" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25407-01" /> <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />