From 9868d94ac925c6ecd1c439fa7791e1c7b3983225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Fri, 7 May 2021 11:46:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20abp=20=E5=8D=87=E7=BA=A7=E4=B8=BA4.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/aspnetcore/CompanyName.ProjectName.sln               | 5 +++++
 content/aspnetcore/common.props                              | 2 +-
 .../CompanyName.ProjectName.HttpApi.Host.csproj              | 2 +-
 .../CompanyName.ProjectName.Application.Contracts.csproj     | 2 +-
 .../CompanyNameProjectNameApplicationContractsModule.cs      | 3 +--
 .../CompanyName.ProjectName.Application.csproj               | 3 +--
 .../CompanyNameProjectNameApplicationModule.cs               | 3 +--
 .../CompanyName.ProjectName.Domain.Shared.csproj             | 2 +-
 .../CompanyNameProjectNameDomainSharedModule.cs              | 3 +--
 .../CompanyName.ProjectName.Domain.csproj                    | 2 +-
 .../CompanyNameProjectNameDomainModule.cs                    | 1 -
 .../CompanyName.ProjectName.HttpApi.csproj                   | 2 +-
 .../CompanyNameProjectNameHttpApiModule.cs                   | 3 +--
 13 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/content/aspnetcore/CompanyName.ProjectName.sln b/content/aspnetcore/CompanyName.ProjectName.sln
index 476ecd13..19573a88 100644
--- a/content/aspnetcore/CompanyName.ProjectName.sln
+++ b/content/aspnetcore/CompanyName.ProjectName.sln
@@ -43,6 +43,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Htt
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.PublicApi.Host", "host\CompanyName.ProjectName.PublicApi.Host\CompanyName.ProjectName.PublicApi.Host.csproj", "{14FD618E-EF80-4061-B517-F926C8190A9D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC7E3BFE-3644-4893-8475-E543F3957F2A}"
+	ProjectSection(SolutionItems) = preProject
+		common.props = common.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/content/aspnetcore/common.props b/content/aspnetcore/common.props
index 48eb85dd..0e0cd4aa 100644
--- a/content/aspnetcore/common.props
+++ b/content/aspnetcore/common.props
@@ -4,6 +4,6 @@
 		<Version>1.0.0</Version>
 		<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 		<AbpProjectType>app</AbpProjectType>
-		<AbpVersion>4.2.0</AbpVersion>
+		<AbpVersion>4.3.0</AbpVersion>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj b/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj
index 5c49978b..bbc3df36 100644
--- a/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj
+++ b/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj
@@ -31,7 +31,7 @@
 		<PackageReference Include="nacos-sdk-csharp.Extensions.Configuration" Version="1.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5" />
 		
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
 
 		<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj
index 45a3a91c..0c807cc3 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj
@@ -20,7 +20,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.SettingUi.Application.Contracts" Version="1.3.1" />
+
     <PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyNameProjectNameApplicationContractsModule.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyNameProjectNameApplicationContractsModule.cs
index 5e1e66a0..5af0696c 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyNameProjectNameApplicationContractsModule.cs
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/CompanyNameProjectNameApplicationContractsModule.cs
@@ -15,8 +15,7 @@ namespace CompanyNameProjectName
         typeof(AbpIdentityApplicationContractsModule),
         typeof(AbpPermissionManagementApplicationContractsModule),
         typeof(AbpTenantManagementApplicationContractsModule),
-        typeof(AbpObjectExtendingModule),
-        typeof(EasyAbp.Abp.SettingUi.SettingUiApplicationContractsModule)
+        typeof(AbpObjectExtendingModule)
     )]
     public class CompanyNameProjectNameApplicationContractsModule : AbpModule
     {
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj b/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj
index 8fb12d25..0302f3ec 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj
@@ -30,8 +30,7 @@
 	<ItemGroup>
 		<PackageReference Include="Hangfire.Redis.StackExchange.StrongName" Version="1.7.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
-		<PackageReference Include="EasyAbp.Abp.SettingUi.Application" Version="1.3.1" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
 		<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyNameProjectNameApplicationModule.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyNameProjectNameApplicationModule.cs
index 82a1051b..e2720b40 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyNameProjectNameApplicationModule.cs
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Application/CompanyNameProjectNameApplicationModule.cs
@@ -15,8 +15,7 @@ namespace CompanyNameProjectName
         typeof(AbpIdentityApplicationModule),
         typeof(AbpPermissionManagementApplicationModule),
         typeof(AbpTenantManagementApplicationModule),
-        typeof(AbpFeatureManagementApplicationModule),
-        typeof(EasyAbp.Abp.SettingUi.SettingUiApplicationModule)
+        typeof(AbpFeatureManagementApplicationModule)
         )]
     public class CompanyNameProjectNameApplicationModule : AbpModule
     {
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj b/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj
index a28bbfe5..689c07f5 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj
@@ -10,7 +10,7 @@
 
 	<ItemGroup>
 
-		<PackageReference Include="EasyAbp.Abp.SettingUi.Domain.Shared" Version="1.3.1" />
+	
 
 		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
 
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyNameProjectNameDomainSharedModule.cs b/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyNameProjectNameDomainSharedModule.cs
index 42946bab..b6bf6ae0 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyNameProjectNameDomainSharedModule.cs
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Domain.Shared/CompanyNameProjectNameDomainSharedModule.cs
@@ -23,8 +23,7 @@ namespace CompanyNameProjectName
         typeof(AbpIdentityServerDomainSharedModule),
         typeof(AbpPermissionManagementDomainSharedModule),
         typeof(AbpSettingManagementDomainSharedModule),
-        typeof(AbpTenantManagementDomainSharedModule),
-        typeof(EasyAbp.Abp.SettingUi.SettingUiDomainSharedModule)
+        typeof(AbpTenantManagementDomainSharedModule)
         )]
     public class CompanyNameProjectNameDomainSharedModule : AbpModule
     {
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyName.ProjectName.Domain.csproj b/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyName.ProjectName.Domain.csproj
index c20c6ec7..d01d66e3 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyName.ProjectName.Domain.csproj
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyName.ProjectName.Domain.csproj
@@ -10,7 +10,7 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="EasyAbp.Abp.SettingUi.Domain" Version="1.3.1" />
+
 		<PackageReference Include="Volo.Abp.Emailing" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyNameProjectNameDomainModule.cs b/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyNameProjectNameDomainModule.cs
index bef2be23..7b8c71a5 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyNameProjectNameDomainModule.cs
+++ b/content/aspnetcore/src/CompanyName.ProjectName.Domain/CompanyNameProjectNameDomainModule.cs
@@ -27,7 +27,6 @@ namespace CompanyNameProjectName
         typeof(AbpPermissionManagementDomainIdentityServerModule),
         typeof(AbpSettingManagementDomainModule),
         typeof(AbpTenantManagementDomainModule),
-        typeof(EasyAbp.Abp.SettingUi.SettingUiDomainModule),
         typeof(AbpCachingModule)
     )]
     public class CompanyNameProjectNameDomainModule : AbpModule
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyName.ProjectName.HttpApi.csproj b/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyName.ProjectName.HttpApi.csproj
index 4306beaa..0a0a8bd2 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyName.ProjectName.HttpApi.csproj
+++ b/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyName.ProjectName.HttpApi.csproj
@@ -10,7 +10,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.Abp.SettingUi.HttpApi" Version="1.3.1" />
+    <PackageReference Include="EasyAbp.Abp.SettingUi.HttpApi" Version="1.4.1" />
     <PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(AbpVersion)" />
diff --git a/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyNameProjectNameHttpApiModule.cs b/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyNameProjectNameHttpApiModule.cs
index eb9439a7..d8ecb99f 100644
--- a/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyNameProjectNameHttpApiModule.cs
+++ b/content/aspnetcore/src/CompanyName.ProjectName.HttpApi/CompanyNameProjectNameHttpApiModule.cs
@@ -16,8 +16,7 @@ namespace CompanyNameProjectName
         typeof(AbpIdentityHttpApiModule),
         typeof(AbpPermissionManagementHttpApiModule),
         typeof(AbpTenantManagementHttpApiModule),
-        typeof(AbpFeatureManagementHttpApiModule),
-        typeof(EasyAbp.Abp.SettingUi.SettingUiHttpApiModule)
+        typeof(AbpFeatureManagementHttpApiModule)
         )]
     public class CompanyNameProjectNameHttpApiModule : AbpModule
     {