Skip to content

Commit 5d16f97

Browse files
natemcmasternatemcmaster
authored
Remove netcoreapp2.0 test TFMs (#6461)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.
1 parent 973b4b2 commit 5d16f97

File tree

234 files changed

+275
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+275
-398
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
</PropertyGroup>
3939

4040
<PropertyGroup>
41-
<StandardTestTfms>netcoreapp2.1;net461</StandardTestTfms>
4241
<!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
4342
<MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
4443
</PropertyGroup>

‎build/tasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
33

44
<PropertyGroup>
5-
<TargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.1</TargetFramework>
66
<TargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core' ">net461</TargetFramework>
77
</PropertyGroup>
88

‎src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/AuthSamples/samples/ClaimsTransformation/ClaimsTransformation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/AuthSamples/samples/Cookies/Cookies.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/AuthSamples/samples/DynamicSchemes/DynamicSchemes.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCorePackageVersion)" />

‎src/AuthSamples/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
44
<UserSecretsId>aspnet-Identity.ExternalClaims-E95BE154-CB1B-4633-A2E0-B2DF12FE8BD3</UserSecretsId>
55
</PropertyGroup>
66
<ItemGroup>

‎src/AuthSamples/samples/PathSchemeSelection/PathSchemeSelection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
</PropertyGroup>
66

77
<!-- Workaround for https://github.com/dotnet/sdk/issues/1729 -->

‎src/AuthSamples/test/AuthSamples.FunctionalTests/TestServices.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,7 @@ public static async Task RunSiteTest(
4444
{
4545
var logger = loggerFactory.CreateLogger(siteName);
4646
var targetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" :
47-
#if NETCOREAPP2_0
48-
"netcoreapp2.0";
49-
#elif NETCOREAPP2_1
5047
"netcoreapp2.1";
51-
#else
52-
#error Target frameworks need to be updated.
53-
#endif
5448

5549
var deploymentParameters = new DeploymentParameters(GetApplicationDirectory(siteName), serverType, runtimeFlavor, architecture)
5650
{

0 commit comments

Comments
 (0)