Merge net6 branch into master.

Author: bgrainger

.ci/build-steps.yml

@@ -81,3 +81,15 @@ steps:
   inputs:
     artifactName: 'SideBySide-net5.0-$(Agent.OS)'
     targetPath: 'tests/SideBySide/bin/Release/net5.0/publish'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Publish SideBySide (6.0)'
+  inputs:
+    command: 'publish'
+    arguments: '-c Release -f net6.0 --no-build tests/SideBySide/SideBySide.csproj'
+    publishWebProjects: false
+    zipAfterPublish: false
+- task: PublishPipelineArtifact@0
+  inputs:
+    artifactName: 'SideBySide-net6.0-$(Agent.OS)'
+    targetPath: 'tests/SideBySide/bin/Release/net6.0/publish'

.ci/integration-tests-steps.yml

@@ -22,6 +22,11 @@ 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'
   inputs:
@@ -38,26 +43,26 @@ 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: 'netcoreapp3.1'
+    platform: 'net5.0'
     description: 'SSL'
 - 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;UseCompression=True;DefaultCommandTimeout=3600'
-    platform: 'netcoreapp3.1'
+    platform: 'net5.0'
     description: 'Compression'
 - 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: 'net5.0'
+    platform: 'net6.0'
     description: 'No SSL'
 - 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=required;DefaultCommandTimeout=3600;certificate file=$(Build.Repository.LocalPath)/.ci/server/certs/ssl-client.pfx'
-    platform: 'net5.0'
+    platform: 'net6.0'
     description: 'SSL'

.ci/mysqlconnector-tests-steps.yml

@@ -1,4 +1,9 @@
 steps:
+- task: UseDotNet@2
+  displayName: 'Install .NET Core 5.0'
+  inputs:
+    version: '5.0.x'
+    packageType: runtime
 - task: UseDotNet@2
   displayName: 'Install .NET Core'
   inputs:

.github/workflows/publish-package.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up .NET 5.0
+    - name: Set up .NET 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.102
+        dotnet-version: 6.0.100-preview.5.21302.13
 
     - name: Restore
       run: dotnet restore

.github/workflows/sonarcloud.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up .NET 5.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: '5.0.x'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # fetch all revisions
@@ -48,6 +48,10 @@ jobs:
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
       - name: Install minver
         run: dotnet tool install --global minver-cli
+      - name: Set up .NET 6.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.100-preview.5.21302.13
       - name: Restore Packages
         run: dotnet restore
       - name: Build and analyze

appveyor.yml

@@ -9,8 +9,9 @@ cache:
   - '%USERPROFILE%\.nuget\packages -> **\*.csproj'
 install:
   - ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
-  - ps: .\install-dotnet.ps1 -Version 3.1.409 -InstallDir "dotnetcli"
-  - ps: .\install-dotnet.ps1 -Version 5.0.300 -InstallDir "dotnetcli"
+  - ps: .\install-dotnet.ps1 -Version 3.1.410 -InstallDir "dotnetcli"
+  - ps: .\install-dotnet.ps1 -Version 5.0.301 -InstallDir "dotnetcli"
+  - ps: .\install-dotnet.ps1 -Version 6.0.100-preview.5.21302.13 -InstallDir "dotnetcli"
 build_script:
 - dotnet --info
 before_test:

azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables:
-  DotNetCoreSdkVersion: '5.0.102'
+  DotNetCoreSdkVersion: '6.0.100-preview.5.21302.13'
   NUGET_PACKAGES: '$(Pipeline.Workspace)/.nuget/packages'
 
 jobs:
@@ -41,27 +41,15 @@ jobs:
       contents: 'config.json'
       targetFolder: 'tests/SideBySide'
   - task: UseDotNet@2
-    displayName: 'Install .NET Core'
-    inputs:
-      version: $(DotNetCoreSdkVersion)
-  - task: DotNetCoreCLI@2
-    displayName: 'Restore packages'
+    displayName: 'Install .NET Core 5.0'
     inputs:
-      command: 'restore'
-      arguments: 'tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj /p:Configuration=Baseline'
-      verbosityRestore: 'minimal'
+      version: '5.0.x'
   - task: DotNetCoreCLI@2
     displayName: 'Unit tests'
     inputs:
       command: 'test'
       arguments: 'tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj -c Baseline'
       testRunTitle: 'Baseline unit tests'
-  - task: DotNetCoreCLI@2
-    displayName: 'Restore packages'
-    inputs:
-      command: 'restore'
-      arguments: 'tests\SideBySide\SideBySide.csproj /p:Configuration=Baseline'
-      verbosityRestore: 'minimal'
   - task: DotNetCoreCLI@2
     displayName: 'Baseline tests'
     inputs:
@@ -108,6 +96,11 @@ jobs:
     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'
     inputs:
@@ -124,6 +117,11 @@ jobs:
     vmimage: 'windows-latest'
   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:

src/MySqlConnector/Core/ConnectionPool.cs

@@ -158,10 +158,10 @@ private int GetSessionHealth(ServerSession session)
 			return 0;
 		}
 
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
-		public async ValueTask<int> ReturnAsync(IOBehavior ioBehavior, ServerSession session)
-#else
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		public async ValueTask ReturnAsync(IOBehavior ioBehavior, ServerSession session)
+#else
+		public async ValueTask<int> ReturnAsync(IOBehavior ioBehavior, ServerSession session)
 #endif
 		{
 			if (Log.IsDebugEnabled())
@@ -193,7 +193,7 @@ public async ValueTask ReturnAsync(IOBehavior ioBehavior, ServerSession session)
 				m_sessionSemaphore.Release();
 			}
 
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
+#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
 			return default;
 #endif
 		}

src/MySqlConnector/Core/ConnectionSettings.cs

@@ -75,7 +75,7 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)
 						TlsVersions |= SslProtocols.Tls11;
 					else if (minorVersion == '2')
 						TlsVersions |= SslProtocols.Tls12;
-#if !NET45 && !NET461 && !NET471 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETCOREAPP2_1
+#if NETCOREAPP3_0_OR_GREATER
 					else if (minorVersion == '3')
 						TlsVersions |= SslProtocols.Tls13;
 #endif
@@ -88,9 +88,7 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)
 
 			if (csb.TlsCipherSuites != "")
 			{
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1
-				throw new PlatformNotSupportedException("The TlsCipherSuites connection string option is only supported on .NET Core 3.1 (or later) on Linux.");
-#else
+#if NETCOREAPP3_0_OR_GREATER
 				var tlsCipherSuites = new List<TlsCipherSuite>();
 				foreach (var token in csb.TlsCipherSuites.Split(','))
 				{
@@ -105,6 +103,8 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)
 						throw new NotSupportedException("Unknown value '{0}' for TlsCipherSuites.".FormatInvariant(suiteName));
 				}
 				TlsCipherSuites = tlsCipherSuites;
+#else
+				throw new PlatformNotSupportedException("The TlsCipherSuites connection string option is only supported on .NET Core 3.1 (or later) on Linux.");
 #endif
 			}
 
@@ -201,7 +201,7 @@ private static MySqlGuidFormat GetEffectiveGuidFormat(MySqlGuidFormat guidFormat
 		public MySqlCertificateStoreLocation CertificateStoreLocation { get; }
 		public string CertificateThumbprint { get; }
 		public SslProtocols TlsVersions { get; }
-#if !NET45 && !NET461 && !NET471 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETSTANDARD2_1 && !NETCOREAPP2_1
+#if NETCOREAPP3_0_OR_GREATER
 		public IReadOnlyList<TlsCipherSuite>? TlsCipherSuites { get; }
 #endif
 

src/MySqlConnector/Core/Row.cs

@@ -552,14 +552,14 @@ protected object ParseDateTime(ReadOnlySpan<byte> value)
 		protected unsafe static Guid CreateGuidFromBytes(MySqlGuidFormat guidFormat, ReadOnlySpan<byte> bytes) =>
 			guidFormat switch
 			{
-#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
-				MySqlGuidFormat.Binary16 => new Guid(new[] { bytes[3], bytes[2], bytes[1], bytes[0], bytes[5], bytes[4], bytes[7], bytes[6], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
-				MySqlGuidFormat.TimeSwapBinary16 => new Guid(new[] { bytes[7], bytes[6], bytes[5], bytes[4], bytes[3], bytes[2], bytes[1], bytes[0], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
-				_ => new Guid(bytes.ToArray()),
-#else
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 				MySqlGuidFormat.Binary16 => new Guid(stackalloc byte[16] { bytes[3], bytes[2], bytes[1], bytes[0], bytes[5], bytes[4], bytes[7], bytes[6], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
 				MySqlGuidFormat.TimeSwapBinary16 => new Guid(stackalloc byte[16] { bytes[7], bytes[6], bytes[5], bytes[4], bytes[3], bytes[2], bytes[1], bytes[0], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
 				_ => new Guid(bytes),
+#else
+				MySqlGuidFormat.Binary16 => new Guid(new[] { bytes[3], bytes[2], bytes[1], bytes[0], bytes[5], bytes[4], bytes[7], bytes[6], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
+				MySqlGuidFormat.TimeSwapBinary16 => new Guid(new[] { bytes[7], bytes[6], bytes[5], bytes[4], bytes[3], bytes[2], bytes[1], bytes[0], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
+				_ => new Guid(bytes.ToArray()),
 #endif
 			};