diff --git a/Directory.Build.targets b/Directory.Build.targets
index 78bf621..0b0b049 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,7 +20,7 @@
9.0.0-rc.1.24452.1
9.0.0-rc.1.24431.7
9.0.0-rc.1.24451.1
- 9.0.0-preview.1
+ 9.0.0-rc.1
9.0.0-preview.1
@@ -97,14 +97,14 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs b/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs
index 3cd935a..385b407 100644
--- a/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs
+++ b/test/NetCorePal.Web.UnitTests/MyWebApplicationFactory.cs
@@ -19,22 +19,21 @@ public class MyWebApplicationFactory : WebApplicationFactory, IAsyncLif
// private readonly PostgreSqlContainer postgreSqlContainer = new PostgreSqlBuilder()
// .WithUsername("postgres").WithPassword("123456")
// .WithDatabase("demo").Build();
-
+#if NET9_0
+ private readonly PostgreSqlContainer pgSqlContainer = new PostgreSqlBuilder().Build();
+#else
private readonly MySqlContainer mySqlContainer = new MySqlBuilder()
.WithUsername("root").WithPassword("123456")
.WithEnvironment("TZ", "Asia/Shanghai")
.WithDatabase("demo").Build();
-
-#if NET9_0
- private readonly MsSqlContainer msSqlContainer = new MsSqlBuilder().Build();
#endif
+
protected override void ConfigureWebHost(IWebHostBuilder builder)
{
- //builder.UseSetting("ConnectionStrings:PostgreSQL", postgreSqlContainer.GetConnectionString());
- builder.UseSetting("ConnectionStrings:MySql",
- mySqlContainer.GetConnectionString().Replace("demo", $"demo"));
#if NET9_0
- builder.UseSetting("ConnectionStrings:MsSql", msSqlContainer.GetConnectionString());
+ builder.UseSetting("ConnectionStrings:PostgreSql", pgSqlContainer.GetConnectionString());
+#else
+ builder.UseSetting("ConnectionStrings:MySql", mySqlContainer.GetConnectionString());
#endif
builder.UseSetting("ConnectionStrings:Redis", redisContainer.GetConnectionString());
builder.UseSetting("RabbitMQ:HostName", rabbitMqContainer.Hostname);
@@ -51,9 +50,10 @@ public Task InitializeAsync()
return Task.WhenAll(redisContainer.StartAsync(),
rabbitMqContainer.StartAsync(),
#if NET9_0
- msSqlContainer.StartAsync(),
-#endif
+ pgSqlContainer.StartAsync());
+#else
mySqlContainer.StartAsync());
+#endif
}
public new Task DisposeAsync()
@@ -61,9 +61,10 @@ public Task InitializeAsync()
return Task.WhenAll(redisContainer.StopAsync(),
rabbitMqContainer.StopAsync(),
#if NET9_0
- msSqlContainer.StopAsync(),
-#endif
+ pgSqlContainer.StopAsync());
+#else
mySqlContainer.StopAsync());
+#endif
}
}
}
\ No newline at end of file
diff --git a/test/NetCorePal.Web/NetCorePal.Web.csproj b/test/NetCorePal.Web/NetCorePal.Web.csproj
index 5eb46e0..ec0222e 100644
--- a/test/NetCorePal.Web/NetCorePal.Web.csproj
+++ b/test/NetCorePal.Web/NetCorePal.Web.csproj
@@ -32,13 +32,12 @@
-
-
-
+
+
diff --git a/test/NetCorePal.Web/Program.cs b/test/NetCorePal.Web/Program.cs
index e17eed2..62f4ccf 100644
--- a/test/NetCorePal.Web/Program.cs
+++ b/test/NetCorePal.Web/Program.cs
@@ -144,9 +144,8 @@
builder.Services.AddDbContext(options =>
{
#if NET9_0
- options.UseSqlServer(builder.Configuration.GetConnectionString("MsSql"));
+ options.UseNpgsql(builder.Configuration.GetConnectionString("PostgreSql"));
#else
- //options.UseNpgsql(builder.Configuration.GetConnectionString("PostgreSQL"));
options.UseMySql(builder.Configuration.GetConnectionString("Mysql"),
new MySqlServerVersion(new Version(8, 0, 34)),
b => { b.MigrationsAssembly(typeof(Program).Assembly.FullName); });
@@ -158,7 +157,7 @@
builder.Services.AddUnitOfWork();
#if NET9_0
- builder.Services.AddSqlServerTransactionHandler();
+ builder.Services.AddPostgreSqlTransactionHandler();
#else
//builder.Services.AddPostgreSqlTransactionHandler();
builder.Services.AddMySqlTransactionHandler();
diff --git a/test/NetCorePal.Web/appsettings.Development.json b/test/NetCorePal.Web/appsettings.Development.json
index d563d1c..80ea291 100644
--- a/test/NetCorePal.Web/appsettings.Development.json
+++ b/test/NetCorePal.Web/appsettings.Development.json
@@ -6,9 +6,9 @@
}
},
"ConnectionStrings": {
- "Redis": "127.0.0.1:6379,defaultDatabase=0,password=test@123",
- "Postgres": "",
- "MySql": "Server=127.0.0.1; port=3306; Database=Test; uid=root; pwd=test@123;"
+ "Redis": "",
+ "PostgreSql": "",
+ "MsSql": ""
},
"RabbitMQ": {
"HostName": "127.0.0.1",