Merge pull request #976 from colinin/template-8.2.0

feat(templates): update templates project

aspnet-core/templates/content/Directory.Packages.props

@@ -2,8 +2,8 @@
 	<PropertyGroup>
 		<DotNetCoreCAPPackageVersion>8.1.1</DotNetCoreCAPPackageVersion>
 		<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
-		<VoloAbpPackageVersion>8.1.3</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>8.2.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>8.1.3</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>8.2.0</LINGYUNAbpPackageVersion>
 		<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
 		<MicrosoftAspNetCorePackageVersion>8.0.0</MicrosoftAspNetCorePackageVersion>
 		<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
@@ -45,6 +45,8 @@
 		<PackageVersion Include="LINGYUN.Abp.ExceptionHandling.Emailing" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.Http.Client.Wrapper" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.IdGenerator" Version="$(LINGYUNAbpPackageVersion)" />
+		<PackageVersion Include="LINGYUN.Abp.Identity.Session" Version="$(LINGYUNAbpPackageVersion)" />
+		<PackageVersion Include="LINGYUN.Abp.Identity.Session.AspNetCore" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.Localization.CultureMap" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.MultiTenancy" Version="$(LINGYUNAbpPackageVersion)" />

aspnet-core/templates/content/common.props

@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<Version>8.1.3</Version>
+		<Version>8.2.0</Version>
 		<Authors>colin</Authors>
 		<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
 		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
 		<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
-		<PackageVersion>8.1.3</PackageVersion>
+		<PackageVersion>8.2.0</PackageVersion>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj

@@ -19,13 +19,13 @@
 		<PackageReference Include="LINGYUN.Abp.AspNetCore.HttpOverrides" />
 		<PackageReference Include="LINGYUN.Abp.AspNetCore.Mvc.Localization" />
 		<PackageReference Include="LINGYUN.Abp.AspNetCore.Mvc.Wrapper" />
-		<PackageReference Include="LINGYUN.Abp.AspNetCore.Mvc.Wrapper" />
 		<PackageReference Include="LINGYUN.Abp.AuditLogging.Elasticsearch" />
 		<PackageReference Include="LINGYUN.Abp.Data.DbMigrator" />
 		<PackageReference Include="LINGYUN.Abp.Dapr.Client.Wrapper" />
 		<PackageReference Include="LINGYUN.Abp.EventBus.CAP" />
 		<PackageReference Include="LINGYUN.Abp.ExceptionHandling.Emailing" />
 		<PackageReference Include="LINGYUN.Abp.Localization.CultureMap" />
+		<PackageReference Include="LINGYUN.Abp.Identity.Session.AspNetCore" />
 		<PackageReference Include="LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore" />
 		<PackageReference Include="LINGYUN.Abp.Saas.EntityFrameworkCore" />
 		<PackageReference Include="LINGYUN.Abp.Serilog.Enrichers.Application" />

aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.Configure.cs

@@ -32,6 +32,7 @@ using System.Text.Encodings.Web;
 using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.AntiForgery;
 using Volo.Abp.Auditing;
 using Volo.Abp.Caching;
 using Volo.Abp.EntityFrameworkCore;
@@ -365,6 +366,12 @@ public partial class ProjectNameHttpApiHostModule
 
     private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false)
     {
+        Configure<AbpAntiForgeryOptions>(options =>
+        {
+            // options.AutoValidate = false;
+            // options.AutoValidateFilter = (type) => !type.Namespace.Contains("elsa", StringComparison.CurrentCultureIgnoreCase);
+        });
+
         services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             .AddJwtBearer(options =>
             {
@@ -395,8 +402,7 @@ public partial class ProjectNameHttpApiHostModule
                             .ToArray()
                     )
                     .WithAbpExposedHeaders()
-                    // 引用 LINGYUN.Abp.AspNetCore.Mvc.Wrapper 包时可替换为 WithAbpWrapExposedHeaders
+                    .WithAbpWrapExposedHeaders()
-                    .WithExposedHeaders("_AbpWrapResult", "_AbpDontWrapResult")
                     .SetIsOriginAllowedToAllowWildcardSubdomains()
                     .AllowAnyHeader()
                     .AllowAnyMethod()
@@ -410,7 +416,7 @@ public partial class ProjectNameHttpApiHostModule
         Configure<AbpWrapperOptions>(options =>
         {
             // 取消注释包装结果
-            // options.IsEnabled = true;
+            options.IsEnabled = true;
         });
     }
 

aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs

@@ -16,6 +16,8 @@ using PackageName.CompanyName.ProjectName.SettingManagement;
 using Volo.Abp;
 #if OpenIddict 
 using Volo.Abp.OpenIddict;
+#elif IdentityServer4
+using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 #endif
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Serilog;
@@ -29,6 +31,7 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.SettingManagement.EntityFrameworkCore;
 using Volo.Abp.Swashbuckle;
 using LINGYUN.Abp.AspNetCore.HttpOverrides;
+using LINGYUN.Abp.Identity.Session.AspNetCore;
 
 namespace PackageName.CompanyName.ProjectName;
 
@@ -53,11 +56,14 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(AbpTextTemplatingEntityFrameworkCoreModule),
 #if OpenIddict
     typeof(AbpOpenIddictAspNetCoreModule),
+#elif IdentityServer4
+    typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
 #endif
     typeof(AbpCachingStackExchangeRedisModule),
     typeof(AbpDistributedLockingModule),
     typeof(AbpAspNetCoreMvcWrapperModule),
     typeof(AbpAspNetCoreHttpOverridesModule),
+    typeof(AbpIdentitySessionAspNetCoreModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAutofacModule)
     )]
@@ -109,7 +115,10 @@ public partial class ProjectNameHttpApiHostModule : AbpModule
         app.UseAuthentication();
 #if OpenIddict
         app.UseAbpOpenIddictValidation();
+#elif IdentityServer4
+        app.UseJwtTokenMiddleware();
 #endif
+        app.UseAbpSession();
         app.UseDynamicClaims();
         app.UseMultiTenancy();
         app.UseAuthorization();

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName.CompanyName.ProjectName.Application.Contracts.csproj

@@ -4,7 +4,12 @@
 	<Import Project="../../configureawait.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+		<AssemblyName>PackageName.CompanyName.ProjectName.Application.Contracts</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.Application.Contracts</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application/PackageName.CompanyName.ProjectName.Application.csproj

@@ -4,7 +4,12 @@
 	<Import Project="../../configureawait.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
+		<AssemblyName>PackageName.CompanyName.ProjectName.Application</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.Application</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Domain.Shared/PackageName.CompanyName.ProjectName.Domain.Shared.csproj

@@ -4,7 +4,12 @@
 	<Import Project="../../configureawait.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+		<AssemblyName>PackageName.CompanyName.ProjectName.Domain.Shared</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.Domain.Shared</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName.CompanyName.ProjectName.Domain.csproj

@@ -3,10 +3,15 @@
 	<Import Project="../../common.props" />
 	<Import Project="../../configureawait.props" />
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
-	  <RootNamespace />
+		<AssemblyName>PackageName.CompanyName.ProjectName.Domain</AssemblyName>
-  </PropertyGroup>
+		<PackageId>PackageName.CompanyName.ProjectName.Domain</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+		<RootNamespace />
+	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Volo.Abp.AutoMapper" />
@@ -15,8 +20,8 @@
 		<PackageReference Include="LINGYUN.Abp.DataProtection" />
 	</ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <ProjectReference Include="..\PackageName.CompanyName.ProjectName.Domain.Shared\PackageName.CompanyName.ProjectName.Domain.Shared.csproj" />
+		<ProjectReference Include="..\PackageName.CompanyName.ProjectName.Domain.Shared\PackageName.CompanyName.ProjectName.Domain.Shared.csproj" />
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.EntityFrameworkCore/PackageName.CompanyName.ProjectName.EntityFrameworkCore.csproj

@@ -5,6 +5,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<AssemblyName>PackageName.CompanyName.ProjectName.EntityFrameworkCore</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.EntityFrameworkCore</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.EntityFrameworkCore/PackageName/CompanyName/ProjectName/EntityFrameworkCore/ProjectNameDbMigrationEventHandler.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
+using Volo.Abp.DistributedLocking;
 using Volo.Abp.EntityFrameworkCore.Migrations;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.MultiTenancy;
@@ -18,11 +19,12 @@ public class ProjectNameDbMigrationEventHandler : EfCoreDatabaseMigrationEventHa
         ITenantStore tenantStore,
         ICurrentTenant currentTenant, 
         IUnitOfWorkManager unitOfWorkManager, 
+        IAbpDistributedLock abpDistributedLock,
         IDistributedEventBus distributedEventBus, 
         ILoggerFactory loggerFactory) 
         : base(
             ConnectionStringNameAttribute.GetConnStringName<ProjectNameDbContext>(),
-            currentTenant, unitOfWorkManager, tenantStore, distributedEventBus, loggerFactory)
+            currentTenant, unitOfWorkManager, tenantStore, abpDistributedLock, distributedEventBus, loggerFactory)
     {
         DataSeeder = dataSeeder;
     }

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.HttpApi.Client/PackageName.CompanyName.ProjectName.HttpApi.Client.csproj

@@ -4,7 +4,12 @@
 	<Import Project="../../configureawait.props" />
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+		<AssemblyName>PackageName.CompanyName.ProjectName.HttpApi.Client</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.HttpApi.Client</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.HttpApi/PackageName.CompanyName.ProjectName.HttpApi.csproj

@@ -5,6 +5,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<AssemblyName>PackageName.CompanyName.ProjectName.HttpApi</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.HttpApi</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>
 

aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName.CompanyName.ProjectName.SettingManagement.csproj

@@ -5,6 +5,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<AssemblyName>PackageName.CompanyName.ProjectName.SettingManagement</AssemblyName>
+		<PackageId>PackageName.CompanyName.ProjectName.SettingManagement</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<RootNamespace />
 	</PropertyGroup>