Skip to content

Commit c39c1aa

Browse files
SteveSandersonMSSteveSandersonMS
committed
Move 2.1 templates to netcoreapp2.0 until we use an SDK that supports netcoreapp2.1
1 parent 8c0dd1d commit c39c1aa

File tree

8 files changed

+23
-27
lines changed

8 files changed

+23
-27
lines changed

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-CSharp/Company.WebApplication1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/RazorPagesWeb-CSharp/Company.WebApplication1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
3+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
44
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
5-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
6-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
5+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
6+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
77

88
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
99
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Company.WebApplication1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
88

99
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
1010
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-FSharp/Company.WebApplication1.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
88

99
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
1010
</PropertyGroup>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-CSharp/Company.WebApplication1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">$(TemplateDep_RuntimeFramework_2_1)</NETStandardImplicitPackageVersion>
88

99
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
1010
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>

‎src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-FSharp/Company.WebApplication1.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6-
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7-
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.1'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
6+
<RuntimeFrameworkVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</RuntimeFrameworkVersion>
7+
<NETStandardImplicitPackageVersion Condition="'$(Framework)' == 'netcoreapp2.0'">TemplateDep_RuntimeFramework_2_1</NETStandardImplicitPackageVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎test/Templates.Test/Helpers/TemplatePackageInstaller.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ internal static class TemplatePackageInstaller
1515
"Microsoft.DotNet.Web.Client.ItemTemplates",
1616
"Microsoft.DotNet.Web.ItemTemplates",
1717
"Microsoft.DotNet.Web.ProjectTemplates.2.0",
18+
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
1819
"Microsoft.DotNet.Web.Spa.ProjectTemplates",
1920
"Microsoft.AspNetCore.SpaTemplates",
2021
};
2122

22-
private static readonly string[] _extraTemplatePackagesToUninstall = new[]
23-
{
24-
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
25-
};
26-
2723
public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper output)
2824
{
2925
lock (_templatePackagesReinstallationLock)
@@ -39,7 +35,7 @@ public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper outpu
3935
private static void ReinstallTemplatePackages(ITestOutputHelper output)
4036
{
4137
// Remove any previous or prebundled version of the template packages
42-
foreach (var packageName in _templatePackages.Concat(_extraTemplatePackagesToUninstall))
38+
foreach (var packageName in _templatePackages)
4339
{
4440
var proc = ProcessEx.Run(
4541
output,

0 commit comments

Comments
 (0)