Merge branch 'develop'

# Conflicts: # sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
EasyAbp · Aug 26, 2021 · f123568 · f123568
2 parents 0b11145 + b49343e
commit f123568
Show file tree

Hide file tree

Showing 51 changed files with 348 additions and 592 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>4.2.2</AbpVersion>
+    <AbpVersion>4.4.0</AbpVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/EasyAbp.Abp.SettingUi.sln b/EasyAbp.Abp.SettingUi.sln
@@ -41,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAbpApp.Application.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAbpApp.Web.Tests", "sample\MyAbpApp\test\MyAbpApp.Web.Tests\MyAbpApp.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAbpApp.EntityFrameworkCore.DbMigrations", "sample\MyAbpApp\src\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAbpApp.Domain.Shared", "sample\MyAbpApp\src\MyAbpApp.Domain.Shared\MyAbpApp.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAbpApp.Application.Contracts", "sample\MyAbpApp\src\MyAbpApp.Application.Contracts\MyAbpApp.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
@@ -127,10 +125,6 @@ Global
 		{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -196,7 +190,6 @@ Global
 		{04DBDB01-70F4-4E06-B468-8F87850B22BE} = {325C349F-2F76-42FB-9F27-9B3235631572}
 		{50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
 		{5F1B28C6-8D0C-4155-92D0-252F7EA5F674} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}

diff --git a/angular/package.json b/angular/package.json
@@ -12,11 +12,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~4.3.0",
-    "@abp/ng.theme.basic": "~4.3.0",
-    "@abp/ng.identity": "~4.3.0",
-    "@abp/ng.tenant-management": "~4.3.0",
-    "@abp/ng.setting-management": "~4.3.0",
+    "@abp/ng.account": "~4.4.0",
+    "@abp/ng.theme.basic": "~4.4.0",
+    "@abp/ng.identity": "~4.4.0",
+    "@abp/ng.tenant-management": "~4.4.0",
+    "@abp/ng.setting-management": "~4.4.0",
     "@angular/animations": "~8.2.14",
     "@angular/common": "~8.2.14",
     "@angular/compiler": "~8.2.14",

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -105,7 +105,7 @@ stages:
        displayName: 'update database'
        inputs:
         script: | 
-          dotnet ef database update --project sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore.DbMigrations/MyAbpApp.EntityFrameworkCore.DbMigrations.csproj -s sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
+          dotnet ef database update --project sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj -s sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
      
      - task: CmdLine@2
        inputs:

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.4.1</Version>
+    <Version>1.5.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/docs/README.md b/docs/README.md
@@ -2,7 +2,7 @@
 
 # Abp.SettingUi
 
-[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FAbp.SettingUi%2Fmaster%2FDirectory.Build.props)](https://abp.io)
+[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=//PackageReference[@Include=%27Volo.Abp.Ddd.Domain%27]/@Version&url=https://raw.githubusercontent.com/EasyAbp/Abp.SettingUi/develop/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/Abp.SettingUi?style=social)](https://www.github.com/EasyAbp/Abp.SettingUi)
@@ -325,6 +325,16 @@ public override void Define(IPermissionDefinitionContext context)
 
 In this way, when SettingUi enumerates the settings, if a permission in the form of `SettingUi.Group1` is found, the Group1 will only be displayed after the permission is explicitly granted.
 
+You can also use the `SettingUiPermissions.GroupName` variable. The effect is the same as the above code. The code is as follows:
+
+``` csharp
+public override void Define(IPermissionDefinitionContext context)
+{
+    var settingUiPage = context.GetPermissionOrNull(SettingUiPermissions.ShowSettingPage);  // Get ShowSettingPage permission
+    var systemGroup = settingUiPage.AddChild(SettingUiPermissions.GroupName + ".System", L("Permission:SettingUi.System")); // Add display permission of Group1: System
+}
+```
+
 We can continue to add permissions to control Group2, such as "System" -> "Password" group, we need to add a permission with the Group2 name as the suffix, the code is as follows:
 ``` csharp
 public override void Define(IPermissionDefinitionContext context)

diff --git a/docs/README_zh-Hans.md b/docs/README_zh-Hans.md
@@ -1,6 +1,6 @@
 # Abp.SettingUi
 
-[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FAbp.SettingUi%2Fmaster%2FDirectory.Build.props)](https://abp.io)
+[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=//PackageReference[@Include=%27Volo.Abp.Ddd.Domain%27]/@Version&url=https://raw.githubusercontent.com/EasyAbp/Abp.SettingUi/develop/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.Abp.SettingUi.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.Abp.SettingUi.Domain.Shared)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/Abp.SettingUi?style=social)](https://www.github.com/EasyAbp/Abp.SettingUi)
@@ -324,6 +324,16 @@ public override void Define(IPermissionDefinitionContext context)
 
 这样当SettingUi遍历设置时, 如果发现有`SettingUi.Group1`形式的权限, 则只有显式的赋予该权限后, 分组Group1才会显示.
 
+您也可以使用`SettingUiPermissions.GroupName`变量, 作用与上方代码相同, 如
+
+``` csharp
+public override void Define(IPermissionDefinitionContext context)
+{
+    var settingUiPage = context.GetPermissionOrNull(SettingUiPermissions.ShowSettingPage);  // 取得ShowSettingPage权限
+    var systemGroup = settingUiPage.AddChild(SettingUiPermissions.GroupName + ".System", L("Permission:SettingUi.System")); // 添加控制 Group1: System 的权限
+}
+```
+
 我们可以继续添加对Group2控制的权限, 如"系统" -> "密码"分组, 需要继续添加后缀为Group2的权限, 代码如下:
 
 ``` csharp

diff --git a/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj b/sample/MyAbpApp/src/MyAbpApp.Application.Contracts/MyAbpApp.Application.Contracts.csproj
@@ -13,12 +13,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="4.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj b/sample/MyAbpApp/src/MyAbpApp.Application/MyAbpApp.Application.csproj
@@ -14,12 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.Emailing" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj
@@ -9,27 +9,31 @@
 
   <ItemGroup>
     <None Remove="appsettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <!--APPSETTINGS-SECRETS-->
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
     <ProjectReference Include="..\MyAbpApp.Application.Contracts\MyAbpApp.Application.Contracts.csproj" />
-    <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore.DbMigrations\MyAbpApp.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\MyAbpApp.EntityFrameworkCore\MyAbpApp.EntityFrameworkCore.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Logs\**" />
+    <Content Remove="Logs\**" />
+    <EmbeddedResource Remove="Logs\**" />
+    <None Remove="Logs\**" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpAppDbMigratorModule.cs b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpAppDbMigratorModule.cs
@@ -7,7 +7,7 @@ namespace MyAbpApp.DbMigrator
 {
     [DependsOn(
         typeof(AbpAutofacModule),
-        typeof(MyAbpAppEntityFrameworkCoreDbMigrationsModule),
+        typeof(MyAbpAppEntityFrameworkCoreModule),
         typeof(MyAbpAppApplicationContractsModule)
         )]
     public class MyAbpAppDbMigratorModule : AbpModule

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.5" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain/MyAbpApp.Domain.csproj
@@ -12,16 +12,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Emailing" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.3.0" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain/Users/AppUser.cs b/sample/MyAbpApp/src/MyAbpApp.Domain/Users/AppUser.cs
diff --git a/...orkCore.DbMigrations/EntityFrameworkCore/MyAbpAppEntityFrameworkCoreDbMigrationsModule.cs b/...orkCore.DbMigrations/EntityFrameworkCore/MyAbpAppEntityFrameworkCoreDbMigrationsModule.cs