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 868feb4..8ab7408 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/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj b/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj
index c71cf99..1bf06ad 100644
--- a/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj
+++ b/host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/host/EasyAbp.UniappManagement.IdentityServer/package.json b/host/EasyAbp.UniappManagement.IdentityServer/package.json
index 12d4d4e..1dfe228 100644
--- a/host/EasyAbp.UniappManagement.IdentityServer/package.json
+++ b/host/EasyAbp.UniappManagement.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/host/EasyAbp.UniappManagement.IdentityServer/yarn.lock b/host/EasyAbp.UniappManagement.IdentityServer/yarn.lock
index ef18931..a84873d 100644
--- a/host/EasyAbp.UniappManagement.IdentityServer/yarn.lock
+++ b/host/EasyAbp.UniappManagement.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/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj b/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj
index 49abebd..96395b9 100644
--- a/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj
+++ b/host/EasyAbp.UniappManagement.Web.Host/EasyAbp.UniappManagement.Web.Host.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/host/EasyAbp.UniappManagement.Web.Host/package.json b/host/EasyAbp.UniappManagement.Web.Host/package.json
index 330a0b3..24d9c85 100644
--- a/host/EasyAbp.UniappManagement.Web.Host/package.json
+++ b/host/EasyAbp.UniappManagement.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/host/EasyAbp.UniappManagement.Web.Host/yarn.lock b/host/EasyAbp.UniappManagement.Web.Host/yarn.lock
index e670823..641feb6 100644
--- a/host/EasyAbp.UniappManagement.Web.Host/yarn.lock
+++ b/host/EasyAbp.UniappManagement.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/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj b/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj
index ead5b9b..5d1b32e 100644
--- a/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj
+++ b/host/EasyAbp.UniappManagement.Web.Unified/EasyAbp.UniappManagement.Web.Unified.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/host/EasyAbp.UniappManagement.Web.Unified/package.json b/host/EasyAbp.UniappManagement.Web.Unified/package.json
index 330a0b3..24d9c85 100644
--- a/host/EasyAbp.UniappManagement.Web.Unified/package.json
+++ b/host/EasyAbp.UniappManagement.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/host/EasyAbp.UniappManagement.Web.Unified/yarn.lock b/host/EasyAbp.UniappManagement.Web.Unified/yarn.lock
index 6a0a0b1..d0ea9f3 100644
--- a/host/EasyAbp.UniappManagement.Web.Unified/yarn.lock
+++ b/host/EasyAbp.UniappManagement.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/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj
index 4a1cf7e..c3e6d90 100644
--- a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj
+++ b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj
@@ -9,6 +9,7 @@
+
diff --git a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp/UniappManagement/UniappManagementDomainSharedModule.cs b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp/UniappManagement/UniappManagementDomainSharedModule.cs
index a8f3fd5..966938e 100644
--- a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp/UniappManagement/UniappManagementDomainSharedModule.cs
+++ b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp/UniappManagement/UniappManagementDomainSharedModule.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Domain;
+using Volo.Abp.Modularity;
using Volo.Abp.Localization;
using EasyAbp.UniappManagement.Localization;
using Volo.Abp.Localization.ExceptionHandling;
@@ -9,7 +10,8 @@
namespace EasyAbp.UniappManagement
{
[DependsOn(
- typeof(AbpValidationModule)
+ typeof(AbpValidationModule),
+ typeof(AbpDddDomainSharedModule)
)]
public class UniappManagementDomainSharedModule : AbpModule
{
diff --git a/test/EasyAbp.UniappManagement.MongoDB.Tests/EasyAbp.UniappManagement.MongoDB.Tests.csproj b/test/EasyAbp.UniappManagement.MongoDB.Tests/EasyAbp.UniappManagement.MongoDB.Tests.csproj
index 7fda884..bc8bbbe 100644
--- a/test/EasyAbp.UniappManagement.MongoDB.Tests/EasyAbp.UniappManagement.MongoDB.Tests.csproj
+++ b/test/EasyAbp.UniappManagement.MongoDB.Tests/EasyAbp.UniappManagement.MongoDB.Tests.csproj
@@ -7,7 +7,10 @@
-
+
+
+
+
diff --git a/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index 56193d6..fa23c45 100644
--- a/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,17 +1,30 @@
using System;
-using Mongo2Go;
+using EphemeralMongo;
namespace EasyAbp.UniappManagement.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/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/UniappManagementMongoDbTestModule.cs b/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/UniappManagementMongoDbTestModule.cs
index 4735323..bf9d028 100644
--- a/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/UniappManagementMongoDbTestModule.cs
+++ b/test/EasyAbp.UniappManagement.MongoDB.Tests/MongoDB/UniappManagementMongoDbTestModule.cs
@@ -1,5 +1,4 @@
using System;
-using Mongo2Go;
using Volo.Abp;
using Volo.Abp.Data;
using Volo.Abp.Modularity;
@@ -14,14 +13,9 @@ public class UniappManagementMongoDbTestModule : 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();
});
}
}