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

Move 2.1 templates to netcoreapp2.0 until we use an SDK that supports netcoreapp2.1

This commit is contained in:
Steve Sanderson 2017-09-11 18:53:59 +01:00
parent 8c0dd1d2cc
commit c39c1aaa38
8 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

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

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

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

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>

8
test/Templates.Test/Helpers/TemplatePackageInstaller.cs
View File

@ -15,15 +15,11 @@ namespace Templates.Test.Helpers
"Microsoft.DotNet.Web.Client.ItemTemplates",
"Microsoft.DotNet.Web.ItemTemplates",
"Microsoft.DotNet.Web.ProjectTemplates.2.0",
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
"Microsoft.DotNet.Web.Spa.ProjectTemplates",
"Microsoft.AspNetCore.SpaTemplates",
};
private static readonly string[] _extraTemplatePackagesToUninstall = new[]
{
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
};
public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper output)
{
lock (_templatePackagesReinstallationLock)
@ -39,7 +35,7 @@ namespace Templates.Test.Helpers
private static void ReinstallTemplatePackages(ITestOutputHelper output)
{
// Remove any previous or prebundled version of the template packages
foreach (var packageName in _templatePackages.Concat(_extraTemplatePackagesToUninstall))
foreach (var packageName in _templatePackages)
{
var proc = ProcessEx.Run(
output,