Merge pull request #123 from netcorepal/update-pomelo-mysql

update Pomelo.EntityFrameworkCore.MySql to support dotnet9
netcorepal · Dec 13, 2024 · b4e54ae · b4e54ae
2 parents 9b1f7d0 + 701c1dc
commit b4e54ae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -14,7 +14,7 @@
     <ExtensionsVersion>9.0.0</ExtensionsVersion>
     <EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion>9.0.1</NpgsqlEntityFrameworkCorePostgreSQLVersion>
-    <PomeloVersion>9.0.0-preview.1</PomeloVersion>
+    <PomeloVersion>9.0.0-preview.2.efcore.9.0.0</PomeloVersion>
   </PropertyGroup>
   <ItemGroup>
     <!--microsoft extensions -->

diff --git a/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs b/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs
@@ -19,7 +19,7 @@ public class MyWebApplicationFactory : WebApplicationFactory<Program>, IAsyncLif
         // private readonly PostgreSqlContainer postgreSqlContainer = new PostgreSqlBuilder()
         //     .WithUsername("postgres").WithPassword("123456")
         //     .WithDatabase("demo").Build();
-#if NET9_0
+#if NET10_0
         private readonly PostgreSqlContainer pgSqlContainer = new PostgreSqlBuilder().Build();
 #else        
         private readonly MySqlContainer mySqlContainer = new MySqlBuilder()
@@ -30,7 +30,7 @@ public class MyWebApplicationFactory : WebApplicationFactory<Program>, IAsyncLif
 
         protected override void ConfigureWebHost(IWebHostBuilder builder)
         {
-#if NET9_0
+#if NET10_0
             builder.UseSetting("ConnectionStrings:PostgreSql", pgSqlContainer.GetConnectionString());
 #else
             builder.UseSetting("ConnectionStrings:MySql", mySqlContainer.GetConnectionString());
@@ -49,7 +49,7 @@ public Task InitializeAsync()
         {
             return Task.WhenAll(redisContainer.StartAsync(),
                 rabbitMqContainer.StartAsync(),
-#if NET9_0
+#if NET10_0
                 pgSqlContainer.StartAsync());
 #else
                 mySqlContainer.StartAsync());
@@ -60,7 +60,7 @@ public Task InitializeAsync()
         {
             return Task.WhenAll(redisContainer.StopAsync(),
                 rabbitMqContainer.StopAsync(),
-#if NET9_0
+#if NET10_0
                 pgSqlContainer.StopAsync());
 #else
                 mySqlContainer.StopAsync());

diff --git a/test/NetCorePal.Web/NetCorePal.Web.csproj b/test/NetCorePal.Web/NetCorePal.Web.csproj
@@ -32,11 +32,11 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net10.0'">
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
     <ProjectReference Include="..\..\src\DistributedTransactions.CAP.MySql\NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <ProjectReference Include="..\..\src\DistributedTransactions.CAP.PostgreSql\NetCorePal.Extensions.DistributedTransactions.CAP.PostgreSql.csproj" />
   </ItemGroup>

diff --git a/test/NetCorePal.Web/Program.cs b/test/NetCorePal.Web/Program.cs
@@ -155,7 +155,7 @@
     builder.Services.AddRepositories(typeof(ApplicationDbContext).Assembly);
     builder.Services.AddDbContext<ApplicationDbContext>(options =>
     {
-#if NET9_0
+#if NET10_0
         options.UseNpgsql(builder.Configuration.GetConnectionString("PostgreSql"));
 #else
         options.UseMySql(builder.Configuration.GetConnectionString("Mysql"),
@@ -170,7 +170,7 @@
     });
 
     builder.Services.AddUnitOfWork<ApplicationDbContext>();
-#if NET9_0
+#if NET10_0
     builder.Services.AddPostgreSqlTransactionHandler();
 #else
     //builder.Services.AddPostgreSqlTransactionHandler();