WL#16900 [Add support for .NET 10 and EF Core 10 preview versions]

omachavez · omachavez · commit bba491124b55 · 2025-06-08T14:16:38.000-06:00
Change-Id: I88fe42227d9485f632706060b0ab2f2329f19550
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,7 @@
 - Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
 - Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
 - Added support for GSSAPI/Kerberos authentication on Windows using authentication_ldap_sasl_client plug-in (WL15984).
+- Added support for .NET 10 and EF Core 10 preview versions (WL16900).
 
 
 9.3.0
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -53,7 +53,7 @@ public MySQLHistoryRepository([NotNull] HistoryRepositoryDependencies dependenci
       : base(dependencies)
     {
     }
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override LockReleaseBehavior LockReleaseBehavior => LockReleaseBehavior.Connection;
 
     public override IMigrationsDatabaseLock AcquireDatabaseLock()
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
@@ -33,7 +33,7 @@
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
-#if NET9_0
+#if NET9_0_OR_GREATER
   internal class MySQLMigrationDatabaseLock(
    IRelationalCommand releaseLockCommand,
     RelationalCommandParameterObject relationalCommandParameters,
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -79,7 +79,7 @@ protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffConte
       return base.Add(target, diffContext, inline);
     }
 
-#elif NET9_0
+#elif NET9_0_OR_GREATER
     public MySQLMigrationsModelDiffer(
   [NotNull] IRelationalTypeMappingSource typeMappingSource,
   [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrator.cs b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
@@ -47,7 +47,7 @@
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
-#if NET9_0
+#if NET9_0_OR_GREATER
   public class MySQLMigrator : IMigrator
   {
     private readonly IMigrationsAssembly _migrationsAssembly;
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
@@ -36,6 +36,11 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.5.25277.114" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.5.25277.114" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
   </ItemGroup>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
@@ -47,7 +47,12 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
 [assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.4.0")]
+[assembly: AssemblyInformationalVersion("9.0.3.0+MySQL9.4.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+#elif NET10_0
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("10.0.0.0-preview+MySQL9.4.0")]
 [assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
@@ -61,7 +61,7 @@ public MySQLBinaryExpression(
       Right = right;
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
     public virtual MySQLBinaryExpressionOperatorType OperatorType { get; }
@@ -81,7 +81,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(left, right);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     /// <inheritdoc />
     public override Expression Quote() => New(
       _quotingConstructor ??= typeof(MySQLBinaryExpression).GetConstructor(
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
@@ -45,11 +45,11 @@ internal class MySQLCollateExpression : SqlExpression
     private readonly string _charset;
     private readonly string _collation;
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public MySQLCollateExpression(SqlExpression operand, string collation)
     : base(operand.Type, operand.TypeMapping)
     {
@@ -81,7 +81,7 @@ public MySQLCollateExpression(
     /// </summary>
     public virtual string Charset => _charset;
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     /// <summary>
     ///   The expression on which collation is applied.
     /// </summary>
@@ -126,7 +126,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public virtual MySQLCollateExpression Update(SqlExpression operand)
         => operand != Operand
             ? new MySQLCollateExpression(operand, Collation)
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   /// </summary>
   internal class MySQLColumnAliasReferenceExpression : SqlExpression, IEquatable<MySQLColumnAliasReferenceExpression>
   {
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -72,7 +72,7 @@ public virtual MySQLColumnAliasReferenceExpression Update(
     ? this
     : new MySQLColumnAliasReferenceExpression(alias, expression, Type, TypeMapping!);
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLColumnAliasReferenceExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Constant(Alias),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLComplexFunctionArgumentExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -80,7 +80,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(argumentParts, Delimiter);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLComplexFunctionArgumentExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Constant(ArgumentParts),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
@@ -41,7 +41,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLJsonArrayIndexExpression : SqlExpression, IEquatable<MySQLJsonArrayIndexExpression>
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -60,7 +60,7 @@ public MySQLJsonArrayIndexExpression(
     protected override Expression VisitChildren(ExpressionVisitor visitor)
       => Update((SqlExpression)visitor.Visit(Expression));
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLJsonArrayIndexExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Expression.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
@@ -44,7 +44,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLJsonTraversalExpression : SqlExpression, IEquatable<MySQLJsonTraversalExpression>
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
     /// <summary>
@@ -96,7 +96,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     => Update((SqlExpression)visitor.Visit(Expression),
       Path.Select(p => (SqlExpression)visitor.Visit(p)).ToArray());
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLJsonTraversalExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Expression.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLMatchExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -81,7 +81,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, against);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Match.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
@@ -38,7 +38,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLRegexpExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -75,7 +75,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, pattern);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Match.Quote(),
diff --git a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
@@ -100,7 +100,7 @@ public MySQLDateTimeMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
         typeof(string))
             },
             nullable: true,
-#if !NET9_0
+#if !NET9_0_OR_GREATER
             argumentsPropagateNullability: TrueArrays[1],
 #else
             argumentsPropagateNullability: new[] { true, false },
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -39,7 +39,7 @@ internal class MySQLParameterBasedSqlProcessor : RelationalParameterBasedSqlProc
   {
     private readonly IMySQLOptions _options;
 
-#if !NET9_0
+#if !NET9_0_OR_GREATER
     public MySQLParameterBasedSqlProcessor(
       RelationalParameterBasedSqlProcessorDependencies dependencies,
       bool useRelationalNulls,
@@ -69,7 +69,7 @@ protected override Expression ProcessSqlNullability(
 
       return new MySQLSqlNullabilityProcessor(Dependencies, UseRelationalNulls).Process(selectExpression, parametersValues, out canCache);
     }
-#elif NET9_0
+#elif NET9_0_OR_GREATER
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
@@ -42,7 +42,7 @@ public MySQLParameterBasedSqlProcessorFactory(RelationalParameterBasedSqlProcess
       _options = options;
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters)
       => new MySQLParameterBasedSqlProcessor(_dependencies, parameters, _options);
 #else
diff --git a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
@@ -141,7 +141,7 @@ public MySQLCollateExpression Collate(
       string charset,
       string collation)
       => (MySQLCollateExpression)ApplyDefaultTypeMapping(
-#if NET9_0
+#if NET9_0_OR_GREATER
         new MySQLCollateExpression(
           valueExpression,
           collation)
@@ -294,7 +294,7 @@ private MySQLCollateExpression ApplyTypeMappingOnCollate(MySQLCollateExpression
       var inferredTypeMapping = ExpressionExtensions.InferTypeMapping(collateExpression.ValueExpression)
         ?? _typeMappingSource.FindMapping(collateExpression.ValueExpression.Type);
 
-#if NET9_0
+#if NET9_0_OR_GREATER
       return new MySQLCollateExpression(collateExpression.ValueExpression, collateExpression.Collation);
 #else
       return new MySQLCollateExpression(
diff --git a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
@@ -38,7 +38,7 @@ internal class MySQLSqlNullabilityProcessor : SqlNullabilityProcessor
     private readonly ISqlExpressionFactory _sqlExpressionFactory;
 
 
-#if !NET9_0
+#if !NET9_0_OR_GREATER
     /// <summary>
     /// Creates a new instance of the <see cref="MySQLSqlNullabilityProcessor" />.
     /// </summary>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -85,7 +85,7 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()))));
     }
-#elif NET8_0_OR_GREATER
+#elif NET8_0 || NET9_0
     public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
     {
       options ??= new DbContextOptionsBuilder()
@@ -116,6 +116,38 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()), new ExceptionDetector())));
     }
+#elif NET10_0_OR_GREATER
+    public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
+    {
+      options ??= new DbContextOptionsBuilder()
+          .UseMySQL(MySQLTestStore.BaseConnectionString + "database=test;")
+          .Options;
+
+      return new RelationalConnectionDependencies(
+          options,
+          new DiagnosticsLogger<DbLoggerCategory.Database.Transaction>(
+              new LoggerFactory(),
+              new LoggingOptions(),
+              new DiagnosticListener("FakeDiagnosticListener"),
+              new MySQLLoggingDefinitions(), new NullDbContextLogger()),
+          new RelationalConnectionDiagnosticsLogger(
+                        new LoggerFactory(),
+                        new LoggingOptions(),
+                        new DiagnosticListener("FakeDiagnosticListener"),
+                        new TestRelationalLoggingDefinitions(),
+                        new NullDbContextLogger(),
+                        CreateOptions()),
+          new NamedConnectionStringResolver(options),
+          new RelationalTransactionFactory(new RelationalTransactionFactoryDependencies(
+            new RelationalSqlGenerationHelper(new RelationalSqlGenerationHelperDependencies()))),
+          new CurrentDbContext(new FakeDbContext()),
+          new RelationalCommandBuilderFactory(new RelationalCommandBuilderDependencies(
+            new MySQLTypeMappingSource(
+              TestServiceFactory.Instance.Create<TypeMappingSourceDependencies>(),
+              TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
+              new MySQLOptions()), new ExceptionDetector(), new LoggingOptions())),
+              new ExceptionDetector());
+    }
 #endif
 
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
@@ -25,6 +25,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="10.0.0-preview.5.25277.114" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
@@ -226,7 +226,7 @@ public static void DeleteDatabase(string name)
     public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuilder builder)
       => builder.UseMySQL(GetContextConnectionString<MyTestContext>());
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public virtual void Clean(DbContext context)
       => context.Database.EnsureDeleted();
 #else
@@ -236,7 +236,7 @@ public override void Clean(DbContext context)
 
 
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private MySQLTestStore(string name, DbConnection connection)
         : base(name, true, connection)
     {
@@ -272,7 +272,7 @@ protected MySQLTestStoreFactory()
     {
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override TestStore Create(string storeName)
         => MySQLTestStore.Create(storeName, new MySqlConnection(MySQLTestStore.RootConnectionString));
 
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public MySQLHistoryRepository([NotNull] HistoryRepositoryDependencies dependenci`
`53`	`53`	`: base(dependencies)`
`54`	`54`	`{`
`55`	`55`	`}`
`56`		`-#if NET9_0`
	`56`	`+#if NET9_0_OR_GREATER`
`57`	`57`	`public override LockReleaseBehavior LockReleaseBehavior => LockReleaseBehavior.Connection;`
`58`	`58`
`59`	`59`	`public override IMigrationsDatabaseLock AcquireDatabaseLock()`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`namespace MySql.EntityFrameworkCore.Migrations.Internal`
`35`	`35`	`{`
`36`		`-#if NET9_0`
	`36`	`+#if NET9_0_OR_GREATER`
`37`	`37`	`internal class MySQLMigrationDatabaseLock(`
`38`	`38`	`IRelationalCommand releaseLockCommand,`
`39`	`39`	`RelationalCommandParameterObject relationalCommandParameters,`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffConte`
`79`	`79`	`return base.Add(target, diffContext, inline);`
`80`	`80`	`}`
`81`	`81`
`82`		`-#elif NET9_0`
	`82`	`+#elif NET9_0_OR_GREATER`
`83`	`83`	`public MySQLMigrationsModelDiffer(`
`84`	`84`	`[NotNull] IRelationalTypeMappingSource typeMappingSource,`
`85`	`85`	`[NotNull] IMigrationsAnnotationProvider migrationsAnnotations,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`
`48`	`48`	`namespace MySql.EntityFrameworkCore.Migrations.Internal`
`49`	`49`	`{`
`50`		`-#if NET9_0`
	`50`	`+#if NET9_0_OR_GREATER`
`51`	`51`	`public class MySQLMigrator : IMigrator`
`52`	`52`	`{`
`53`	`53`	`private readonly IMigrationsAssembly _migrationsAssembly;`