Add net7.0 target.

Replace net5.0 (out of support) with net7.0 in build and tests.

Author: bgrainger

.ci/build-steps.yml

@@ -59,16 +59,16 @@ steps:
     targetPath: 'tests/SideBySide/bin/Release/netcoreapp3.1/publish'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Publish SideBySide (5.0)'
+  displayName: 'Publish SideBySide (7.0)'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f net5.0 --no-build tests/SideBySide/SideBySide.csproj'
+    arguments: '-c Release -f net7.0 --no-build tests/SideBySide/SideBySide.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'SideBySide-net5.0-$(Agent.OS)'
-    targetPath: 'tests/SideBySide/bin/Release/net5.0/publish'
+    artifactName: 'SideBySide-net7.0-$(Agent.OS)'
+    targetPath: 'tests/SideBySide/bin/Release/net7.0/publish'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish SideBySide (6.0)'

.ci/integration-tests-steps.yml

@@ -11,11 +11,6 @@ steps:
   inputs:
     version: 3.1.x
     packageType: runtime
-- task: UseDotNet@2
-  displayName: 'Install .NET Core 5.0'
-  inputs:
-    version: '5.0.x'
-    packageType: runtime
 - task: UseDotNet@2
   displayName: 'Install .NET Core 6.0'
   inputs:
@@ -41,7 +36,7 @@ steps:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
     connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600;certificate file=$(Build.Repository.LocalPath)/.ci/server/certs/ssl-client.pfx'
-    platform: 'net5.0'
+    platform: 'net7.0'
     description: 'SSL'
 - template: 'sidebyside-test-steps.yml'
   parameters:

azure-pipelines.yml

@@ -40,10 +40,6 @@ jobs:
       sourceFolder: '.ci/config'
       contents: 'config.json'
       targetFolder: 'tests/SideBySide'
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core 5.0'
-    inputs:
-      version: '5.0.x'
   - task: UseDotNet@2
     displayName: 'Install .NET Core 6.0'
     inputs:
@@ -146,11 +142,6 @@ jobs:
     vmimage: 'windows-2019'
   steps:
   - template: '.ci/install-mysql-windows.yml'
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core 5.0'
-    inputs:
-      version: '5.0.x'
-      packageType: runtime
   - task: UseDotNet@2
     displayName: 'Install .NET Core'
     inputs:
@@ -165,18 +156,18 @@ jobs:
     displayName: 'Remove target frameworks'
     inputs:
       targetType: 'inline'
-      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net5.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net7.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 (net472/net5.0)'
+    displayName: 'Side by Side tests (net472/net7.0)'
     inputs:
       command: 'test'
       projects: 'tests/SideBySide/SideBySide.csproj'
       arguments: '-c Release --no-restore'
-      testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net5.0', 'No SSL') }}
+      testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net7.0', 'No SSL') }}
     env:
       DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Tls11,UnixDomainSocket'
       DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'

src/Directory.Build.props

@@ -20,7 +20,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105</NoWarn>
+    <NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105;SYSLIB0039</NoWarn>
     <MinVerDefaultPreReleasePhase>beta</MinVerDefaultPreReleasePhase>
   </PropertyGroup>
 

src/MySqlConnector/Core/TypeMapper.cs

@@ -107,7 +107,12 @@ private TypeMapper()
 		AddColumnTypeMetadata(new("YEAR", typeInt, MySqlDbType.Year));
 
 		// guid
-		var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: static o => Guid.Parse(Convert.ToString(o, CultureInfo.InvariantCulture)!)));
+#if NET7_0_OR_GREATER
+		Func<object, object> convertGuid = static o => Guid.Parse(Convert.ToString(o, CultureInfo.InvariantCulture)!, CultureInfo.InvariantCulture);
+#else
+		Func<object, object> convertGuid = static o => Guid.Parse(Convert.ToString(o, CultureInfo.InvariantCulture)!);
+#endif
+		var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: convertGuid));
 		AddColumnTypeMetadata(new("CHAR", typeGuid, MySqlDbType.Guid, length: 36, simpleDataTypeName: "CHAR(36)", createFormat: "CHAR(36)"));
 
 		// null

src/MySqlConnector/MySqlConnector.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net461;net471;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;net471;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.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–2022 Bradley Grainger</Copyright>
     <Authors>Bradley Grainger</Authors>

tests/SideBySide/SideBySide.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
-    <TargetFrameworks>net452;net461;net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net452;net461;net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 

tests/SideBySide/SslTests.cs

@@ -218,11 +218,13 @@ public async Task ConnectSslTlsVersion()
 	{
 		using var connection = new MySqlConnection(AppConfig.ConnectionString);
 		await connection.OpenAsync();
+#pragma warning disable SYSLIB0039 // SslProtocols.Tls11 is obsolete
 		var expectedProtocol = AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Tls12) ? SslProtocols.Tls12 :
 			AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Tls11) ? SslProtocols.Tls11 :
 			SslProtocols.Tls;
 		var expectedProtocolString = expectedProtocol == SslProtocols.Tls12 ? "TLSv1.2" :
 			expectedProtocol == SslProtocols.Tls11 ? "TLSv1.1" : "TLSv1";
+#pragma warning restore SYSLIB0039 // SslProtocols.Tls11 is obsolete
 
 #if !NET452 && !NET461 && !NET472
 		// https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#tls-13--openssl-111-on-linux
@@ -242,7 +244,7 @@ public async Task ConnectSslTlsVersion()
 		Assert.Equal(expectedProtocolString, reader.GetString(1));
 	}
 
-#if !NET5_0
+#if !NET5_0_OR_GREATER
 	[SkippableFact(ConfigSettings.RequiresSsl)]
 	public async Task ForceTls11()
 	{