Remove netcoreapp2.1 support. Fixes #1067

bgrainger · bgrainger · commit 080ef446e982 · 2021-10-23T16:20:34.000-07:00
diff --git a/.ci/build-steps.yml b/.ci/build-steps.yml
@@ -46,18 +46,6 @@ steps:
     artifactName: 'Conformance.Tests-6.0-$(Agent.OS)'
     targetPath: 'tests/Conformance.Tests/bin/Release/net6.0/publish'
 
-- task: DotNetCoreCLI@2
-  displayName: 'Publish SideBySide (2.1)'
-  inputs:
-    command: 'publish'
-    arguments: '-c Release -f netcoreapp2.1 --no-build tests/SideBySide/SideBySide.csproj'
-    publishWebProjects: false
-    zipAfterPublish: false
-- task: PublishPipelineArtifact@0
-  inputs:
-    artifactName: 'SideBySide-netcoreapp2.1-$(Agent.OS)'
-    targetPath: 'tests/SideBySide/bin/Release/netcoreapp2.1/publish'
-
 - task: DotNetCoreCLI@2
   displayName: 'Publish SideBySide (3.1)'
   inputs:
diff --git a/.ci/integration-tests-steps.yml b/.ci/integration-tests-steps.yml
@@ -6,13 +6,6 @@ parameters:
 steps:
 - bash: ${{ format('.ci/docker-run.sh {0} 3300 {1}', parameters.image, parameters.unsupportedFeatures) }}
   displayName: 'Start Docker container'
-- template: 'sidebyside-test-steps.yml'
-  parameters:
-    image: ${{ parameters.image }}
-    unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
-    connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
-    platform: 'netcoreapp2.1'
-    description: 'No SSL'
 - task: UseDotNet@2
   displayName: 'Install .NET Core 3.1'
   inputs:
diff --git a/.ci/test.ps1 b/.ci/test.ps1
@@ -39,7 +39,7 @@ if ($LASTEXITCODE -ne 0){
 
 echo "Executing tests with Compression, No SSL"
 Copy-Item -Force ..\..\.ci\config\config.compression.json config.json
-dotnet test -c Release -f netcoreapp2.1
+dotnet test -c Release -f netcoreapp3.1
 if ($LASTEXITCODE -ne 0){
     exit $LASTEXITCODE;
 }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -90,11 +90,6 @@ jobs:
     vmimage: 'windows-latest'
   steps:
   - template: '.ci/install-mysql-windows.yml'
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core 2.1'
-    inputs:
-      version: '2.1.x'
-      packageType: runtime
   - task: UseDotNet@2
     displayName: 'Install .NET Core 3.1'
     inputs:
@@ -163,9 +158,9 @@ jobs:
   steps:
   - template: '.ci/install-mysql-windows.yml'
   - task: UseDotNet@2
-    displayName: 'Install .NET Core 2.1'
+    displayName: 'Install .NET Core 3.1'
     inputs:
-      version: '2.1.x'
+      version: 3.1.x
       packageType: runtime
   - task: UseDotNet@2
     displayName: 'Install .NET Core'
@@ -177,18 +172,18 @@ jobs:
     displayName: 'Remove target frameworks'
     inputs:
       targetType: 'inline'
-      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
   - task: DotNetCoreCLI@2
     displayName: 'Restore packages'
     inputs:
       command: 'restore'
   - task: DotNetCoreCLI@2
-    displayName: 'Side by Side tests (netcoreapp2.1/netcoreapp3.1)'
+    displayName: 'Side by Side tests (netcoreapp3.1/net6.0)'
     inputs:
       command: 'test'
       projects: 'tests/SideBySide/SideBySide.csproj'
-      arguments: '-c Release -f netcoreapp2.1 --no-restore'
-      testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp2.1/netcoreapp3.1', 'No SSL') }}
+      arguments: '-c Release --no-restore'
+      testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp3.1/net6.0', 'No SSL') }}
     env:
       DATA__UNSUPPORTEDFEATURES: 'Ed25519,Tls11,UnixDomainSocket'
       DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
diff --git a/src/MySqlConnector/MySqlConnector.csproj b/src/MySqlConnector/MySqlConnector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net461;net471;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;net471;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <Description>A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Percona Server, Amazon Aurora, Azure Database for MySQL and more.</Description>
     <Copyright>Copyright 2016–2021 Bradley Grainger</Copyright>
     <Authors>Bradley Grainger</Authors>
@@ -26,7 +26,7 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net471' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net471' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
   </ItemGroup>
 
diff --git a/tests/SideBySide/AppConfig.cs b/tests/SideBySide/AppConfig.cs
@@ -19,9 +19,6 @@ private static IConfiguration BuildConfiguration()
 	{
 		var builder = new ConfigurationBuilder()
 			.AddInMemoryCollection(DefaultConfig)
-#if NETCOREAPP2_1
-			.SetBasePath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
-#endif
 			.AddJsonFile("config.json")
 			.AddEnvironmentVariables();
 		return builder.Build();
diff --git a/tests/SideBySide/SideBySide.csproj b/tests/SideBySide/SideBySide.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
-    <TargetFrameworks>net452;net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;net461;net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
diff --git a/tests/SideBySide/SslTests.cs b/tests/SideBySide/SslTests.cs
@@ -224,7 +224,7 @@ public async Task ConnectSslTlsVersion()
 		var expectedProtocolString = expectedProtocol == SslProtocols.Tls12 ? "TLSv1.2" :
 			expectedProtocol == SslProtocols.Tls11 ? "TLSv1.1" : "TLSv1";
 
-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1
+#if !NET452 && !NET461 && !NET472
 		// https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#tls-13--openssl-111-on-linux
 		if (expectedProtocol == SslProtocols.Tls12 && AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Tls13) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
 		{
diff --git a/tests/SideBySide/Transaction.cs b/tests/SideBySide/Transaction.cs
@@ -169,7 +169,7 @@ public async Task ReadWriteTransactionAsync()
 		Assert.Equal(new[] { 1, 2 }, results);
 	}
 
-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1
+#if !NET452 && !NET461 && !NET472
 	[Fact]
 	public async Task DbConnectionCommitAsync()
 	{
@@ -241,7 +241,7 @@ public async Task RollbackDisposeAsync()
 		Assert.Equal(new int[0], results);
 	}
 
-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1
+#if !NET452 && !NET461 && !NET472
 	[Fact]
 	public async Task DbConnectionRollbackAsync()
 	{

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ if ($LASTEXITCODE -ne 0){`
`39`	`39`
`40`	`40`	`echo "Executing tests with Compression, No SSL"`
`41`	`41`	`Copy-Item -Force ..\..\.ci\config\config.compression.json config.json`
`42`		`-dotnet test -c Release -f netcoreapp2.1`
	`42`	`+dotnet test -c Release -f netcoreapp3.1`
`43`	`43`	`if ($LASTEXITCODE -ne 0){`
`44`	`44`	`exit $LASTEXITCODE;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public async Task ConnectSslTlsVersion()`
`224`	`224`	`var expectedProtocolString = expectedProtocol == SslProtocols.Tls12 ? "TLSv1.2" :`
`225`	`225`	`expectedProtocol == SslProtocols.Tls11 ? "TLSv1.1" : "TLSv1";`
`226`	`226`
`227`		`-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1`
	`227`	`+#if !NET452 && !NET461 && !NET472`
`228`	`228`	`// https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#tls-13--openssl-111-on-linux`
`229`	`229`	`if (expectedProtocol == SslProtocols.Tls12 && AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Tls13) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`230`	`230`	`{`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public async Task ReadWriteTransactionAsync()`
`169`	`169`	`Assert.Equal(new[] { 1, 2 }, results);`
`170`	`170`	`}`
`171`	`171`
`172`		`-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1`
	`172`	`+#if !NET452 && !NET461 && !NET472`
`173`	`173`	`[Fact]`
`174`	`174`	`public async Task DbConnectionCommitAsync()`
`175`	`175`	`{`
`@@ -241,7 +241,7 @@ public async Task RollbackDisposeAsync()`
`241`	`241`	`Assert.Equal(new int[0], results);`
`242`	`242`	`}`
`243`	`243`
`244`		`-#if !NET452 && !NET461 && !NET472 && !NETCOREAPP2_1`
	`244`	`+#if !NET452 && !NET461 && !NET472`
`245`	`245`	`[Fact]`
`246`	`246`	`public async Task DbConnectionRollbackAsync()`
`247`	`247`	`{`