huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct all the 2.0 projects to reference 2.0 dependencies, not 2.1.0-*

This commit is contained in:
Steve Sanderson 2017-09-11 15:40:03 +01:00
parent 7ab3ed2e74
commit 692faf10ac
15 changed files with 79 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TemplateDependencies.props
View File

@ -14,7 +14,9 @@
values can be replaced by hardcoded values (e.g., '2.1.0') when we values can be replaced by hardcoded values (e.g., '2.1.0') when we
branch for a release. branch for a release.
--> -->
<TemplateDep_AspNetCore_2_0>2.0.0</TemplateDep_AspNetCore_2_0>
<TemplateDep_AspNetCore_2_1>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore')->Metadata('Version'))</TemplateDep_AspNetCore_2_1> <TemplateDep_AspNetCore_2_1>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore')->Metadata('Version'))</TemplateDep_AspNetCore_2_1>
<TemplateDep_EntityFramework_2_0>2.0.0</TemplateDep_EntityFramework_2_0>
<TemplateDep_EntityFramework_2_1>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.EntityFrameworkCore')->Metadata('Version'))</TemplateDep_EntityFramework_2_1> <TemplateDep_EntityFramework_2_1>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.EntityFrameworkCore')->Metadata('Version'))</TemplateDep_EntityFramework_2_1>
</PropertyGroup> </PropertyGroup>

2
src/Directory.Build.targets
View File

@ -13,7 +13,9 @@
<Target Name="InjectVersionsIntoProjectFilesInPackage" AfterTargets="Pack"> <Target Name="InjectVersionsIntoProjectFilesInPackage" AfterTargets="Pack">
<ItemGroup> <ItemGroup>
<Substitution Include="TemplateDep_AspNetCore_2_0" Value="$(TemplateDep_AspNetCore_2_0)" />
<Substitution Include="TemplateDep_AspNetCore_2_1" Value="$(TemplateDep_AspNetCore_2_1)" /> <Substitution Include="TemplateDep_AspNetCore_2_1" Value="$(TemplateDep_AspNetCore_2_1)" />
<Substitution Include="TemplateDep_EntityFramework_2_0" Value="$(TemplateDep_EntityFramework_2_0)" />
<Substitution Include="TemplateDep_EntityFramework_2_1" Value="$(TemplateDep_EntityFramework_2_1)" /> <Substitution Include="TemplateDep_EntityFramework_2_1" Value="$(TemplateDep_EntityFramework_2_1)" />
</ItemGroup> </ItemGroup>
<SubstituteProjectFileVariables <SubstituteProjectFileVariables

10
src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/AureliaSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/KnockoutSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/VueSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-CSharp/Company.WebApplication1.csproj
View File

@ -10,10 +10,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj
View File

@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

30
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj
View File

@ -10,28 +10,28 @@
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" /> <None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_1)" PrivateAssets="All" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_0)" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(TemplateDep_EntityFramework_2_1)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(TemplateDep_EntityFramework_2_0)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(TemplateDep_EntityFramework_2_1)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(TemplateDep_EntityFramework_2_0)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" Condition="'$(UseBrowserLink)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" Condition="'$(UseBrowserLink)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(NoTools)' != 'True'"> <ItemGroup Condition="'$(NoTools)' != 'True'">
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(TemplateDep_EntityFramework_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(TemplateDep_EntityFramework_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup> </ItemGroup>

30
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Company.WebApplication1.csproj
View File

@ -15,29 +15,29 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_1)" PrivateAssets="All" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_0)" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(TemplateDep_EntityFramework_2_1)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(TemplateDep_EntityFramework_2_0)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(TemplateDep_EntityFramework_2_1)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(TemplateDep_EntityFramework_2_0)" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_1)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(TemplateDep_EntityFramework_2_0)" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" Condition="'$(UseBrowserLink)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" Condition="'$(UseBrowserLink)' == 'True'" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(NoTools)' != 'True'"> <ItemGroup Condition="'$(NoTools)' != 'True'">
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(TemplateDep_EntityFramework_2_1)" Condition="'$(IndividualLocalAuth)' == 'True'" /> <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(TemplateDep_EntityFramework_2_0)" Condition="'$(IndividualLocalAuth)' == 'True'" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup> </ItemGroup>

10
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-FSharp/Company.WebApplication1.fsproj
View File

@ -14,13 +14,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_1)" PrivateAssets="All" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="$(TemplateDep_AspNetCore_2_0)" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-CSharp/Company.WebApplication1.csproj
View File

@ -13,12 +13,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(TemplateDep_AspNetCore_2_1)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(TemplateDep_AspNetCore_2_0)" Condition="'$(OrganizationalAuth)' == 'True' OR '$(IndividualB2CAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/WebApi-FSharp/Company.WebApplication1.fsproj
View File

@ -12,11 +12,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/AngularSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ReactSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ReactReduxSpa.csproj
View File

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
<PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="$(TemplateDep_AspNetCore_2_0)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_1)" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(TemplateDep_AspNetCore_2_0)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>