tsai
/
eShopOnAbp
mirror of https://github.com/abpframework/eShopOnAbp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
Browse Source

upgrade to 7.0 - Administration

pull/160/head
malik masis 4 years ago
parent
dd11ddba0b
commit
c3aca0f334
16 changed files with 62 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
  2. 8
      services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
  3. 8
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
  4. 10
      services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
  5. 14
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
  6. 4
      services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
  7. 4
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
  8. 32
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs
  9. 4
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
  10. 4
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
  11. 10
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
  12. 6
      services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
  13. 2
      services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
  14. 2
      services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
  15. 4
      services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
  16. 8
      services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj

4
services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
View File

@ -14,8 +14,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.0" />
</ItemGroup> </ItemGroup>

8
services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -11,9 +11,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
View File

@ -7,13 +7,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="6.0.0" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
View File

@ -10,11 +10,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="7.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="6.0.0" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
View File

@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" /> <ProjectReference Include="..\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="6.0.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.0" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="6.0.0" /> <PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
View File

@ -22,7 +22,7 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
* used modules (as explained above). See AdministrationServiceMigrationsDbContext for migrations. * used modules (as explained above). See AdministrationServiceMigrationsDbContext for migrations.
*/ */
[ConnectionStringName(AdministrationServiceDbProperties.ConnectionStringName)] [ConnectionStringName(AdministrationServiceDbProperties.ConnectionStringName)]
public class AdministrationServiceDbContext public class AdministrationServiceDbContext
: AbpDbContext<AdministrationServiceDbContext>, : AbpDbContext<AdministrationServiceDbContext>,
IPermissionManagementDbContext, IPermissionManagementDbContext,
ISettingManagementDbContext, ISettingManagementDbContext,
@ -40,6 +40,8 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
public DbSet<AuditLog> AuditLogs { get; set; } public DbSet<AuditLog> AuditLogs { get; set; }
public DbSet<DatabaseBlobContainer> BlobContainers { get; set; } public DbSet<DatabaseBlobContainer> BlobContainers { get; set; }
public DbSet<DatabaseBlob> Blobs { get; set; } public DbSet<DatabaseBlob> Blobs { get; set; }
public DbSet<PermissionGroupDefinitionRecord> PermissionGroups { get; set; }
public DbSet<PermissionDefinitionRecord> Permissions { get; set; }
protected override void OnModelCreating(ModelBuilder builder) protected override void OnModelCreating(ModelBuilder builder)
{ {

4
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
View File

@ -10,8 +10,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

32
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationChecker.cs
View File

@ -47,25 +47,23 @@ public class AdministrationServiceDatabaseMigrationChecker
private async Task SeedDataAsync() private async Task SeedDataAsync()
{ {
using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) using var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true);
{ var multiTenancySide = MultiTenancySides.Host;
var multiTenancySide = MultiTenancySides.Host;
var permissionNames = _permissionDefinitionManager var permissionNames = (await _permissionDefinitionManager
.GetPermissions() .GetPermissionsAsync())
.Where(p => p.MultiTenancySide.HasFlag(multiTenancySide)) .Where(p => p.MultiTenancySide.HasFlag(multiTenancySide))
.Where(p => !p.Providers.Any() || .Where(p => !p.Providers.Any() ||
p.Providers.Contains(RolePermissionValueProvider.ProviderName)) p.Providers.Contains(RolePermissionValueProvider.ProviderName))
.Select(p => p.Name) .Select(p => p.Name)
.ToArray(); .ToArray();
await _permissionDataSeeder.SeedAsync( await _permissionDataSeeder.SeedAsync(
RolePermissionValueProvider.ProviderName, RolePermissionValueProvider.ProviderName,
"admin", "admin",
permissionNames permissionNames
); );
await uow.CompleteAsync(); await uow.CompleteAsync();
}
} }
} }

4
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
View File

@ -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 WORKDIR /app
EXPOSE 80 EXPOSE 80
EXPOSE 443 EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src WORKDIR /src
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

4
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.local
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0 FROM mcr.microsoft.com/dotnet/aspnet:7.0
COPY bin/Release/net6.0/publish/ app/ COPY bin/Release/net7.0/publish/ app/
WORKDIR /app WORKDIR /app
ENTRYPOINT ["dotnet", "EShopOnAbp.AdministrationService.HttpApi.Host.dll"] ENTRYPOINT ["dotnet", "EShopOnAbp.AdministrationService.HttpApi.Host.dll"]

10
services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj
View File

@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="6.0.0" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="7.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="6.0.0" /> <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="6.0.0" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -10,8 +10,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="6.0.0" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
services/administration/test/EShopOnAbp.AdministrationService.Application.Tests/EShopOnAbp.AdministrationService.Application.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
services/administration/test/EShopOnAbp.AdministrationService.Domain.Tests/EShopOnAbp.AdministrationService.Domain.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>

4
services/administration/test/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests/EShopOnAbp.AdministrationService.EntityFrameworkCore.Tests.csproj
View File

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.EntityFrameworkCore\EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" /> <ProjectReference Include="..\EShopOnAbp.AdministrationService.TestBase\EShopOnAbp.AdministrationService.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
services/administration/test/EShopOnAbp.AdministrationService.TestBase/EShopOnAbp.AdministrationService.TestBase.csproj
View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RootNamespace>EShopOnAbp.AdministrationService</RootNamespace> <RootNamespace>EShopOnAbp.AdministrationService</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="6.0.0" /> <PackageReference Include="Volo.Abp.TestBase" Version="7.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" /> <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
<ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" /> <ProjectReference Include="..\..\src\EShopOnAbp.AdministrationService.Domain\EShopOnAbp.AdministrationService.Domain.csproj" />
</ItemGroup> </ItemGroup>

Write Preview
Loading…
Cancel
Save