mirror of
https://github.com/aspnet/JavaScriptServices.git
synced 2025-12-22 17:47:53 +00:00
Merge branch 'rel/2.0.0-preview2' into dev
This commit is contained in:
@@ -10,18 +10,18 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-preview2-25571" />
|
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-25571" />
|
<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-25407-01" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-25661" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25571" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-25661" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user