feat(docker): upgrade dotnet images

aspnet-core/.gitignore

@@ -2,7 +2,7 @@
 LocalNuget
 *.DotSettings.user
 **/*.csproj.user
-templates
 nupkg
 consoles
+templates
 *.configs.cache

aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/TaskManagementDbMigratorHostedService.cs

@@ -1,4 +1,4 @@
-using LY.MicroService.TaskManagement.DbMigrator.EntityFrameworkCore;
+using LY.MicroService.TaskManagement.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

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

@@ -13,12 +13,15 @@
 		<PackageOutputPath>./nupkg</PackageOutputPath>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
+		<PackReadmeFile>README.md</PackReadmeFile>
 		<RootNamespace />
 	</PropertyGroup>
 
 	<ItemGroup>
+		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Remove="LINGYUN\Abp\Cli\UI\Vben\Templates\*.tpl" />
 		<EmbeddedResource Include="LINGYUN\Abp\Cli\UI\Vben\Templates\*.tpl" />
+		<EmbeddedResource Include="README.md" />
 	</ItemGroup>
 
 	<ItemGroup>

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs

@@ -229,6 +229,7 @@ public class AxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransientDe
 
             apiScriptBuilder.AppendLine("  });");
             apiScriptBuilder.AppendLine("};");
+            apiScriptBuilder.AppendLine();
         }
 
         return apiScriptBuilder.ToString();

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs

@@ -218,6 +218,7 @@ public class UniAppAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans
 
             apiScriptBuilder.AppendLine("  })");
             apiScriptBuilder.AppendLine("}");
+            apiScriptBuilder.AppendLine();
         }
 
         return apiScriptBuilder.ToString();

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs

@@ -231,6 +231,7 @@ public class VbenAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransie
 
             apiScriptBuilder.AppendLine("  });");
             apiScriptBuilder.AppendLine("};");
+            apiScriptBuilder.AppendLine();
         }
 
         return apiScriptBuilder.ToString();

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs

@@ -188,6 +188,7 @@ public class VbenDynamicHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans
 
             apiScriptBuilder.AppendLine(");");
             apiScriptBuilder.AppendLine("};");
+            apiScriptBuilder.AppendLine();
         }
 
         return apiScriptBuilder.ToString();

aspnet-core/modules/cli/LINGYUN.Abp.Cli/README.md

@@ -0,0 +1,34 @@
+# Extension tool set based on abp cli
+
+Provides quick creation of template projects, JavaScript library commands and more.
+
+## Getting started
+
+```shell
+dotnet tool install --global LINGYUN.Abp.Cli
+```
+
+## Usage
+
+```shell
+Usage:
+
+    labp <command> <target> [options]
+
+Command List:
+
+    > help: Show command line help. Write ` labp help <command> `
+    > create: Generate a new solution based on the customed ABP startup templates.
+    > generate-proxy: Generates client service proxies and DTOs to consume HTTP APIs.
+    > generate-view: Generate the view code from the http api proxy.
+
+To get a detailed help for a command:
+
+    labp help <command>
+```
+
+## Feedback
+
+Have a question and need feedback?
+
+- [Github issuses](https://github.com/colinin/abp-next-admin/issuses)

aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.AuthServer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app
 

aspnet-core/services/LY.MicroService.identityServer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 LABEL maintainer="colin.in@foxmail.com"
 WORKDIR /app