From 580dd0d8fdafccd2df45f4a25832f9988ab13438 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 24 Jul 2023 01:46:04 +0800 Subject: [PATCH] Upgrade to ABP 7.3.0 --- Directory.Build.props | 6 ++--- common.props | 2 +- .../angular/package.json | 18 +++++++-------- .../package.json | 4 ++-- .../yarn.lock | 16 ++++++------- ...BookingService.Orleans.HttpApi.Host.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 8 +++---- ...Abp.BookingService.Orleans.Web.Host.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 8 +++---- ....BookingService.Orleans.Web.Unified.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 8 +++---- ...ookingService.Orleans.MongoDB.Tests.csproj | 5 +++- .../BookingServiceOrleansMongoDbTestModule.cs | 7 +----- .../MongoDB/MongoDbFixture.cs | 23 +++++++++++++++---- modules/BookingService/angular/package.json | 18 +++++++-------- .../package.json | 4 ++-- .../yarn.lock | 16 ++++++------- ...EasyAbp.BookingService.HttpApi.Host.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 8 +++---- .../EasyAbp.BookingService.Web.Host.csproj | 2 +- .../package.json | 2 +- .../EasyAbp.BookingService.Web.Host/yarn.lock | 8 +++---- .../EasyAbp.BookingService.Web.Unified.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 8 +++---- ...asyAbp.BookingService.MongoDB.Tests.csproj | 5 +++- .../BookingServiceMongoDbTestModule.cs | 7 +----- .../MongoDB/MongoDbFixture.cs | 23 +++++++++++++++---- ...BookingService.Common.Domain.Shared.csproj | 1 + .../BookingServiceCommonDomainSharedModule.cs | 6 +++-- ...BookingService.Common.MongoDB.Tests.csproj | 5 +++- .../BookingServiceCommonMongoDbTestModule.cs | 7 +----- .../MongoDB/MongoDbFixture.cs | 23 +++++++++++++++---- 37 files changed, 152 insertions(+), 116 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5232889..1225ba0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,9 @@ - 7.2.1 - 2.11.0 - 3.6.5 + 7.3.0 + 2.12.0 + 3.7.1 diff --git a/common.props b/common.props index 40d0552..d7430a1 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.6.0 + 0.7.0 $(NoWarn);CS1591 module true diff --git a/modules/BookingService.Orleans/angular/package.json b/modules/BookingService.Orleans/angular/package.json index 39649f9..7084e1c 100644 --- a/modules/BookingService.Orleans/angular/package.json +++ b/modules/BookingService.Orleans/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.1", - "@abp/ng.components": "~6.0.1", - "@abp/ng.core": "~6.0.1", - "@abp/ng.identity": "~6.0.1", - "@abp/ng.setting-management": "~6.0.1", - "@abp/ng.tenant-management": "~6.0.1", - "@abp/ng.theme.basic": "~6.0.1", - "@abp/ng.theme.shared": "~6.0.1", + "@abp/ng.account": "~7.3.0", + "@abp/ng.components": "~7.3.0", + "@abp/ng.core": "~7.3.0", + "@abp/ng.identity": "~7.3.0", + "@abp/ng.setting-management": "~7.3.0", + "@abp/ng.tenant-management": "~7.3.0", + "@abp/ng.theme.basic": "~7.3.0", + "@abp/ng.theme.shared": "~7.3.0", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.1", + "@abp/ng.schematics": "~7.3.0", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/package.json b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/package.json index 9d22c3a..69e5ff6 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/package.json +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/yarn.lock b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/yarn.lock index 2cf9fe2..175d54a 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/yarn.lock +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.2.0.tgz#e6ba4920906fd67f19338f4836fb487aae158932" - integrity sha512-cFlmbu3iCPHFuutsTG5wdtHivO5HBqtUpA0wkrnQSxQHeUnUMKWgIOTSOKA8Ij/qF3fOFjqfoQ7BQJ+Fd5jFqQ== +"@abp/aspnetcore.components.server.leptonxlitetheme@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.3.0.tgz#c5fb72a291c61769388f59e588dfbac00c8e18a6" + integrity sha512-Qaj+mjTts5jWcNEMbW5UV9xIXtxZNIZxhVfqeCJ4HQtTE0jeh7ogXtQ70HdqYOJstB3X6Gd0WBo408abkCfoug== dependencies: "@abp/aspnetcore.components.server.theming" "~7.2.1" @@ -17,10 +17,10 @@ "@abp/bootstrap" "~7.2.1" "@abp/font-awesome" "~7.2.1" -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/EasyAbp.BookingService.Orleans.HttpApi.Host.csproj b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/EasyAbp.BookingService.Orleans.HttpApi.Host.csproj index d8049fa..143e5cf 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/EasyAbp.BookingService.Orleans.HttpApi.Host.csproj +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/EasyAbp.BookingService.Orleans.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/package.json b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/package.json index 12d4d4e..1dfe228 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/package.json +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/yarn.lock b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/yarn.lock index 295d205..4fc290e 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/yarn.lock +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/EasyAbp.BookingService.Orleans.Web.Host.csproj b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/EasyAbp.BookingService.Orleans.Web.Host.csproj index fcd9cbb..4f8b1ef 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/EasyAbp.BookingService.Orleans.Web.Host.csproj +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/EasyAbp.BookingService.Orleans.Web.Host.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/package.json b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/package.json index 330a0b3..24d9c85 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/package.json +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/yarn.lock b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/yarn.lock index 295d205..4fc290e 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/yarn.lock +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Host/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/EasyAbp.BookingService.Orleans.Web.Unified.csproj b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/EasyAbp.BookingService.Orleans.Web.Unified.csproj index 1a7ba3b..d2effc2 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/EasyAbp.BookingService.Orleans.Web.Unified.csproj +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/EasyAbp.BookingService.Orleans.Web.Unified.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/package.json b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/package.json index 330a0b3..24d9c85 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/package.json +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/yarn.lock b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/yarn.lock index a64e141..04cfe5c 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/yarn.lock +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/EasyAbp.BookingService.Orleans.MongoDB.Tests.csproj b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/EasyAbp.BookingService.Orleans.MongoDB.Tests.csproj index 522f8fc..0523915 100644 --- a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/EasyAbp.BookingService.Orleans.MongoDB.Tests.csproj +++ b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/EasyAbp.BookingService.Orleans.MongoDB.Tests.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/BookingServiceOrleansMongoDbTestModule.cs b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/BookingServiceOrleansMongoDbTestModule.cs index 3a18981..f60382b 100644 --- a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/BookingServiceOrleansMongoDbTestModule.cs +++ b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/BookingServiceOrleansMongoDbTestModule.cs @@ -13,14 +13,9 @@ public class BookingServiceOrleansMongoDbTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - var stringArray = MongoDbFixture.ConnectionString.Split('?'); - var connectionString = stringArray[0].EnsureEndsWith('/') + - "Db_" + - Guid.NewGuid().ToString("N") + "/?" + stringArray[1]; - Configure(options => { - options.ConnectionStrings.Default = connectionString; + options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString(); }); } } diff --git a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/MongoDbFixture.cs index 43bc5e3..0c5c53f 100644 --- a/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ b/modules/BookingService.Orleans/test/EasyAbp.BookingService.Orleans.MongoDB.Tests/MongoDB/MongoDbFixture.cs @@ -1,17 +1,30 @@ using System; -using Mongo2Go; +using EphemeralMongo; namespace EasyAbp.BookingService.MongoDB; public class MongoDbFixture : IDisposable { - private static readonly MongoDbRunner MongoDbRunner; - public static readonly string ConnectionString; + public readonly static IMongoRunner MongoDbRunner; static MongoDbFixture() { - MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 20); - ConnectionString = MongoDbRunner.ConnectionString; + MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions + { + UseSingleNodeReplicaSet = true + }); + } + + public static string GetRandomConnectionString() + { + return GetConnectionString("Db_" + Guid.NewGuid().ToString("N")); + } + + public static string GetConnectionString(string databaseName) + { + var stringArray = MongoDbRunner.ConnectionString.Split('?'); + var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1]; + return connectionString; } public void Dispose() diff --git a/modules/BookingService/angular/package.json b/modules/BookingService/angular/package.json index 39649f9..7084e1c 100644 --- a/modules/BookingService/angular/package.json +++ b/modules/BookingService/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~6.0.1", - "@abp/ng.components": "~6.0.1", - "@abp/ng.core": "~6.0.1", - "@abp/ng.identity": "~6.0.1", - "@abp/ng.setting-management": "~6.0.1", - "@abp/ng.tenant-management": "~6.0.1", - "@abp/ng.theme.basic": "~6.0.1", - "@abp/ng.theme.shared": "~6.0.1", + "@abp/ng.account": "~7.3.0", + "@abp/ng.components": "~7.3.0", + "@abp/ng.core": "~7.3.0", + "@abp/ng.identity": "~7.3.0", + "@abp/ng.setting-management": "~7.3.0", + "@abp/ng.tenant-management": "~7.3.0", + "@abp/ng.theme.basic": "~7.3.0", + "@abp/ng.theme.shared": "~7.3.0", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~6.0.1", + "@abp/ng.schematics": "~7.3.0", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/package.json b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/package.json index 9d22c3a..69e5ff6 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/package.json +++ b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/yarn.lock b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/yarn.lock index 2cf9fe2..175d54a 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/yarn.lock +++ b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.2.0.tgz#e6ba4920906fd67f19338f4836fb487aae158932" - integrity sha512-cFlmbu3iCPHFuutsTG5wdtHivO5HBqtUpA0wkrnQSxQHeUnUMKWgIOTSOKA8Ij/qF3fOFjqfoQ7BQJ+Fd5jFqQ== +"@abp/aspnetcore.components.server.leptonxlitetheme@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.components.server.leptonxlitetheme/-/aspnetcore.components.server.leptonxlitetheme-2.3.0.tgz#c5fb72a291c61769388f59e588dfbac00c8e18a6" + integrity sha512-Qaj+mjTts5jWcNEMbW5UV9xIXtxZNIZxhVfqeCJ4HQtTE0jeh7ogXtQ70HdqYOJstB3X6Gd0WBo408abkCfoug== dependencies: "@abp/aspnetcore.components.server.theming" "~7.2.1" @@ -17,10 +17,10 @@ "@abp/bootstrap" "~7.2.1" "@abp/font-awesome" "~7.2.1" -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/EasyAbp.BookingService.HttpApi.Host.csproj b/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/EasyAbp.BookingService.HttpApi.Host.csproj index 402a88a..a58094d 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/EasyAbp.BookingService.HttpApi.Host.csproj +++ b/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/EasyAbp.BookingService.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/package.json b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/package.json index 12d4d4e..1dfe228 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/package.json +++ b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/yarn.lock b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/yarn.lock index 295d205..4fc290e 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/yarn.lock +++ b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/EasyAbp.BookingService.Web.Host.csproj b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/EasyAbp.BookingService.Web.Host.csproj index 5c216e6..64623f5 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/EasyAbp.BookingService.Web.Host.csproj +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/EasyAbp.BookingService.Web.Host.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/package.json b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/package.json index 330a0b3..24d9c85 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/package.json +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/yarn.lock b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/yarn.lock index 295d205..4fc290e 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Host/yarn.lock +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Host/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/EasyAbp.BookingService.Web.Unified.csproj b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/EasyAbp.BookingService.Web.Unified.csproj index bec518f..e5c8ced 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/EasyAbp.BookingService.Web.Unified.csproj +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/EasyAbp.BookingService.Web.Unified.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/package.json b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/package.json index 330a0b3..24d9c85 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/package.json +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/yarn.lock b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/yarn.lock index a64e141..04cfe5c 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/yarn.lock +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/EasyAbp.BookingService.MongoDB.Tests.csproj b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/EasyAbp.BookingService.MongoDB.Tests.csproj index 8ead6a2..469670e 100644 --- a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/EasyAbp.BookingService.MongoDB.Tests.csproj +++ b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/EasyAbp.BookingService.MongoDB.Tests.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/BookingServiceMongoDbTestModule.cs b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/BookingServiceMongoDbTestModule.cs index 4993afb..97e66b1 100644 --- a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/BookingServiceMongoDbTestModule.cs +++ b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/BookingServiceMongoDbTestModule.cs @@ -13,14 +13,9 @@ public class BookingServiceMongoDbTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - var stringArray = MongoDbFixture.ConnectionString.Split('?'); - var connectionString = stringArray[0].EnsureEndsWith('/') + - "Db_" + - Guid.NewGuid().ToString("N") + "/?" + stringArray[1]; - Configure(options => { - options.ConnectionStrings.Default = connectionString; + options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString(); }); } } diff --git a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/MongoDbFixture.cs index 43bc5e3..0c5c53f 100644 --- a/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ b/modules/BookingService/test/EasyAbp.BookingService.MongoDB.Tests/MongoDB/MongoDbFixture.cs @@ -1,17 +1,30 @@ using System; -using Mongo2Go; +using EphemeralMongo; namespace EasyAbp.BookingService.MongoDB; public class MongoDbFixture : IDisposable { - private static readonly MongoDbRunner MongoDbRunner; - public static readonly string ConnectionString; + public readonly static IMongoRunner MongoDbRunner; static MongoDbFixture() { - MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 20); - ConnectionString = MongoDbRunner.ConnectionString; + MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions + { + UseSingleNodeReplicaSet = true + }); + } + + public static string GetRandomConnectionString() + { + return GetConnectionString("Db_" + Guid.NewGuid().ToString("N")); + } + + public static string GetConnectionString(string databaseName) + { + var stringArray = MongoDbRunner.ConnectionString.Split('?'); + var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1]; + return connectionString; } public void Dispose() diff --git a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj index 392cdc5..7b1bdf6 100644 --- a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj +++ b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj @@ -9,6 +9,7 @@ + diff --git a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp/BookingService/BookingServiceCommonDomainSharedModule.cs b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp/BookingService/BookingServiceCommonDomainSharedModule.cs index 054a47e..69efdce 100644 --- a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp/BookingService/BookingServiceCommonDomainSharedModule.cs +++ b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp/BookingService/BookingServiceCommonDomainSharedModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Domain; +using Volo.Abp.Modularity; using Volo.Abp.Localization; using EasyAbp.BookingService.Localization; using Volo.Abp.Localization.ExceptionHandling; @@ -9,7 +10,8 @@ namespace EasyAbp.BookingService; [DependsOn( - typeof(AbpValidationModule) + typeof(AbpValidationModule), + typeof(AbpDddDomainSharedModule) )] public class BookingServiceCommonDomainSharedModule : AbpModule { diff --git a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/EasyAbp.BookingService.Common.MongoDB.Tests.csproj b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/EasyAbp.BookingService.Common.MongoDB.Tests.csproj index 9c9cf7c..10058d3 100644 --- a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/EasyAbp.BookingService.Common.MongoDB.Tests.csproj +++ b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/EasyAbp.BookingService.Common.MongoDB.Tests.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/BookingServiceCommonMongoDbTestModule.cs b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/BookingServiceCommonMongoDbTestModule.cs index 845e26f..2d7bf57 100644 --- a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/BookingServiceCommonMongoDbTestModule.cs +++ b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/BookingServiceCommonMongoDbTestModule.cs @@ -13,14 +13,9 @@ public class BookingServiceCommonMongoDbTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - var stringArray = MongoDbFixture.ConnectionString.Split('?'); - var connectionString = stringArray[0].EnsureEndsWith('/') + - "Db_" + - Guid.NewGuid().ToString("N") + "/?" + stringArray[1]; - Configure(options => { - options.ConnectionStrings.Default = connectionString; + options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString(); }); } } diff --git a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs index 43bc5e3..0c5c53f 100644 --- a/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ b/modules/Common/test/EasyAbp.BookingService.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs @@ -1,17 +1,30 @@ using System; -using Mongo2Go; +using EphemeralMongo; namespace EasyAbp.BookingService.MongoDB; public class MongoDbFixture : IDisposable { - private static readonly MongoDbRunner MongoDbRunner; - public static readonly string ConnectionString; + public readonly static IMongoRunner MongoDbRunner; static MongoDbFixture() { - MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 20); - ConnectionString = MongoDbRunner.ConnectionString; + MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions + { + UseSingleNodeReplicaSet = true + }); + } + + public static string GetRandomConnectionString() + { + return GetConnectionString("Db_" + Guid.NewGuid().ToString("N")); + } + + public static string GetConnectionString(string databaseName) + { + var stringArray = MongoDbRunner.ConnectionString.Split('?'); + var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1]; + return connectionString; } public void Dispose()