feat: abp 升级为4.3.0

5 years ago · 9868d94ac9
13 changed files with 16 additions and 17 deletions
--- 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
--- 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>
--- 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)" />
--- 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)" />
--- 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
    {
--- 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)" />
--- 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
    {
--- 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" />

--- 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
    {
--- 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)" />
--- 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
--- 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)" />
--- 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
    {