diff --git a/Directory.Build.props b/Directory.Build.props index e0c62c6..7c9adc8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.2.1 + 7.3.0 \ No newline at end of file diff --git a/common.props b/common.props index e24a9a0..316d3c8 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.9.0 + 0.10.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj b/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj index 7adb725..e765197 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj @@ -42,7 +42,7 @@ - + diff --git a/sample/MyProject/aspnet-core/src/MyProject.Web/package.json b/sample/MyProject/aspnet-core/src/MyProject.Web/package.json index 330a0b3..24d9c85 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/package.json +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/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/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock b/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock index 3e067e8..1bbfbe3 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/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/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj index 7ecfad5..3db6d9d 100644 --- a/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj +++ b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj @@ -9,6 +9,7 @@ + diff --git a/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp/GiftCardManagement/GiftCardManagementDomainSharedModule.cs b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp/GiftCardManagement/GiftCardManagementDomainSharedModule.cs index e8b738b..a30abbb 100644 --- a/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp/GiftCardManagement/GiftCardManagementDomainSharedModule.cs +++ b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp/GiftCardManagement/GiftCardManagementDomainSharedModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Domain; +using Volo.Abp.Modularity; using Volo.Abp.Localization; using EasyAbp.GiftCardManagement.Localization; using Volo.Abp.Localization.ExceptionHandling; @@ -9,7 +10,8 @@ namespace EasyAbp.GiftCardManagement { [DependsOn( - typeof(AbpValidationModule) + typeof(AbpValidationModule), + typeof(AbpDddDomainSharedModule) )] public class GiftCardManagementDomainSharedModule : AbpModule { diff --git a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj index 8ef61cd..15421bd 100644 --- a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj +++ b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/GiftCardManagementMongoDbTestModule.cs b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/GiftCardManagementMongoDbTestModule.cs index 2f1cec5..fa5218a 100644 --- a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/GiftCardManagementMongoDbTestModule.cs +++ b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/GiftCardManagementMongoDbTestModule.cs @@ -12,14 +12,9 @@ public class GiftCardManagementMongoDbTestModule : 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/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs index 27b672a..3444947 100644 --- a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs @@ -1,17 +1,30 @@ using System; -using Mongo2Go; +using EphemeralMongo; namespace EasyAbp.GiftCardManagement.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()