feat: Adjust the microservice template project

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="..\..\..\..\configureawait.props" />
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net10.0</TargetFramework>
-		<Version>9.3.6</Version>
+		<Version>10.2.0</Version>
 		<Copyright>colin</Copyright>
 		<Description>Use LINGYUN.MicroService.Templates command line</Description>
 		<PackAsTool>true</PackAsTool>
@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CSharp" />
+		<!--<PackageReference Include="Microsoft.CSharp" />-->
 		<!--<PackageReference Include="NETStandard.Library" Version="2.0.3" />-->
 		<PackageReference Include="Serilog.Extensions.Logging" />
 		<PackageReference Include="Serilog.Sinks.File" />

aspnet-core/templates/micro/PackageName.CompanyName.ProjectName.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>LINGYUN.Abp.MicroService.Templates</PackageId>
-    <Version>9.3.6</Version>
+    <Version>10.2.0</Version>
     <Authors>colin.in@foxmail.com</Authors>
     <Description>Abp framework micro-service template</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -27,4 +27,4 @@
       <PackagePath>content</PackagePath>
     </Content>
   </ItemGroup>
-</Project>
+</Project>

aspnet-core/templates/micro/content/.gitlab-ci.yml

@@ -1,5 +1,3 @@
-image: mcr.microsoft.com/dotnet/sdk:9.0
-
 stages:
  - build
  - test

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

@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
-		<DotNetCoreCAPPackageVersion>8.3.5</DotNetCoreCAPPackageVersion>
+		<DotNetCoreCAPPackageVersion>10.0.0</DotNetCoreCAPPackageVersion>
-		<ElsaPackageVersion>2.15.1</ElsaPackageVersion>
+		<ElsaPackageVersion>2.16.1</ElsaPackageVersion>
-		<VoloAbpPackageVersion>9.3.6</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>10.2.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>9.3.6</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>10.2.0</LINGYUNAbpPackageVersion>
-		<MicrosoftExtensionsPackageVersion>9.0.5</MicrosoftExtensionsPackageVersion>
+		<MicrosoftExtensionsPackageVersion>10.0.2</MicrosoftExtensionsPackageVersion>
-		<MicrosoftAspNetCorePackageVersion>9.0.5</MicrosoftAspNetCorePackageVersion>
+		<MicrosoftAspNetCorePackageVersion>10.0.2</MicrosoftAspNetCorePackageVersion>
-		<MicrosoftEntityFrameworkCorePackageVersion>9.0.5</MicrosoftEntityFrameworkCorePackageVersion>
+		<MicrosoftEntityFrameworkCorePackageVersion>10.0.2</MicrosoftEntityFrameworkCorePackageVersion>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 	</PropertyGroup>
 
@@ -21,6 +21,7 @@
 		<PackageVersion Include="LINGYUN.Abp.Authorization.OrganizationUnits" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.BackgroundTasks.Abstractions" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.BackgroundTasks.Jobs" Version="$(LINGYUNAbpPackageVersion)" />
+		<PackageVersion Include="LINGYUN.Abp.BlobStoring.BlobManagement" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.Data.DbMigrator" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.DataProtection" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.DataProtection.Abstractions" Version="$(LINGYUNAbpPackageVersion)" />
@@ -48,7 +49,7 @@
 		<PackageVersion Include="LINGYUN.Abp.Exporter.Application.Contracts" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.Exporter.Core" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageVersion Include="LINGYUN.Abp.Exporter.MagicodesIE.Excel" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageVersion Include="LINGYUN.Abp.Exporter.MiniExcel" Version="$(LINGYUNAbpPackageVersion)" />
+		<PackageVersion Include="LINGYUN.Abp.Exporter.MiniSoftware" 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)" />
@@ -243,7 +244,7 @@
 
 	<!-- Abp Framework -->
 	<ItemGroup>
-		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.3.6" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.2.0" />
 		<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />
@@ -332,6 +333,7 @@
 		<PackageVersion Include="Volo.Abp.Json.Abstractions" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Localization" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.MailKit" Version="$(VoloAbpPackageVersion)" />
+		<PackageVersion Include="Volo.Abp.Mapperly" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.MemoryDb" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.MultiTenancy" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.MultiTenancy.Abstractions" Version="$(VoloAbpPackageVersion)" />
@@ -392,9 +394,11 @@
 		<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
-		<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.6" />
+		<PackageVersion Include="MySql.EntityFrameworkCore" Version="10.0.1" />
 		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
 		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="9.0.0" />
+		<PackageVersion Include="Microting.EntityFrameworkCore.MySql" Version="10.0.3" />
+		<PackageVersion Include="LINGYUN.Abp.EntityFrameworkCore.MySQL.Microting" Version="$(LINGYUNAbpPackageVersion)" />
 	</ItemGroup>
 
 	<!-- Elsa -->
@@ -430,55 +434,57 @@
 
 	<!-- Serilog -->
 	<ItemGroup>
-		<PackageVersion Include="Serilog" Version="4.2.0" />
+		<PackageVersion Include="Serilog" Version="4.3.0" />
-		<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+		<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
 		<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
 		<PackageVersion Include="Serilog.Enrichers.Assembly" Version="2.0.0" />
+		<PackageVersion Include="Serilog.Enrichers.AssemblyName" Version="2.0.0" />
 		<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
 		<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
 		<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-		<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
+		<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
-		<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+		<PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
 		<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
-		<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+		<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
-		<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
+		<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
 		<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
+		<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
 	</ItemGroup>
 
 	<!-- Test -->
 	<ItemGroup>
 		<PackageVersion Include="coverlet.collector" Version="6.0.4" />
-		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 		<PackageVersion Include="Moq.AutoMock" Version="3.5.0" />
 		<PackageVersion Include="NSubstitute" Version="5.3.0" />
 		<PackageVersion Include="Shouldly" Version="4.3.0" />
 		<PackageVersion Include="xunit" Version="2.9.3" />
 		<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
-		<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+		<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
 	</ItemGroup>
 
 	<!-- Fody -->
 	<ItemGroup>
 		<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
-		<PackageVersion Include="Fody" Version="6.9.2" />
+		<PackageVersion Include="Fody" Version="6.9.3" />
 	</ItemGroup>
 
 	<!-- Other -->
 	<ItemGroup>
-		<PackageVersion Include="aliyun-net-sdk-core" Version="1.5.10" />
+		<PackageVersion Include="aliyun-net-sdk-core" Version="1.6.2" />
 		<PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-		<PackageVersion Include="AgileConfig.Client" Version="1.6.9" />
+		<PackageVersion Include="AgileConfig.Client" Version="1.8.0" />
-		<PackageVersion Include="Dapr.Client" Version="1.15.4" />
+		<PackageVersion Include="Dapr.Client" Version="1.16.0" />
-		<PackageVersion Include="Dapr.Actors" Version="1.15.4" />
+		<PackageVersion Include="Dapr.Actors" Version="1.16.0" />
-		<PackageVersion Include="Dapr.Actors.AspNetCore" Version="1.15.4" />
+		<PackageVersion Include="Dapr.Actors.AspNetCore" Version="1.16.0" />
 		<PackageVersion Include="DistributedLock.Core" Version="1.0.8" />
-		<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
+		<PackageVersion Include="DistributedLock.Redis" Version="1.1.0" />
 		<PackageVersion Include="Hangfire.MySqlStorage" Version="2.0.3" />
-		<PackageVersion Include="HangFire.SqlServer" Version="1.8.18" />
+		<PackageVersion Include="HangFire.SqlServer" Version="1.8.21" />
 		<PackageVersion Include="IdentityModel" Version="7.0.0" />
-		<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
+		<PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
-		<PackageVersion Include="Markdig" Version="0.34.0" />
+		<PackageVersion Include="Markdig" Version="0.44.0" />
-		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageVersion Include="NEST" Version="7.17.5" />
 		<PackageVersion Include="NRules" Version="0.9.2" />
 		<PackageVersion Include="Ocelot.Provider.Polly" Version="20.0.0" />
@@ -486,15 +492,15 @@
 		<PackageVersion Include="Quartz.Serialization.Json" Version="3.14.0" />
 		<PackageVersion Include="RulesEngine" Version="5.0.5" />
 		<PackageVersion Include="Senparc.Weixin.MP" Version="16.18.9" />
-		<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.8" />
+		<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
-		<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
+		<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
-		<PackageVersion Include="StackExchange.Redis" Version="2.8.31" />
+		<PackageVersion Include="StackExchange.Redis" Version="2.9.17" />
-		<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+		<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
 		<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageVersion Include="Tencent.QCloud.Cos.Sdk" Version="5.4.37" />
-		<PackageVersion Include="TencentCloudSDK" Version="3.0.712" />
+		<PackageVersion Include="TencentCloudSDK" Version="3.0.1273" />
-		<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
+		<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
-		<PackageVersion Include="OpenIddict.Server.DataProtection" Version="6.2.1" />
+		<PackageVersion Include="OpenIddict.Server.DataProtection" Version="7.2.0" />
-		<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="6.2.1" />
+		<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="7.2.0" />
 	</ItemGroup>
 </Project>

aspnet-core/templates/micro/content/PackageName.CompanyName.ProjectName.sln

@@ -1,166 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi.Host", "host\PackageName.CompanyName.ProjectName.HttpApi.Host\PackageName.CompanyName.ProjectName.HttpApi.Host.csproj", "{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{C9675742-7986-4BC1-9781-FD1C3C5B6287}"
-	ProjectSection(SolutionItems) = preProject
-		.gitignore = .gitignore
-		common.props = common.props
-		configureawait.props = configureawait.props
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-		NuGet.Config = NuGet.Config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{4786387C-C1C5-46F8-806F-EBC54DB0A4FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A9CB1547-1C2C-4A23-82EC-C834C1626E0A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application.Tests", "tests\PackageName.CompanyName.ProjectName.Application.Tests\PackageName.CompanyName.ProjectName.Application.Tests.csproj", "{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain.Tests", "tests\PackageName.CompanyName.ProjectName.Domain.Tests\PackageName.CompanyName.ProjectName.Domain.Tests.csproj", "{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests", "tests\PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests\PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj", "{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.TestBase", "tests\PackageName.CompanyName.ProjectName.TestBase\PackageName.CompanyName.ProjectName.TestBase.csproj", "{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.DbMigrator", "migrations\PackageName.CompanyName.ProjectName.DbMigrator\PackageName.CompanyName.ProjectName.DbMigrator.csproj", "{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain.Shared", "src\PackageName.CompanyName.ProjectName.Domain.Shared\PackageName.CompanyName.ProjectName.Domain.Shared.csproj", "{77090F97-BD80-4469-842F-F5769CF849E9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain", "src\PackageName.CompanyName.ProjectName.Domain\PackageName.CompanyName.ProjectName.Domain.csproj", "{DF2CCF03-95D5-4BE4-8B32-742818C56F15}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application.Contracts", "src\PackageName.CompanyName.ProjectName.Application.Contracts\PackageName.CompanyName.ProjectName.Application.Contracts.csproj", "{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application", "src\PackageName.CompanyName.ProjectName.Application\PackageName.CompanyName.ProjectName.Application.csproj", "{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Dapr.Client", "src\PackageName.CompanyName.ProjectName.Dapr.Client\PackageName.CompanyName.ProjectName.Dapr.Client.csproj", "{B69F04FF-8505-49F6-9B60-BB800846C87C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.EntityFrameworkCore", "src\PackageName.CompanyName.ProjectName.EntityFrameworkCore\PackageName.CompanyName.ProjectName.EntityFrameworkCore.csproj", "{09CA7186-DBA7-4428-A1ED-31292AC02050}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi", "src\PackageName.CompanyName.ProjectName.HttpApi\PackageName.CompanyName.ProjectName.HttpApi.csproj", "{FDB3A3E9-C072-438D-8B8D-2AA957C1167F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi.Client", "src\PackageName.CompanyName.ProjectName.HttpApi.Client\PackageName.CompanyName.ProjectName.HttpApi.Client.csproj", "{8CE7C515-CD78-42D4-A9D7-39D217A3D046}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.SettingManagement", "src\PackageName.CompanyName.ProjectName.SettingManagement\PackageName.CompanyName.ProjectName.SettingManagement.csproj", "{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore", "migrations\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore\PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj", "{285408F0-EF7A-41B8-9828-A9B9C84E635F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-	ProjectSection(SolutionItems) = preProject
-		migrations\migrations-database.ps1 = migrations\migrations-database.ps1
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".deploy", ".deploy", "{46954769-3C8A-4E05-912A-91B896A91B97}"
-	ProjectSection(SolutionItems) = preProject
-		deploy\deployment.yaml = deploy\deployment.yaml
-		deploy\docker-compose.override.yml = deploy\docker-compose.override.yml
-		deploy\docker-compose.yml = deploy\docker-compose.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".workflows", ".workflows", "{CE7B8857-00E7-4903-A7C1-0285398616A8}"
-	ProjectSection(SolutionItems) = preProject
-		.gitlab-ci.yml = .gitlab-ci.yml
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77090F97-BD80-4469-842F-F5769CF849E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77090F97-BD80-4469-842F-F5769CF849E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77090F97-BD80-4469-842F-F5769CF849E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77090F97-BD80-4469-842F-F5769CF849E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF2CCF03-95D5-4BE4-8B32-742818C56F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF2CCF03-95D5-4BE4-8B32-742818C56F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF2CCF03-95D5-4BE4-8B32-742818C56F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF2CCF03-95D5-4BE4-8B32-742818C56F15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B69F04FF-8505-49F6-9B60-BB800846C87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B69F04FF-8505-49F6-9B60-BB800846C87C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B69F04FF-8505-49F6-9B60-BB800846C87C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B69F04FF-8505-49F6-9B60-BB800846C87C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09CA7186-DBA7-4428-A1ED-31292AC02050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09CA7186-DBA7-4428-A1ED-31292AC02050}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09CA7186-DBA7-4428-A1ED-31292AC02050}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09CA7186-DBA7-4428-A1ED-31292AC02050}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDB3A3E9-C072-438D-8B8D-2AA957C1167F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDB3A3E9-C072-438D-8B8D-2AA957C1167F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDB3A3E9-C072-438D-8B8D-2AA957C1167F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDB3A3E9-C072-438D-8B8D-2AA957C1167F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CE7C515-CD78-42D4-A9D7-39D217A3D046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CE7C515-CD78-42D4-A9D7-39D217A3D046}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CE7C515-CD78-42D4-A9D7-39D217A3D046}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CE7C515-CD78-42D4-A9D7-39D217A3D046}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{285408F0-EF7A-41B8-9828-A9B9C84E635F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{285408F0-EF7A-41B8-9828-A9B9C84E635F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{285408F0-EF7A-41B8-9828-A9B9C84E635F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{285408F0-EF7A-41B8-9828-A9B9C84E635F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{31E33CE2-71D3-43FF-9A30-2DCC82C607AE} = {4786387C-C1C5-46F8-806F-EBC54DB0A4FA}
-		{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A}
-		{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A}
-		{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A}
-		{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A}
-		{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{77090F97-BD80-4469-842F-F5769CF849E9} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{DF2CCF03-95D5-4BE4-8B32-742818C56F15} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{54FB9929-7D9C-40FC-A0D0-94ACBA37D20E} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{F2A6182F-BCB9-4C80-947C-0A2ED1B6BFDB} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{B69F04FF-8505-49F6-9B60-BB800846C87C} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{09CA7186-DBA7-4428-A1ED-31292AC02050} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{FDB3A3E9-C072-438D-8B8D-2AA957C1167F} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{8CE7C515-CD78-42D4-A9D7-39D217A3D046} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{CAEB3435-A332-4FFA-BE5F-4E386FA8B19B} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}
-		{285408F0-EF7A-41B8-9828-A9B9C84E635F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {62C0F185-E2C2-46A2-B4B2-5E703E25849E}
-	EndGlobalSection
-EndGlobal

aspnet-core/templates/micro/content/PackageName.CompanyName.ProjectName.slnx

@@ -0,0 +1,44 @@
+<Solution>
+  <Folder Name="/.docker/">
+    <File Path="docker-compose.yml" />
+  </Folder>
+  <Folder Name="/.k8s/">
+    <File Path=".k8s/deployment.yaml" />
+  </Folder>
+  <Folder Name="/.Solution Items/">
+    <File Path=".gitignore" />
+    <File Path="common.props" />
+    <File Path="configureawait.props" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="NuGet.Config" />
+  </Folder>
+  <Folder Name="/.workflows/">
+    <File Path=".gitlab-ci.yml" />
+  </Folder>
+  <Folder Name="/host/">
+    <Project Path="host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj" />
+  </Folder>
+  <Folder Name="/migrations/">
+    <File Path="migrations/migrations-database.ps1" />
+    <Project Path="migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj" />
+    <Project Path="migrations/PackageName.CompanyName.ProjectName.DbMigrator/PackageName.CompanyName.ProjectName.DbMigrator.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName.CompanyName.ProjectName.Application.Contracts.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.Application/PackageName.CompanyName.ProjectName.Application.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.Dapr.Client/PackageName.CompanyName.ProjectName.Dapr.Client.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.Domain.Shared/PackageName.CompanyName.ProjectName.Domain.Shared.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.Domain/PackageName.CompanyName.ProjectName.Domain.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.EntityFrameworkCore/PackageName.CompanyName.ProjectName.EntityFrameworkCore.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.HttpApi.Client/PackageName.CompanyName.ProjectName.HttpApi.Client.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.HttpApi/PackageName.CompanyName.ProjectName.HttpApi.csproj" />
+    <Project Path="src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName.CompanyName.ProjectName.SettingManagement.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/PackageName.CompanyName.ProjectName.Application.Tests/PackageName.CompanyName.ProjectName.Application.Tests.csproj" />
+    <Project Path="tests/PackageName.CompanyName.ProjectName.Domain.Tests/PackageName.CompanyName.ProjectName.Domain.Tests.csproj" />
+    <Project Path="tests/PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests/PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj" />
+    <Project Path="tests/PackageName.CompanyName.ProjectName.TestBase/PackageName.CompanyName.ProjectName.TestBase.csproj" />
+  </Folder>
+</Solution>

aspnet-core/templates/micro/content/common.props

@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<Version>9.3.6</Version>
+		<Version>10.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>9.3.6</PackageVersion>
+		<PackageVersion>10.2.0</PackageVersion>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

aspnet-core/templates/micro/content/deploy/docker-compose.override.yml

@@ -1,9 +0,0 @@
-services:
-  project-name-api:
-    build:
-      context: ../host/PackageName.CompanyName.ProjectName.HttpApi.Host/bin/Release/net9.0
-      dockerfile: ../host/PackageName.CompanyName.ProjectName.HttpApi.Host/Dockerfile
-    volumes:
-      - /var/opt/project-name/logs:/app/Logs
-      - /var/opt/project-name/modules:/app/Modules
-    restart: always

aspnet-core/templates/micro/content/deploy/docker-compose.yml → aspnet-core/templates/micro/content/docker-compose.yml

@@ -1,5 +1,8 @@
 services:
   project-name-api:
+    build:
+      context: .
+      dockerfile: host/PackageName.CompanyName.ProjectName.HttpApi.Host/Dockerfile
     hostname: project-name-api
     container_name: project-name-api
     environment:
@@ -13,3 +16,7 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    restart: always
+    volumes:
+      - /var/opt/project-name/logs:/app/Logs
+      - /var/opt/project-name/modules:/app/Modules

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

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 
@@ -43,15 +43,46 @@ COPY . /app
 #RUN apt-get clean
 #RUN apt-get update
 
+RUN apt update && apt install wget -y
+
+USER $APP_UID
+
 ## .NET 8.0 默认使用8080端口,变更为80端口需要环境变量ASPNETCORE_HTTP_PORTS=80
 ## .NET 8.0 defaults to port 8080, changing to port 80 requires the environment variable ASPNETCORE.HTTP-PORTS=80
-
 EXPOSE 8080/tcp
 
 VOLUME [ "./app/Logs" ]
 VOLUME [ "./app/Modules" ]
 
-RUN apt update
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
-RUN apt install wget -y
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /build
+
+## 复制构建项目所需配置
+COPY ["common.props", "./"]
+COPY ["configureawait.props", "./"]
+COPY ["Directory.Build.props", "./"]
+COPY ["Directory.Packages.props", "./"]
+COPY ["NuGet.Config", "./"]
 
-ENTRYPOINT ["dotnet", "PackageName.CompanyName.ProjectName.HttpApi.Host.dll"]
+## 复制项目结构
+COPY ["src/", "build/src/"]
+COPY ["migrations/", "build/migrations/"]
+COPY ["host/", "build/host/"]
+RUN dotnet restore "build/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj"
+
+## 构建
+COPY . .
+WORKDIR "/build/host/PackageName.CompanyName.ProjectName.HttpApi.Host"
+RUN dotnet build "./PackageName.CompanyName.ProjectName.HttpApi.Host.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+## 发布
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./PackageName.CompanyName.ProjectName.HttpApi.Host.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+## 运行
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "PackageName.CompanyName.ProjectName.HttpApi.Host.dll"]

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

@@ -19,11 +19,12 @@
 		<PackageReference Include="LINGYUN.Abp.AspNetCore.HttpOverrides" />
 		<PackageReference Include="LINGYUN.Abp.AspNetCore.Mvc.Wrapper" />
 		<PackageReference Include="LINGYUN.Abp.AuditLogging.Elasticsearch" />
+		<PackageReference Include="LINGYUN.Abp.BlobStoring.BlobManagement" />
 		<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.Exporter.MiniExcel" />
+		<PackageReference Include="LINGYUN.Abp.Exporter.MiniSoftware" />
 		<PackageReference Include="LINGYUN.Abp.Localization.CultureMap" />
 		<PackageReference Include="LINGYUN.Abp.Identity.Session.AspNetCore" />
 		<PackageReference Include="LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore" />
@@ -44,6 +45,7 @@
 		<PackageReference Include="Serilog.Enrichers.Process" />
 		<PackageReference Include="Serilog.Enrichers.Thread" />
 		<PackageReference Include="Serilog.Settings.Configuration" />
+		<PackageReference Include="Serilog.Sinks.Async" />
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" />
 		<PackageReference Include="Serilog.Sinks.File" />
 		<PackageReference Include="Volo.Abp.AspNetCore.Serilog" />

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

@@ -2,7 +2,7 @@
 using LINGYUN.Abp.Dapr.Client.ClientProxying;
 using LINGYUN.Abp.ExceptionHandling;
 using LINGYUN.Abp.ExceptionHandling.Emailing;
-using LINGYUN.Abp.Exporter.MiniExcel;
+using LINGYUN.Abp.Exporter.MiniSoftware;
 using LINGYUN.Abp.Localization.CultureMap;
 using LINGYUN.Abp.LocalizationManagement;
 using LINGYUN.Abp.Serilog.Enrichers.Application;
@@ -20,8 +20,9 @@ using Microsoft.Extensions.Caching.StackExchangeRedis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using StackExchange.Redis;
+using Swashbuckle.AspNetCore.SwaggerGen;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -137,8 +138,11 @@ public partial class ProjectNameHttpApiHostModule
         var distributedLockIsEnabled = configuration["DistributedLock:IsEnabled"];
         if (distributedLockIsEnabled.IsNullOrWhiteSpace() || bool.Parse(distributedLockIsEnabled))
         {
-            var redis = ConnectionMultiplexer.Connect(configuration["DistributedLock:Redis:Configuration"]);
+            services.AddSingleton<IDistributedLockProvider>(_ =>
-            services.AddSingleton<IDistributedLockProvider>(_ => new RedisDistributedSynchronizationProvider(redis.GetDatabase()));
+            {
+                return new RedisDistributedSynchronizationProvider(
+                    ConnectionMultiplexer.Connect(configuration["DistributedLock:Redis:Configuration"]).GetDatabase());
+            });
         }
     }
     private void ConfigureExceptionHandling()
@@ -232,12 +236,16 @@ public partial class ProjectNameHttpApiHostModule
         services.AddHealthChecks();
     }
 
-    private void ConfigureMiniExcel()
+    private void ConfigureMiniSoftware()
     {
         Configure<AbpExporterMiniExcelOptions>(options =>
         {
             // MiniExcel导入导出配置
         });
+        Configure<AbpExporterMiniWordOptions>(options =>
+        {
+            // MiniWord导入导出配置
+        });
     }
 
     private void ConfigureFeatureManagement(IConfiguration configuration)
@@ -368,25 +376,16 @@ public partial class ProjectNameHttpApiHostModule
                     BearerFormat = "JWT"
                 });
 
-                options.AddSecurityRequirement(new OpenApiSecurityRequirement
-                {
-                    {
-                        new OpenApiSecurityScheme
-                        {
-                            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" }
-                        },
-                        new string[] { }
-                    }
-                });
-
                 var currentPath = AppContext.BaseDirectory;
                 var xmlDocFiles = Directory.GetFiles(currentPath, "PackageName.CompanyName.ProjectName.*.xml");
+                xmlDocFiles.AddIfNotContains(Directory.GetFiles(AppContext.BaseDirectory, "Volo.Abp.*.xml"));
 
                 foreach (var xmlDocFile in xmlDocFiles)
                 {
                     options.IncludeXmlComments(xmlDocFile);
                 }
 
+                options.SchemaFilter<EnumDescriptionSchemaFilter>();
                 options.OperationFilter<TenantHeaderParamter>();
                 options.HideAbpEndpoints();
             });
@@ -426,6 +425,7 @@ public partial class ProjectNameHttpApiHostModule
     {
         Configure<AbpAntiForgeryOptions>(options =>
         {
+            configuration.GetSection("AntiForgery").Bind(options);
             // options.AutoValidate = false;
             // options.AutoValidateFilter = (type) => !type.Namespace.Contains("elsa", StringComparison.CurrentCultureIgnoreCase);
         });
@@ -455,15 +455,13 @@ public partial class ProjectNameHttpApiHostModule
                     options.TokenValidationParameters.ValidAudiences = validAudiences;
                 }
             });
-
+        services.AddDataProtection()
-        if (!isDevelopment)
+            .SetApplicationName("LINGYUN.Abp.Application")
-        {
+            .PersistKeysToStackExchangeRedis(() =>
-            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
+            {
-            services
+                return ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]).GetDatabase();
-                .AddDataProtection()
+            },
-                .SetApplicationName("LINGYUN.Abp.Application")
+            "LINGYUN.Abp.Application:DataProtection:Protection-Keys");
-                .PersistKeysToStackExchangeRedis(redis, "LINGYUN.Abp.Application:DataProtection:Protection-Keys");
-        }
     }
 
     private void ConfigureCors(IServiceCollection services, IConfiguration configuration)

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

@@ -1,19 +1,20 @@
 using LINGYUN.Abp.AspNetCore.HttpOverrides;
 using LINGYUN.Abp.AspNetCore.Mvc.Wrapper;
 using LINGYUN.Abp.AuditLogging.Elasticsearch;
+using LINGYUN.Abp.BlobStoring.BlobManagement;
 using LINGYUN.Abp.Claims.Mapping;
 using LINGYUN.Abp.Emailing.Platform;
 using LINGYUN.Abp.EventBus.CAP;
 using LINGYUN.Abp.ExceptionHandling.Emailing;
-using LINGYUN.Abp.Exporter.MiniExcel;
+using LINGYUN.Abp.Exporter.MiniSoftware;
 using LINGYUN.Abp.Identity.Session.AspNetCore;
 using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore;
 using LINGYUN.Abp.Saas.EntityFrameworkCore;
 using LINGYUN.Abp.Serilog.Enrichers.Application;
 using LINGYUN.Abp.Serilog.Enrichers.UniqueId;
 using LINGYUN.Abp.Sms.Platform;
-using LINGYUN.Abp.Telemetry.SkyWalking;
 using LINGYUN.Abp.Telemetry.OpenTelemetry;
+using LINGYUN.Abp.Telemetry.SkyWalking;
 using LINGYUN.Abp.TextTemplating.EntityFrameworkCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -61,6 +62,7 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(AbpTextTemplatingEntityFrameworkCoreModule),
 
     typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
+    typeof(AbpBlobStoringBlobManagementModule),
     typeof(AbpCachingStackExchangeRedisModule),
     typeof(AbpDistributedLockingModule),
     typeof(AbpAspNetCoreMvcWrapperModule),
@@ -68,7 +70,7 @@ namespace PackageName.CompanyName.ProjectName;
     typeof(AbpIdentitySessionAspNetCoreModule),
     typeof(AbpTelemetrySkyWalkingModule),
     typeof(AbpTelemetryOpenTelemetryModule),
-    typeof(AbpExporterMiniExcelModule),
+    typeof(AbpExporterMiniSoftwareModule),
     typeof(AbpClaimsMappingModule),
     typeof(AbpEmailingPlatformModule),
     typeof(AbpSmsPlatformModule),
@@ -93,7 +95,7 @@ public partial class ProjectNameHttpApiHostModule : AbpModule
         var configuration = context.Services.GetConfiguration();
 
         ConfigureWrapper();
-        ConfigureMiniExcel();
+        ConfigureMiniSoftware();
         ConfigureExceptionHandling();
         ConfigureVirtualFileSystem();
         ConfigureTiming(configuration);

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Swashbuckle/AspNetCore/SwaggerGen/EnumDescriptionSchemaFilter.cs

@@ -0,0 +1,41 @@
+using Microsoft.OpenApi;
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Swashbuckle.AspNetCore.SwaggerGen;
+
+#nullable enable
+public class EnumDescriptionSchemaFilter : ISchemaFilter
+{
+    public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
+    {
+        if (context.Type.IsEnum)
+        {
+            var enumType = context.Type;
+            var enumValues = Enum.GetValues(enumType);
+            var underlyingType = Enum.GetUnderlyingType(enumType);
+
+            var enumDesc = enumType.GetCustomAttribute<DescriptionAttribute>()?.Description ?? enumType.Name;
+            schema.Description += $"{enumDesc}<br />";
+
+            schema.Description += "<p>Options:</p><ul>";
+
+            foreach (var value in enumValues)
+            {
+                string? description = default!;
+                var name = Enum.GetName(enumType, value);
+                if (name != null)
+                {
+                    var memberInfo = enumType.GetMember(name)[0];
+                    description = memberInfo.GetCustomAttribute<DescriptionAttribute>()?.Description ?? name;
+                }
+                var numericValue = Convert.ChangeType(value, underlyingType);
+                schema.Description += $"<li><b>{numericValue}</b>: {name}({description ?? "No description."})</li>";
+            }
+
+            schema.Description += "</ul>";
+        }
+    }
+}
+#nullable disable

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/Swashbuckle/AspNetCore/SwaggerGen/TenantHeaderParamter.cs

@@ -0,0 +1,35 @@
+using Microsoft.Extensions.Options;
+using Microsoft.OpenApi;
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.MultiTenancy;
+
+namespace Swashbuckle.AspNetCore.SwaggerGen;
+
+public class TenantHeaderParamter : IOperationFilter
+{
+    private readonly AbpMultiTenancyOptions _multiTenancyOptions;
+    private readonly AbpAspNetCoreMultiTenancyOptions _aspNetCoreMultiTenancyOptions;
+    public TenantHeaderParamter(
+        IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
+        IOptions<AbpAspNetCoreMultiTenancyOptions> aspNetCoreMultiTenancyOptions)
+    {
+        _multiTenancyOptions = multiTenancyOptions.Value;
+        _aspNetCoreMultiTenancyOptions = aspNetCoreMultiTenancyOptions.Value;
+    }
+
+    public void Apply(OpenApiOperation operation, OperationFilterContext context)
+    {
+        if (_multiTenancyOptions.IsEnabled)
+        {
+            operation.Parameters ??= new List<IOpenApiParameter>();
+            operation.Parameters.Add(new OpenApiParameter
+            {
+                Name = _aspNetCoreMultiTenancyOptions.TenantKey,
+                In = ParameterLocation.Header,
+                Description = "Tenant Id in http header",
+                Required = false
+            });
+        }
+    }
+}

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

@@ -1,31 +0,0 @@
-using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Collections.Generic;
-using Volo.Abp.MultiTenancy;
-
-namespace PackageName.CompanyName.ProjectName;
-
-public class TenantHeaderParamter : IOperationFilter
-{
-    private readonly AbpMultiTenancyOptions _options;
-    public TenantHeaderParamter(
-        IOptions<AbpMultiTenancyOptions> options)
-    {
-        _options = options.Value;
-    }
-    public void Apply(OpenApiOperation operation, OperationFilterContext context)
-    {
-        if (_options.IsEnabled)
-        {
-            operation.Parameters = operation.Parameters ?? new List<OpenApiParameter>();
-            operation.Parameters.Add(new OpenApiParameter
-            {
-                Name = TenantResolverConsts.DefaultTenantKey,
-                In = ParameterLocation.Header,
-                Description = "Tenant Id/Name",
-                Required = false
-            });
-        }
-    }
-}

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/appsettings.Development.json

@@ -83,6 +83,10 @@
     }
   },
   "RemoteServices": {
+    "BlobManagement": {
+      "BaseUrl": "http://127.0.0.1:30025",
+      "UseCurrentAccessToken": "true"
+    },
     "Platform": {
       "BaseUrl": "http://127.0.0.1:30025",
       "UseCurrentAccessToken": "False"
@@ -142,7 +146,8 @@
   },
   "AuthServer": {
     "Authority": "http://127.0.0.1:44385/",
-    "Audience": "lingyun-abp-application",
+    "Audience": "ProjectName",
+    "ValidAudiences": [ "lingyun-abp-application" ],
     "MapInboundClaims": false,
     "RequireHttpsMetadata": false,
     "SwaggerClientId": "vue-oauth-client"
@@ -184,24 +189,23 @@
       "Override": {
         "System": "Warning",
         "Microsoft": "Warning",
+        "Microsoft.EntityFrameworkCore": "Information",
         "DotNetCore": "Debug"
       }
     },
     "WriteTo": [
       {
-        "Name": "Console",
+        "Name": "Async",
-        "Args": {
-          "restrictedToMinimumLevel": "Debug",
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "Elasticsearch",
         "Args": {
-          "nodeUris": "http://127.0.0.1:9200",
+          "configure": [
-          "indexFormat": "abp.dev.logging-{0:yyyy.MM.dd}",
+            {
-          "autoRegisterTemplate": true,
+              "Name": "Console",
-          "autoRegisterTemplateVersion": "ESv7"
+              "Args": {
+                "restrictedToMinimumLevel": "Debug",
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            }
+          ]
         }
       }
     ]

aspnet-core/templates/micro/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/appsettings.json

@@ -1,6 +1,9 @@
 {
+  "AntiForgery": {
+    "AutoValidate":  false
+  },
   "App": {
-    "CorsOrigins": "http://127.0.0.1:30000",
+    "CorsOrigins": ["http://127.0.0.1:30000"],
     "RefreshClaimsUrl": "http://127.0.0.1:30015/",
     "HealthChecks": "/healthz"
   },
@@ -35,72 +38,77 @@
     "Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName", "WithUniqueId" ],
     "WriteTo": [
       {
-        "Name": "Console",
+        "Name": "Async",
-        "Args": {
-          "initialMinimumLevel": "Verbose",
-          "standardErrorFromLevel": "Verbose",
-          "restrictedToMinimumLevel": "Verbose",
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/Debug-.log",
-          "restrictedToMinimumLevel": "Debug",
-          "rollingInterval": "Day",
-          "rollOnFileSizeLimit": true,
-          "retainedFileCountLimit": 50,
-          "fileSizeLimitBytes": 5242880,
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/Info-.log",
-          "restrictedToMinimumLevel": "Information",
-          "rollingInterval": "Day",
-          "rollOnFileSizeLimit": true,
-          "retainedFileCountLimit": 50,
-          "fileSizeLimitBytes": 5242880,
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/Warn-.log",
-          "restrictedToMinimumLevel": "Warning",
-          "rollingInterval": "Day",
-          "rollOnFileSizeLimit": true,
-          "retainedFileCountLimit": 50,
-          "fileSizeLimitBytes": 5242880,
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/Error-.log",
-          "restrictedToMinimumLevel": "Error",
-          "rollingInterval": "Day",
-          "rollOnFileSizeLimit": true,
-          "retainedFileCountLimit": 50,
-          "fileSizeLimitBytes": 5242880,
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-        }
-      },
-      {
-        "Name": "File",
         "Args": {
-          "path": "Logs/Fatal-.log",
+          "configure": [
-          "restrictedToMinimumLevel": "Fatal",
+            {
-          "rollingInterval": "Day",
+              "Name": "Console",
-          "rollOnFileSizeLimit": true,
+              "Args": {
-          "retainedFileCountLimit": 50,
+                "restrictedToMinimumLevel": "Debug",
-          "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
-          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "File",
+              "Args": {
+                "path": "Logs/Debug-.log",
+                "restrictedToMinimumLevel": "Debug",
+                "rollingInterval": "Day",
+                "rollOnFileSizeLimit": true,
+                "retainedFileCountLimit": 50,
+                "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "File",
+              "Args": {
+                "path": "Logs/Info-.log",
+                "restrictedToMinimumLevel": "Information",
+                "rollingInterval": "Day",
+                "rollOnFileSizeLimit": true,
+                "retainedFileCountLimit": 50,
+                "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "File",
+              "Args": {
+                "path": "Logs/Warn-.log",
+                "restrictedToMinimumLevel": "Warning",
+                "rollingInterval": "Day",
+                "rollOnFileSizeLimit": true,
+                "retainedFileCountLimit": 50,
+                "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "File",
+              "Args": {
+                "path": "Logs/Error-.log",
+                "restrictedToMinimumLevel": "Error",
+                "rollingInterval": "Day",
+                "rollOnFileSizeLimit": true,
+                "retainedFileCountLimit": 50,
+                "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            },
+            {
+              "Name": "File",
+              "Args": {
+                "path": "Logs/Fatal-.log",
+                "restrictedToMinimumLevel": "Fatal",
+                "rollingInterval": "Day",
+                "rollOnFileSizeLimit": true,
+                "retainedFileCountLimit": 50,
+                "fileSizeLimitBytes": 5242880,
+                "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+              }
+            }
+          ]
         }
       }
     ]

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore.csproj

@@ -5,9 +5,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
+		<AssemblyName>PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore</AssemblyName>
-		<Nullable>enable</Nullable>
+		<PackageId>PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 		<IsPackable>false</IsPackable>
+		<Nullable>enable</Nullable>
+		<RootNamespace>PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -17,7 +22,7 @@
 		</PackageReference>
 		<PackageReference Include="LINGYUN.Abp.Data.DbMigrator" />
 		<PackageReference Include="LINGYUN.Abp.Saas.EntityFrameworkCore" />
-		<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySql.Pomelo" Condition="'$(MySQL)'=='true'" />
+		<PackageReference Include="LINGYUN.Abp.EntityFrameworkCore.MySQL.Microting" Condition="'$(MySQL)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Condition="'$(SqlServer)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Condition="'$(Sqlite)'=='true'" />
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore.Oracle" Condition="'$(Oracle)'=='true'" />

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/ProjectNameDataSeeder.cs

@@ -0,0 +1,29 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
+
+public class ProjectNameDataSeeder : ITransientDependency
+{
+    protected ILogger<ProjectNameDataSeeder> Logger { get; }
+    protected ICurrentTenant CurrentTenant { get; }
+
+    public ProjectNameDataSeeder(
+        ICurrentTenant currentTenant)
+    {
+        CurrentTenant = currentTenant;
+
+        Logger = NullLogger<ProjectNameDataSeeder>.Instance;
+    }
+
+    public virtual Task SeedAsync(DataSeedContext context)
+    {
+        // TODO: 此处执行你的数据种子
+        return Task.CompletedTask;
+    }
+}

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/ProjectNameDbMigrationEventHandler.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using System;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.DistributedLocking;
@@ -12,10 +11,10 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
 
 public class ProjectNameDbMigrationEventHandler : EfCoreDatabaseMigrationEventHandlerBase<ProjectNameDbContext>
 {
-    protected IDataSeeder DataSeeder { get; }
+    protected ProjectNameDataSeeder DataSeeder { get; }
 
     public ProjectNameDbMigrationEventHandler(
-        IDataSeeder dataSeeder,
+        ProjectNameDataSeeder dataSeeder,
         ITenantStore tenantStore,
         ICurrentTenant currentTenant, 
         IUnitOfWorkManager unitOfWorkManager, 
@@ -29,8 +28,18 @@ public class ProjectNameDbMigrationEventHandler : EfCoreDatabaseMigrationEventHa
         DataSeeder = dataSeeder;
     }
 
-    protected async override Task SeedAsync(Guid? tenantId)
+    protected async override Task AfterTenantCreated(TenantCreatedEto eventData, bool schemaMigrated)
     {
-        await DataSeeder.SeedAsync(tenantId);
+        // 新租户数据种子
+        var context = new DataSeedContext(eventData.Id);
+        if (eventData.Properties != null)
+        {
+            foreach (var property in eventData.Properties)
+            {
+                context.WithProperty(property.Key, property.Value);
+            }
+        }
+
+        await DataSeeder.SeedAsync(context);
     }
 }

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/ProjectNameDbMigrationService.cs

@@ -1,9 +1,6 @@
 using LINGYUN.Abp.Data.DbMigrator;
-using LINGYUN.Abp.Saas.Tenants;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
@@ -16,14 +13,10 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
 
 public class ProjectNameDbMigrationService : EfCoreRuntimeDbMigratorBase<ProjectNameDbContext>, ITransientDependency
 {
-    protected IDataSeeder DataSeeder { get; }
+    protected ProjectNameDataSeeder DataSeeder { get; }
-    protected IDbSchemaMigrator DbSchemaMigrator { get; }
-    protected ITenantRepository TenantRepository { get; }
 
     public ProjectNameDbMigrationService(
-        IDataSeeder dataSeeder,
+        ProjectNameDataSeeder dataSeeder,
-        IDbSchemaMigrator dbSchemaMigrator,
-        ITenantRepository tenantRepository,
         ICurrentTenant currentTenant,
         IUnitOfWorkManager unitOfWorkManager,
         IServiceProvider serviceProvider,
@@ -35,36 +28,11 @@ public class ProjectNameDbMigrationService : EfCoreRuntimeDbMigratorBase<Project
             unitOfWorkManager, serviceProvider, currentTenant, abpDistributedLock, distributedEventBus, loggerFactory)
     {
         DataSeeder = dataSeeder;
-        DbSchemaMigrator = dbSchemaMigrator;
-        TenantRepository = tenantRepository;
-    }
-
-    protected async override Task LockAndApplyDatabaseMigrationsAsync()
-    {
-        await base.LockAndApplyDatabaseMigrationsAsync();
-
-        IList<Tenant> tenants;
-
-        try
-        {
-            tenants = await TenantRepository.GetListAsync();
-        }
-        catch
-        {
-            return;
-        }
-
-
-        foreach (var tenant in tenants.Where(x => x.IsActive))
-        {
-            await LockAndApplyDatabaseWithTenantMigrationsAsync(tenant.Id);
-        }
     }
 
     protected async override Task SeedAsync()
     {
-        Logger.LogInformation($"Executing {(!CurrentTenant.IsAvailable ? "host" : CurrentTenant.Name ?? CurrentTenant.GetId().ToString())} database seed...");
+        // DbMigrator迁移数据种子
-
+        await DataSeeder.SeedAsync(new DataSeedContext());
-        await DataSeeder.SeedAsync(CurrentTenant.Id);
     }
 }

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator.EntityFrameworkCore/ProjectNameDbMigratorEntityFrameworkCoreModule.cs

@@ -6,7 +6,9 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
 #if MySQL
-using Volo.Abp.EntityFrameworkCore.MySQL;
+// using Volo.Abp.EntityFrameworkCore.MySQL;
+using LINGYUN.Abp.EntityFrameworkCore.MySQL;
+using Microsoft.EntityFrameworkCore;
 #elif SqlServer 
 using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -17,6 +19,7 @@ using Volo.Abp.EntityFrameworkCore.Oracle;
 #elif OracleDevart 
 using Volo.Abp.EntityFrameworkCore.Oracle.Devart;
 #elif PostgreSql 
+using System;
 using Volo.Abp.EntityFrameworkCore.PostgreSql;
 #endif
 
@@ -27,7 +30,8 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
     typeof(ProjectNameEntityFrameworkCoreModule),
     typeof(AbpSaasEntityFrameworkCoreModule),
 #if MySQL
-    typeof(AbpEntityFrameworkCoreMySQLPomeloModule),
+    // typeof(AbpEntityFrameworkCoreMySQLPomeloModule),
+    typeof(AbpEntityFrameworkCoreMySQLMicrotingModule),
 #elif SqlServer
     typeof(AbpEntityFrameworkCoreSqlServerModule),
 #elif Sqlite
@@ -43,6 +47,13 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
     )]
 public class ProjectNameDbMigratorEntityFrameworkCoreModule : AbpModule
 {
+#if PostgreSql
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        // https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic
+        AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+    }
+#endif
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         // 配置Ef
@@ -52,12 +63,12 @@ public class ProjectNameDbMigratorEntityFrameworkCoreModule : AbpModule
             options.UseMySQL(mysql =>
             {
                 // see: https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/1960
-                mysql.TranslateParameterizedCollectionsToConstants();
+                mysql.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
             });
             options.UseMySQL<ProjectNameDbContext>(mysql =>
             {
                 // see: https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/1960
-                mysql.TranslateParameterizedCollectionsToConstants();
+                mysql.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
             });
 #elif SqlServer
             options.UseSqlServer();

aspnet-core/templates/micro/content/migrations/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.json

@@ -1,13 +1,6 @@
 {
   "ConnectionStrings": {
-    "ProjectName": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
+    "ProjectName": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
-    "AbpSaas": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpTenantManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpSettingManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpPermissionManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpFeatureManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpTextTemplating": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456",
-    "AbpLocalizationManagement": "Server=127.0.0.1;Database=ProjectName;User Id=root;Password=123456"
   },
   "DistributedLock": {
     "IsEnabled": true,

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Application/PackageName/CompanyName/ProjectName/ProjectNameApplicationMapperProfile.cs

@@ -1,10 +0,0 @@
-using AutoMapper;
-
-namespace PackageName.CompanyName.ProjectName;
-
-public class ProjectNameApplicationMapperProfile : Profile
-{
-    public ProjectNameApplicationMapperProfile()
-    {
-    }
-}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Application/PackageName/CompanyName/ProjectName/ProjectNameApplicationMappers.cs

@@ -0,0 +1,15 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Abp.ObjectExtending;
+
+namespace PackageName.CompanyName.ProjectName;
+
+// Mapper Exemple
+
+//[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+//[MapExtraProperties(DefinitionChecks = MappingPropertyDefinitionChecks.None)]
+//public partial class EntityToEntityDtoMapper : MapperBase<Entity, DentityDto>
+//{
+//      public override partial DentityDto Map(Entity source);
+//      public override partial void Map(Entity source, DentityDto destination);
+//}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Application/PackageName/CompanyName/ProjectName/ProjectNameApplicationModule.cs

@@ -3,7 +3,6 @@ using LINGYUN.Abp.Exporter;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
 using Volo.Abp.Authorization;
-using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
 namespace PackageName.CompanyName.ProjectName;
@@ -19,11 +18,6 @@ public class ProjectNameApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<ProjectNameApplicationModule>();
+        context.Services.AddMapperlyObjectMapper<ProjectNameApplicationModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<ProjectNameApplicationMapperProfile>(validate: true);
-        });
     }
 }

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

@@ -15,9 +15,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Volo.Abp.AutoMapper" />
 		<PackageReference Include="Volo.Abp.Caching" />
 		<PackageReference Include="Volo.Abp.Ddd.Domain" />
+		<PackageReference Include="Volo.Abp.Mapperly" />
 		<PackageReference Include="LINGYUN.Abp.DataProtection" />
 	</ItemGroup>
 

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/IProjectNameBasicRepository.cs

@@ -1,17 +1,17 @@
-using LINGYUN.Abp.DataProtection;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Specifications;
 
 namespace PackageName.CompanyName.ProjectName;
 /// <summary>
-/// 基本仓储接口
+/// 实体仓储接口
 /// </summary>
 /// <typeparam name="TEntity">实体类型</typeparam>
 /// <typeparam name="TKey">实体主键类型</typeparam>
-public interface IProjectNameBasicRepository<TEntity, TKey> : IDataProtectionRepository<TEntity>
+public interface IProjectNameBasicRepository<TEntity, TKey> : IBasicRepository<TEntity, TKey>
     where TEntity : class, IEntity<TKey>
 {
     /// <summary>
@@ -34,21 +34,8 @@ public interface IProjectNameBasicRepository<TEntity, TKey> : IDataProtectionRep
     /// <returns></returns>
     Task<List<TEntity>> GetListAsync(
         ISpecification<TEntity> specification,
-        string sorting = nameof(IEntity<TKey>.Id),
+        string? sorting = nameof(IEntity<TKey>.Id),
         int maxResultCount = 10,
         int skipCount = 0,
         CancellationToken cancellationToken = default);
-    /// <summary>
-    /// 获取过滤后的实体列表
-    /// </summary>
-    /// <param name="specification"></param>
-    /// <param name="sorting"></param>
-    /// <param name="maxResultCount"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    Task<List<TEntity>> GetListAsync(
-        ISpecification<TEntity> specification,
-        string sorting = nameof(IEntity<TKey>.Id),
-        int maxResultCount = 10,
-        CancellationToken cancellationToken = default);
 }

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/IProjectNameDataProtectionRepository.cs

@@ -0,0 +1,15 @@
+using LINGYUN.Abp.DataProtection;
+using Volo.Abp.Domain.Entities;
+
+namespace PackageName.CompanyName.ProjectName;
+/// <summary>
+/// 受保护实体保护仓储接口
+/// </summary>
+/// <typeparam name="TEntity">实体类型</typeparam>
+/// <typeparam name="TKey">实体主键类型</typeparam>
+public interface IProjectNameDataProtectionRepository<TEntity, TKey> :
+    IProjectNameBasicRepository<TEntity, TKey>,
+    IDataProtectionRepository<TEntity>
+    where TEntity : class, IEntity<TKey>
+{
+}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/ProjectNameDataSeedContributor.cs

@@ -1,22 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-
-namespace PackageName.CompanyName.ProjectName;
-
-public class ProjectNameDataSeedContributor : IDataSeedContributor, ITransientDependency
-{
-    private readonly ILogger<ProjectNameDataSeedContributor> _logger;
-    public ProjectNameDataSeedContributor(ILogger<ProjectNameDataSeedContributor> logger)
-    {
-        _logger = logger;
-    }
-
-    public Task SeedAsync(DataSeedContext context)
-    {
-        _logger.LogInformation("Write your data seed logic here.");
-
-        return Task.CompletedTask;
-    }
-}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/ProjectNameDomainMapperProfile.cs

@@ -1,11 +0,0 @@
-using AutoMapper;
-
-namespace PackageName.CompanyName.ProjectName;
-
-public class ProjectNameDomainMapperProfile : Profile
-{
-    public ProjectNameDomainMapperProfile()
-    {
-
-    }
-}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/ProjectNameDomainMappers.cs

@@ -0,0 +1,16 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Abp.ObjectExtending;
+
+namespace PackageName.CompanyName.ProjectName;
+
+// Mapper Exemple
+
+//[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+//[MapExtraProperties(DefinitionChecks = MappingPropertyDefinitionChecks.None)]
+//public partial class EntityToEntityEtoMapper : MapperBase<Entity, DentityEto>
+//{
+//      public override partial DentityEto Map(Entity source);
+//      public override partial void Map(Entity source, DentityEto destination);
+//}
+

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.Domain/PackageName/CompanyName/ProjectName/ProjectNameDomainModule.cs

@@ -1,14 +1,14 @@
 using LINGYUN.Abp.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain.Entities.Events.Distributed;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
 
 namespace PackageName.CompanyName.ProjectName;
 
 [DependsOn(
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(AbpDataProtectionModule),
     typeof(ProjectNameDomainSharedModule))]
 public class ProjectNameDomainModule : AbpModule
@@ -16,15 +16,13 @@ public class ProjectNameDomainModule : AbpModule
     private static readonly OneTimeRunner OneTimeRunner = new();
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<ProjectNameDomainModule>();
+        context.Services.AddMapperlyObjectMapper<ProjectNameDomainModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<ProjectNameDomainMapperProfile>(validate: true);
-        });
 
         Configure<AbpDistributedEntityEventOptions>(options =>
         {
+            // options.AutoEventSelectors.Add<Entity>();
+
+            // options.EtoMappings.Add<Entity, EntityEto>();
         });
     }
 

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

@@ -0,0 +1,57 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Specifications;
+
+namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
+
+public abstract class EfCoreProjectNameBasicRepository<TEntity, TKey> :
+    EfCoreRepository<IProjectNameDbContext, TEntity, TKey>,
+    IProjectNameBasicRepository<TEntity, TKey>
+    where TEntity : class, IEntity<TKey>
+{
+    protected EfCoreProjectNameBasicRepository(
+        IDbContextProvider<IProjectNameDbContext> dbContextProvider) 
+        : base(dbContextProvider)
+    {
+    }
+
+    public async virtual Task<int> GetCountAsync(
+        ISpecification<TEntity> specification,
+        CancellationToken cancellationToken = default)
+    {
+        return await (await GetQueryableAsync())
+            .Where(specification.ToExpression())
+            .CountAsync(GetCancellationToken(cancellationToken));
+    }
+
+    public async virtual Task<List<TEntity>> GetListAsync(
+        ISpecification<TEntity> specification,
+        string? sorting = nameof(IEntity<TKey>.Id),
+        int maxResultCount = 10,
+        int skipCount = 0,
+        CancellationToken cancellationToken = default)
+    {
+        return await (await GetQueryableAsync())
+              .Where(specification.ToExpression())
+              .OrderBy(GetSortingOrDefault(sorting))
+              .PageBy(skipCount, maxResultCount)
+              .ToListAsync(GetCancellationToken(cancellationToken));
+    }
+
+    protected virtual string GetSortingOrDefault(string? sorting = nameof(IEntity<TKey>.Id))
+    {
+        if (sorting.IsNullOrWhiteSpace())
+        {
+            return nameof(IEntity<TKey>.Id);
+        }
+        return sorting;
+    }
+}

aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.EntityFrameworkCore/PackageName/CompanyName/ProjectName/EntityFrameworkCore/EfCoreProjectNameRepository.cs → aspnet-core/templates/micro/content/src/PackageName.CompanyName.ProjectName.EntityFrameworkCore/PackageName/CompanyName/ProjectName/EntityFrameworkCore/EfCoreProjectNameDataProtectionRepository.cs

@@ -18,13 +18,13 @@ namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
 /// <typeparam name="TEntity">实体类型</typeparam>
 /// <typeparam name="TKey">实体主键类型</typeparam>
 /// <typeparam name="TEntityAuth">实体数据权限类型/typeparam>
-public abstract class EfCoreProjectNameRepository<TEntity, TKey, TEntityAuth> :
+public abstract class EfCoreProjectNameDataProtectionRepository<TEntity, TKey, TEntityAuth> :
     EfCoreDataProtectionRepository<IProjectNameDbContext, TEntity, TKey, TEntityAuth>,
-    IProjectNameBasicRepository<TEntity, TKey>
+    IProjectNameDataProtectionRepository<TEntity, TKey>
     where TEntity : class, IEntity<TKey>, IDataProtected 
     where TEntityAuth : DataAuthBase<TEntity, TKey>
 {
-    protected EfCoreProjectNameRepository(
+    protected EfCoreProjectNameDataProtectionRepository(
         IDbContextProvider<IProjectNameDbContext> dbContextProvider,
         IDataAuthorizationService dataAuthorizationService, 
         IEntityTypeFilterBuilder entityTypeFilterBuilder, 
@@ -44,7 +44,7 @@ public abstract class EfCoreProjectNameRepository<TEntity, TKey, TEntityAuth> :
 
     public async virtual Task<List<TEntity>> GetListAsync(
         ISpecification<TEntity> specification,
-        string sorting = nameof(IEntity<TKey>.Id), 
+        string? sorting = nameof(IEntity<TKey>.Id), 
         int maxResultCount = 10,
         int skipCount = 0, 
         CancellationToken cancellationToken = default)
@@ -56,20 +56,7 @@ public abstract class EfCoreProjectNameRepository<TEntity, TKey, TEntityAuth> :
               .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
-    public async virtual Task<List<TEntity>> GetListAsync(
+    protected virtual string GetSortingOrDefault(string? sorting = nameof(IEntity<TKey>.Id))
-        ISpecification<TEntity> specification,
-        string sorting = nameof(IEntity<TKey>.Id),
-        int maxResultCount = 10,
-        CancellationToken cancellationToken = default)
-    {
-        return await (await GetQueryableAsync())
-              .Where(specification.ToExpression())
-              .OrderBy(GetSortingOrDefault(sorting))
-              .Take(maxResultCount)
-              .ToListAsync(GetCancellationToken(cancellationToken));
-    }
-
-    protected virtual string GetSortingOrDefault(string sorting = nameof(IEntity<TKey>.Id))
     {
         if (sorting.IsNullOrWhiteSpace())
         {

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

@@ -1,5 +1,6 @@
 using LINGYUN.Abp.DataProtection.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EntityFrameworkCore.DependencyInjection;
 using Volo.Abp.Modularity;
 
 namespace PackageName.CompanyName.ProjectName.EntityFrameworkCore;
@@ -15,5 +16,14 @@ public class ProjectNameEntityFrameworkCoreModule : AbpModule
         {
             options.AddDefaultRepositories<IProjectNameDbContext>();
         });
+
+        Configure<AbpEntityOptions>(options =>
+        {
+            // Default Entity Details Func
+            //options.Entity<Entity>(e =>
+            //{
+            //    e.DefaultWithDetailsFunc = x => x;
+            //});
+        });
     }
 }

aspnet-core/templates/micro/content/tests/PackageName.CompanyName.ProjectName.Application.Tests/PackageName.CompanyName.ProjectName.Application.Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
-	  <RootNamespace />
+		<RootNamespace />
-    <IsPackable>false</IsPackable>
+		<IsPackable>false</IsPackable>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <ProjectReference Include="..\..\src\PackageName.CompanyName.ProjectName.Application\PackageName.CompanyName.ProjectName.Application.csproj" />
+		<ProjectReference Include="..\..\src\PackageName.CompanyName.ProjectName.Application\PackageName.CompanyName.ProjectName.Application.csproj" />
-    <ProjectReference Include="..\PackageName.CompanyName.ProjectName.Domain.Tests\PackageName.CompanyName.ProjectName.Domain.Tests.csproj" />
+		<ProjectReference Include="..\PackageName.CompanyName.ProjectName.Domain.Tests\PackageName.CompanyName.ProjectName.Domain.Tests.csproj" />
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>

aspnet-core/templates/micro/content/tests/PackageName.CompanyName.ProjectName.Domain.Tests/PackageName.CompanyName.ProjectName.Domain.Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
-	  <RootNamespace />
+		<RootNamespace />
-    <IsPackable>false</IsPackable>
+		<IsPackable>false</IsPackable>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <ProjectReference Include="..\..\src\PackageName.CompanyName.ProjectName.Domain\PackageName.CompanyName.ProjectName.Domain.csproj" />
+		<ProjectReference Include="..\..\src\PackageName.CompanyName.ProjectName.Domain\PackageName.CompanyName.ProjectName.Domain.csproj" />
-    <ProjectReference Include="..\PackageName.CompanyName.ProjectName.TestBase\PackageName.CompanyName.ProjectName.TestBase.csproj" />
+		<ProjectReference Include="..\PackageName.CompanyName.ProjectName.TestBase\PackageName.CompanyName.ProjectName.TestBase.csproj" />
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>

aspnet-core/templates/micro/content/tests/PackageName.CompanyName.ProjectName.TestBase/PackageName.CompanyName.ProjectName.TestBase.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
-	  <RootNamespace />
+		<RootNamespace />
-	  <IsPackable>false</IsPackable>
+		<IsPackable>false</IsPackable>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-	  <PackageReference Include="NSubstitute" />
+		<PackageReference Include="NSubstitute" />
-	  <PackageReference Include="Shouldly" />
+		<PackageReference Include="Shouldly" />
-	  <PackageReference Include="xunit" />
+		<PackageReference Include="xunit" />
-	  <PackageReference Include="xunit.extensibility.execution" />
+		<PackageReference Include="xunit.extensibility.execution" />
-	  <PackageReference Include="xunit.runner.visualstudio" />
+		<PackageReference Include="xunit.runner.visualstudio" />
-	  <PackageReference Include="Volo.Abp.Autofac" />
+		<PackageReference Include="Volo.Abp.Autofac" />
-	  <PackageReference Include="Volo.Abp.Authorization" />
+		<PackageReference Include="Volo.Abp.Authorization" />
-	  <PackageReference Include="Volo.Abp.Features" />
+		<PackageReference Include="Volo.Abp.Features" />
-	  <PackageReference Include="Volo.Abp.MemoryDb" />
+		<PackageReference Include="Volo.Abp.MemoryDb" />
-	  <PackageReference Include="Volo.Abp.TestBase" />
+		<PackageReference Include="Volo.Abp.TestBase" />
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>