diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
index cc1a644f..bf3a4e49 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
index 881c9c00..034a2bd2 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
@@ -11,9 +11,9 @@
-
-
-
+
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
index f7a052eb..d0e2c014 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
@@ -7,13 +7,13 @@
-
+
-
-
-
+
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
index 4a393bed..c1303e4c 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
@@ -10,11 +10,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
index 7717313c..182161e2 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
@@ -1,23 +1,23 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
+
+
+
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
index c8834237..5383e967 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
@@ -22,7 +22,7 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
* used modules (as explained above). See AdministrationServiceMigrationsDbContext for migrations.
*/
[ConnectionStringName(AdministrationServiceDbProperties.ConnectionStringName)]
- public class AdministrationServiceDbContext
+ public class AdministrationServiceDbContext
: AbpDbContext,
IPermissionManagementDbContext,
ISettingManagementDbContext,
@@ -40,6 +40,8 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
public DbSet AuditLogs { get; set; }
public DbSet BlobContainers { get; set; }
public DbSet Blobs { get; set; }
+ public DbSet PermissionGroups { get; set; }
+ public DbSet Permissions { get; set; }
protected override void OnModelCreating(ModelBuilder builder)
{
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
index 69846b23..b980124d 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs
index 615b3702..d8d8f740 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs
@@ -47,25 +47,23 @@ public class AdministrationServiceDatabaseMigrationChecker
private async Task SeedDataAsync()
{
- using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true))
- {
- var multiTenancySide = MultiTenancySides.Host;
+ using var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true);
+ var multiTenancySide = MultiTenancySides.Host;
- var permissionNames = _permissionDefinitionManager
- .GetPermissions()
- .Where(p => p.MultiTenancySide.HasFlag(multiTenancySide))
- .Where(p => !p.Providers.Any() ||
- p.Providers.Contains(RolePermissionValueProvider.ProviderName))
- .Select(p => p.Name)
- .ToArray();
+ var permissionNames = (await _permissionDefinitionManager
+ .GetPermissionsAsync())
+ .Where(p => p.MultiTenancySide.HasFlag(multiTenancySide))
+ .Where(p => !p.Providers.Any() ||
+ p.Providers.Contains(RolePermissionValueProvider.ProviderName))
+ .Select(p => p.Name)
+ .ToArray();
- await _permissionDataSeeder.SeedAsync(
- RolePermissionValueProvider.ProviderName,
- "admin",
- permissionNames
- );
+ await _permissionDataSeeder.SeedAsync(
+ RolePermissionValueProvider.ProviderName,
+ "admin",
+ permissionNames
+ );
- await uow.CompleteAsync();
- }
+ await uow.CompleteAsync();
}
}
\ No newline at end of file
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
index 66344c47..8d3c75db 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
index 6767ed03..d74d4a97 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
@@ -1,4 +1,4 @@
- FROM mcr.microsoft.com/dotnet/aspnet:6.0
- COPY bin/Release/net6.0/publish/ app/
+ FROM mcr.microsoft.com/dotnet/aspnet:7.0
+ COPY bin/Release/net7.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.AdministrationService.HttpApi.Host.dll"]
\ No newline at end of file
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
index 09838da6..a22c5bdf 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
@@ -1,21 +1,21 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
true
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
index 5a54d9af..266a3efa 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj b/services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
index 184e5dc1..9c05173e 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
+++ b/services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj b/services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
index 5df8cda9..a1208a97 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
+++ b/services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
index f1f0017a..c13e8529 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
+++ b/services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
@@ -1,14 +1,14 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
-
+
diff --git a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
index fd1a8d55..31a84013 100644
--- a/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
+++ b/services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
@@ -1,13 +1,13 @@
- net6.0
+ net7.0
EShopOnAbp.AdministrationService
-
-
-
+
+
+