Merge pull request #949 from colinin/template

feat(templates): upgrade template project to 8.1.1

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

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework> <!-- 或其他适合的框架 -->
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>LINGYUN.Abp.MicroService.Templates</PackageId>
+    <Version>8.1.1</Version>
+    <Authors>colin.in@foxmail.com</Authors>
+    <Description>Abp framework micro-service template</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
+    <PackageTags>micro webapi cloud</PackageTags>
+    <PackageType>Template</PackageType>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <IsPackable>true</IsPackable>
+    <IsShipping>true</IsShipping>
+    <IsShippingPackage>true</IsShippingPackage>
+    <IncludeBuildOutput>False</IncludeBuildOutput>
+    <IncludeSource>False</IncludeSource>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="content\**" Exclude="**/bin/**;**/obj/**;**/LocalNuget/**;**/.vs/**;**/.vscode/**;">
+      <Pack>true</Pack>
+      <PackagePath>content</PackagePath>
+    </Content>
+  </ItemGroup>
+</Project>

aspnet-core/templates/content/.template.config/template.json

@@ -11,6 +11,15 @@
     "language": "C#",
     "type": "project"
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "exclude": [ "**/[Bb]in/**", "**/[Oo]bj/**", "**/[Ll]ocalNuget/**" , ".template.config/**/*", ".vs/**/*"]
+        }
+      ]
+    }
+  ],
   "sourceName": "ProjectName",
   "preferNameDirectory": true,
   "symbols": {

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

@@ -1,48 +1,13 @@
-<Project>
+<Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>8.0.3</VoloAbpPackageVersion>
-		<VoloAbpLeptonXThemePackageVersion>3.0.0</VoloAbpLeptonXThemePackageVersion>
-		<LINGYUNAbpPackageVersion>8.0.3</LINGYUNAbpPackageVersion>
-		<DaprPackageVersion>1.12.0</DaprPackageVersion>
-		<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
-		<DotNetCoreCAPPackageVersion>8.0.0</DotNetCoreCAPPackageVersion>
-		<ElsaPackageVersion>2.11.0</ElsaPackageVersion>
-		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
-		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
-		<TencentCloudSDKPackageVersion>3.0.712</TencentCloudSDKPackageVersion>
-		<AgileConfigClientPackageVersion>1.6.9</AgileConfigClientPackageVersion>
-		<HangfireMySqlStoragePackageVersion>2.0.3</HangfireMySqlStoragePackageVersion>
-		<HangfireMSSQLStoragePackageVersion>1.8.6</HangfireMSSQLStoragePackageVersion>
-		<NESTPackageVersion>7.15.1</NESTPackageVersion>
-		<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
-		<OpenTelemetryExtensionsHostingPackageVersion>1.0.0-rc8</OpenTelemetryExtensionsHostingPackageVersion>
-		<OpenTelemetryExporterZipkinPackageVersion>1.3.1</OpenTelemetryExporterZipkinPackageVersion>
-		<OpenTelemetryInstrumentationAspNetCorePackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationAspNetCorePackageVersion>
-		<OpenTelemetryInstrumentationHttpPackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationHttpPackageVersion>
-		<OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta2</OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>
-		<QuartzNETPackageVersion>3.7.0</QuartzNETPackageVersion>
-		<StackExchangeRedisPackageVersion>2.7.4</StackExchangeRedisPackageVersion>
-		<SerilogPackageVersion>3.1.1</SerilogPackageVersion>
-		<SerilogAspNetCorePackageVersion>8.0.0</SerilogAspNetCorePackageVersion>
-		<SerilogEnrichersEnvironmentPackageVersion>2.3.0</SerilogEnrichersEnvironmentPackageVersion>
-		<SerilogEnrichersAssemblyPackageVersion>2.0.0</SerilogEnrichersAssemblyPackageVersion>
-		<SerilogEnrichersProcessPackageVersion>2.0.2</SerilogEnrichersProcessPackageVersion>
-		<SerilogEnrichersThreadPackageVersion>3.1.0</SerilogEnrichersThreadPackageVersion>
-		<SerilogExtensionsLoggingPackageVersion>8.0.0</SerilogExtensionsLoggingPackageVersion>
-		<SerilogSettingsConfigurationPackageVersion>8.0.0</SerilogSettingsConfigurationPackageVersion>
-		<SerilogSinksConsolePackageVersion>5.0.0</SerilogSinksConsolePackageVersion>
-		<SerilogSinksElasticsearchPackageVersion>9.0.3</SerilogSinksElasticsearchPackageVersion>
-		<SerilogSinksFilePackageVersion>5.0.0</SerilogSinksFilePackageVersion>
-		<SixLaborsImageSharpDrawingPackageVersion>2.0.1</SixLaborsImageSharpDrawingPackageVersion>
-		<SwashbuckleAspNetCorePackageVersion>6.5.0</SwashbuckleAspNetCorePackageVersion>
-		<PollyPackageVersion>8.2.0</PollyPackageVersion>
-		<MicrosoftPackageVersion>8.0.*</MicrosoftPackageVersion>
-		<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
-		<XunitPackageVersion>2.6.1</XunitPackageVersion>
-		<XunitRunnerPackageVersion>2.5.5</XunitRunnerPackageVersion>
-		<ShouldlyPackageVersion>4.2.1</ShouldlyPackageVersion>
-		<NSubstitutePackageVersion>5.1.0</NSubstitutePackageVersion>
-		<MicrosoftNETTestSdkPackageVersion>17.8.0</MicrosoftNETTestSdkPackageVersion>
-		<CoverletCollectorPackageVersion>3.0.2</CoverletCollectorPackageVersion>
-</PropertyGroup>
-</Project>
+		<IsTestProject Condition="$(MSBuildProjectFullPath.Contains('test')) and ($(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.TestBase')))">true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Condition="'$(IsTestProject)' == 'true'" Include="coverlet.collector">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+
+</Project>