Use RegexGenerator in .NET 7.

Update Conformance.Tests and MySqlConnector.Tests to target net7.0.

Author: bgrainger

.ci/build-steps.yml

@@ -26,25 +26,25 @@ steps:
   displayName: 'Publish MySqlConnector.Tests'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f net6.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
+    arguments: '-c Release -f net7.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
-    targetPath: 'tests/MySqlConnector.Tests/bin/Release/net6.0/publish'
+    artifactName: 'MySqlConnector.Tests-7.0-$(Agent.OS)'
+    targetPath: 'tests/MySqlConnector.Tests/bin/Release/net7.0/publish'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish Conformance.Tests'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f net6.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
+    arguments: '-c Release -f net7.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'Conformance.Tests-6.0-$(Agent.OS)'
-    targetPath: 'tests/Conformance.Tests/bin/Release/net6.0/publish'
+    artifactName: 'Conformance.Tests-7.0-$(Agent.OS)'
+    targetPath: 'tests/Conformance.Tests/bin/Release/net7.0/publish'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish SideBySide (3.1)'

.ci/conformance-test-steps.yml

@@ -10,14 +10,14 @@ steps:
 - task: DownloadPipelineArtifact@0
   condition: always()
   inputs:
-    artifactName: 'Conformance.Tests-6.0-$(Agent.OS)'
-    targetPath: '$(Build.BinariesDirectory)/6.0'
+    artifactName: 'Conformance.Tests-7.0-$(Agent.OS)'
+    targetPath: '$(Build.BinariesDirectory)/7.0'
 - task: DotNetCoreCLI@2
   displayName: 'Conformance Tests'
   inputs:
     command: 'custom'
     custom: 'vstest'
-    arguments: '$(Build.BinariesDirectory)/6.0/Conformance.Tests.dll /logger:trx'
+    arguments: '$(Build.BinariesDirectory)/7.0/Conformance.Tests.dll /logger:trx'
   env:
     CONNECTION_STRING: ${{ parameters.connectionString }}
 - task: PublishTestResults@2

.ci/mysqlconnector-tests-steps.yml

@@ -1,16 +1,11 @@
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .NET Core'
-  inputs:
-    version: 6.0.x
-    packageType: runtime
 - task: UseDotNet@2
   displayName: 'Install .NET Core'
   inputs:
     version: $(DotNetCoreSdkVersion)
 - task: DownloadPipelineArtifact@0
   inputs:
-    artifactName: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
+    artifactName: 'MySqlConnector.Tests-7.0-$(Agent.OS)'
     targetPath: $(System.DefaultWorkingDirectory)
 - task: DotNetCoreCLI@2
   displayName: 'Run MySqlConnector.Tests'
@@ -22,4 +17,4 @@ steps:
   inputs:
     testResultsFormat: VSTest
     testResultsFiles: '**/*.trx'
-    testRunTitle: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
+    testRunTitle: 'MySqlConnector.Tests-7.0-$(Agent.OS)'

.editorconfig

@@ -105,6 +105,7 @@ dotnet_diagnostic.SA1503.severity = none # Braces should not be omitted.
 dotnet_diagnostic.SA1513.severity = none # Closing brace should be followed by blank line.
 dotnet_diagnostic.SA1516.severity = none # Elements should be separated by blank line.
 dotnet_diagnostic.SA1600.severity = none # Elements should be documented.
+dotnet_diagnostic.SA1601.severity = none # Partial elements should be documented.
 dotnet_diagnostic.SA1602.severity = none # Enumeration items should be documented.
 dotnet_diagnostic.SA1611.severity = none # Element parameters should be documented.
 dotnet_diagnostic.SA1615.severity = none # Element return value should be documented.

src/MySqlConnector/Core/NormalizedSchema.cs

@@ -2,15 +2,20 @@
 
 namespace MySqlConnector.Core;
 
-internal sealed class NormalizedSchema
+internal sealed partial class NormalizedSchema
 {
 	private const string ReQuoted = @"`((?:[^`]|``)+)`";
 	private const string ReUnQuoted = @"([^\.`]+)";
 	private const string ReEither = $@"(?:{ReQuoted}|{ReUnQuoted})";
+	private const string ReName = $@"^\s*{ReEither}\s*(?:\.\s*{ReEither}\s*)?$";
 
-	private static readonly Regex NameRe = new(
-		$@"^\s*{ReEither}\s*(?:\.\s*{ReEither}\s*)?$",
-		RegexOptions.Compiled);
+#if NET7_0_OR_GREATER
+	[RegexGenerator(ReName)]
+	private static partial Regex NameRegex();
+#else
+	private static Regex NameRegex() => s_nameRegex;
+	private static readonly Regex s_nameRegex = new(ReName, RegexOptions.Compiled);
+#endif
 
 	public static NormalizedSchema MustNormalize(string name, string? defaultSchema = null)
 	{
@@ -24,7 +29,7 @@ public static NormalizedSchema MustNormalize(string name, string? defaultSchema
 
 	public NormalizedSchema(string name, string? defaultSchema = null)
 	{
-		var match = NameRe.Match(name);
+		var match = NameRegex().Match(name);
 		if (match.Success)
 		{
 			if (match.Groups[3].Success)

src/MySqlConnector/MySqlConnectionStringBuilder.cs

@@ -874,7 +874,7 @@ protected override void GetProperties(Hashtable propertyDescriptors)
 	private string? m_cachedConnectionStringWithoutPassword;
 }
 
-internal abstract class MySqlConnectionStringOption
+internal abstract partial class MySqlConnectionStringOption
 {
 	// Connection Options
 	public static readonly MySqlConnectionStringReferenceOption<string> Server;
@@ -1045,7 +1045,7 @@ static MySqlConnectionStringOption()
 				Span<bool> versions = stackalloc bool[4];
 				foreach (var part in value!.TrimStart('[', '(').TrimEnd(')', ']').Split(','))
 				{
-					var match = s_tlsVersions.Match(part);
+					var match = TlsVersionsRegex().Match(part);
 					if (!match.Success)
 						throw new ArgumentException($"Unrecognized TlsVersion protocol version '{part}'; permitted versions are: TLS 1.0, TLS 1.1, TLS 1.2, TLS 1.3.");
 					var version = match.Groups[2].Value;
@@ -1233,7 +1233,14 @@ static MySqlConnectionStringOption()
 			defaultValue: true));
 	}
 
-	private static readonly Regex s_tlsVersions = new(@"\s*TLS( ?v?(1|1\.?0|1\.?1|1\.?2|1\.?3))?$", RegexOptions.IgnoreCase);
+	private const string c_tlsVersionsRegexPattern = @"\s*TLS( ?v?(1|1\.?0|1\.?1|1\.?2|1\.?3))?$";
+#if NET7_0_OR_GREATER
+	[RegexGenerator(c_tlsVersionsRegexPattern, RegexOptions.IgnoreCase)]
+	private static partial Regex TlsVersionsRegex();
+#else
+	private static Regex TlsVersionsRegex() => s_tlsVersionsRegex;
+	private static readonly Regex s_tlsVersionsRegex = new(c_tlsVersionsRegexPattern, RegexOptions.IgnoreCase);
+#endif
 	private static readonly Dictionary<string, MySqlConnectionStringOption> s_options;
 
 	private readonly IReadOnlyList<string> m_keys;

tests/Conformance.Tests/Conformance.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <VersionPrefix>0.1.0</VersionPrefix>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
   </PropertyGroup>
 
  <PropertyGroup Condition=" '$(Configuration)' == 'Baseline' ">