From 64b3fec604478697695a25b49246836b0d7f5c51 Mon Sep 17 00:00:00 2001 From: bicijinlian Date: Sat, 25 Dec 2021 14:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 26 ------- .vscode/tasks.json | 42 ----------- AppDemo/.dockerignore | 25 ------- AppDemo/AppDemo.sln | 25 ------- AppDemo/AppDemo/AppDemo.csproj | 33 --------- AppDemo/AppDemo/Dockerfile | 20 ------ AppDemo/AppDemo/Program.cs | 68 ------------------ .../AppDemo/Properties/launchSettings.json | 13 ---- AppDemo/Dockerfile | 20 ------ {Demo => Build}/Dockerfile.ARG | 0 {Demo => Build}/Dockerfile.CMD | 0 {Demo => Build}/Dockerfile.CMD2 | 0 {Demo => Build}/Dockerfile.ENV | 0 {Demo => Build}/Dockerfile.FROM | 0 {Demo => Build}/Dockerfile.RUN | 0 .../NetAppDemo/App}/App.config | 0 {Demo => Build}/NetAppDemo/App/AppDemo | Bin .../NetAppDemo/App/AppDemo.deps.json | 0 {Demo => Build}/NetAppDemo/App/AppDemo.dll | Bin .../NetAppDemo/App/AppDemo.dll.config | 0 .../NetAppDemo/App/AppDemo.runtimeconfig.json | 0 ....Extensions.Configuration.Abstractions.dll | Bin ...rosoft.Extensions.Configuration.Binder.dll | Bin ...t.Extensions.Configuration.CommandLine.dll | Bin ...ons.Configuration.EnvironmentVariables.dll | Bin ...xtensions.Configuration.FileExtensions.dll | Bin ...icrosoft.Extensions.Configuration.Json.dll | Bin .../Microsoft.Extensions.Configuration.dll | Bin ....Extensions.FileProviders.Abstractions.dll | Bin ...soft.Extensions.FileProviders.Physical.dll | Bin ...icrosoft.Extensions.FileSystemGlobbing.dll | Bin .../App/Microsoft.Extensions.Primitives.dll | Bin .../NetAppDemo/App/Newtonsoft.Json.dll | Bin ...System.Runtime.CompilerServices.Unsafe.dll | Bin .../App/System.Text.Encodings.Web.dll | Bin .../NetAppDemo/App/System.Text.Json.dll | Bin .../App}/appsettings.Development.json | 0 .../NetAppDemo/App}/appsettings.json | 0 {Demo => Build}/NetAppDemo/Dockerfile | 0 .../WebApiPublish/DockerStudyApi.deps.json | 0 .../WebApiPublish/DockerStudyApi.dll | Bin .../WebApiPublish/DockerStudyApi.exe | Bin .../DockerStudyApi.runtimeconfig.json | 0 .../WebApiPublish/DockerStudyApi.xml | 0 .../Microsoft.AspNetCore.JsonPatch.dll | Bin ...icrosoft.AspNetCore.Mvc.NewtonsoftJson.dll | Bin ....Extensions.Configuration.Abstractions.dll | Bin ...rosoft.Extensions.Configuration.Binder.dll | Bin ...sions.DependencyInjection.Abstractions.dll | Bin ...nsions.Options.ConfigurationExtensions.dll | Bin ...oft.Extensions.Options.DataAnnotations.dll | Bin .../Microsoft.Extensions.Options.dll | Bin .../Microsoft.Extensions.Primitives.dll | Bin .../WebApiPublish/Microsoft.OpenApi.dll | Bin .../WebApiPublish/Newtonsoft.Json.Bson.dll | Bin .../WebApiPublish/Newtonsoft.Json.dll | Bin .../Swashbuckle.AspNetCore.Newtonsoft.dll | Bin .../Swashbuckle.AspNetCore.Swagger.dll | Bin .../Swashbuckle.AspNetCore.SwaggerGen.dll | Bin .../Swashbuckle.AspNetCore.SwaggerUI.dll | Bin ...System.Runtime.CompilerServices.Unsafe.dll | Bin .../appsettings.Development.json | 0 .../WebApiPublish/appsettings.json | 0 {Demo => Build}/WebApiPublish/web.config | 0 {Demo => Build}/images/DockerBuild.png | Bin {Demo => Build}/images/build.png | Bin {Demo => Build}/images/build2.png | Bin .../images/构建流程示意图.drawio | 0 {Demo => Build}/project/1.txt | 0 {Demo => Build}/project/2.txt | 0 {Demo => Build}/project/3.txt | 0 {Demo => Build}/学习.md | 0 {Demo => Build}/最佳实践.md | 0 Demo/NetAppDemo/App/App.config | 3 - .../App/appsettings.Development.json | 3 - Demo/NetAppDemo/App/appsettings.json | 12 ---- .../DockerStudyApi.sln => DockerStudyApi.sln | 0 .../.config/dotnet-tools.json | 0 .../{DockerStudyApi => }/Config/TestOption.cs | 0 .../Controllers/DemoController.cs | 0 .../DockerStudyApi.csproj | 0 .../{DockerStudyApi => }/Dockerfile | 0 .../{DockerStudyApi => }/Program.cs | 0 .../Properties/launchSettings.json | 0 .../{DockerStudyApi => }/Startup.cs | 0 .../appsettings.Development.json | 0 .../{DockerStudyApi => }/appsettings.json | 0 87 files changed, 290 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json delete mode 100644 AppDemo/.dockerignore delete mode 100644 AppDemo/AppDemo.sln delete mode 100644 AppDemo/AppDemo/AppDemo.csproj delete mode 100644 AppDemo/AppDemo/Dockerfile delete mode 100644 AppDemo/AppDemo/Program.cs delete mode 100644 AppDemo/AppDemo/Properties/launchSettings.json delete mode 100644 AppDemo/Dockerfile rename {Demo => Build}/Dockerfile.ARG (100%) rename {Demo => Build}/Dockerfile.CMD (100%) rename {Demo => Build}/Dockerfile.CMD2 (100%) rename {Demo => Build}/Dockerfile.ENV (100%) rename {Demo => Build}/Dockerfile.FROM (100%) rename {Demo => Build}/Dockerfile.RUN (100%) rename {AppDemo/AppDemo => Build/NetAppDemo/App}/App.config (100%) rename {Demo => Build}/NetAppDemo/App/AppDemo (100%) rename {Demo => Build}/NetAppDemo/App/AppDemo.deps.json (100%) rename {Demo => Build}/NetAppDemo/App/AppDemo.dll (100%) rename {Demo => Build}/NetAppDemo/App/AppDemo.dll.config (100%) rename {Demo => Build}/NetAppDemo/App/AppDemo.runtimeconfig.json (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.Abstractions.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.Binder.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.CommandLine.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.EnvironmentVariables.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.FileExtensions.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.Json.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Configuration.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.FileProviders.Abstractions.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.FileProviders.Physical.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.FileSystemGlobbing.dll (100%) rename {Demo => Build}/NetAppDemo/App/Microsoft.Extensions.Primitives.dll (100%) rename {Demo => Build}/NetAppDemo/App/Newtonsoft.Json.dll (100%) rename {Demo => Build}/NetAppDemo/App/System.Runtime.CompilerServices.Unsafe.dll (100%) rename {Demo => Build}/NetAppDemo/App/System.Text.Encodings.Web.dll (100%) rename {Demo => Build}/NetAppDemo/App/System.Text.Json.dll (100%) rename {AppDemo/AppDemo => Build/NetAppDemo/App}/appsettings.Development.json (100%) rename {AppDemo/AppDemo => Build/NetAppDemo/App}/appsettings.json (100%) rename {Demo => Build}/NetAppDemo/Dockerfile (100%) rename {Demo => Build}/WebApiPublish/DockerStudyApi.deps.json (100%) rename {Demo => Build}/WebApiPublish/DockerStudyApi.dll (100%) rename {Demo => Build}/WebApiPublish/DockerStudyApi.exe (100%) rename {Demo => Build}/WebApiPublish/DockerStudyApi.runtimeconfig.json (100%) rename {Demo => Build}/WebApiPublish/DockerStudyApi.xml (100%) rename {Demo => Build}/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Options.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.Extensions.Primitives.dll (100%) rename {Demo => Build}/WebApiPublish/Microsoft.OpenApi.dll (100%) rename {Demo => Build}/WebApiPublish/Newtonsoft.Json.Bson.dll (100%) rename {Demo => Build}/WebApiPublish/Newtonsoft.Json.dll (100%) rename {Demo => Build}/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll (100%) rename {Demo => Build}/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll (100%) rename {Demo => Build}/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll (100%) rename {Demo => Build}/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll (100%) rename {Demo => Build}/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll (100%) rename {Demo => Build}/WebApiPublish/appsettings.Development.json (100%) rename {Demo => Build}/WebApiPublish/appsettings.json (100%) rename {Demo => Build}/WebApiPublish/web.config (100%) rename {Demo => Build}/images/DockerBuild.png (100%) rename {Demo => Build}/images/build.png (100%) rename {Demo => Build}/images/build2.png (100%) rename {Demo => Build}/images/构建流程示意图.drawio (100%) rename {Demo => Build}/project/1.txt (100%) rename {Demo => Build}/project/2.txt (100%) rename {Demo => Build}/project/3.txt (100%) rename {Demo => Build}/学习.md (100%) rename {Demo => Build}/最佳实践.md (100%) delete mode 100644 Demo/NetAppDemo/App/App.config delete mode 100644 Demo/NetAppDemo/App/appsettings.Development.json delete mode 100644 Demo/NetAppDemo/App/appsettings.json rename DockerStudyApi/DockerStudyApi.sln => DockerStudyApi.sln (100%) rename DockerStudyApi/{DockerStudyApi => }/.config/dotnet-tools.json (100%) rename DockerStudyApi/{DockerStudyApi => }/Config/TestOption.cs (100%) rename DockerStudyApi/{DockerStudyApi => }/Controllers/DemoController.cs (100%) rename DockerStudyApi/{DockerStudyApi => }/DockerStudyApi.csproj (100%) rename DockerStudyApi/{DockerStudyApi => }/Dockerfile (100%) rename DockerStudyApi/{DockerStudyApi => }/Program.cs (100%) rename DockerStudyApi/{DockerStudyApi => }/Properties/launchSettings.json (100%) rename DockerStudyApi/{DockerStudyApi => }/Startup.cs (100%) rename DockerStudyApi/{DockerStudyApi => }/appsettings.Development.json (100%) rename DockerStudyApi/{DockerStudyApi => }/appsettings.json (100%) diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 291653d..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "name": ".NET Core Launch (console)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/AppDemo/AppDemo/bin/Debug/net5.0/AppDemo.dll", - "args": [], - "cwd": "${workspaceFolder}/AppDemo/AppDemo", - // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console - "console": "internalConsole", - "stopAtEntry": false - }, - { - "name": ".NET Core Attach", - "type": "coreclr", - "request": "attach" - } - ] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index b427a61..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/AppDemo/AppDemo/AppDemo.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "publish", - "command": "dotnet", - "type": "process", - "args": [ - "publish", - "${workspaceFolder}/AppDemo/AppDemo/AppDemo.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "watch", - "command": "dotnet", - "type": "process", - "args": [ - "watch", - "run", - "${workspaceFolder}/AppDemo/AppDemo/AppDemo.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file diff --git a/AppDemo/.dockerignore b/AppDemo/.dockerignore deleted file mode 100644 index 3729ff0..0000000 --- a/AppDemo/.dockerignore +++ /dev/null @@ -1,25 +0,0 @@ -**/.classpath -**/.dockerignore -**/.env -**/.git -**/.gitignore -**/.project -**/.settings -**/.toolstarget -**/.vs -**/.vscode -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml -**/bin -**/charts -**/docker-compose* -**/Dockerfile* -**/node_modules -**/npm-debug.log -**/obj -**/secrets.dev.yaml -**/values.dev.yaml -LICENSE -README.md \ No newline at end of file diff --git a/AppDemo/AppDemo.sln b/AppDemo/AppDemo.sln deleted file mode 100644 index 9ba88ce..0000000 --- a/AppDemo/AppDemo.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31911.196 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppDemo", "AppDemo\AppDemo.csproj", "{91A256A6-962E-4D61-887C-2E7BAD206002}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {91A256A6-962E-4D61-887C-2E7BAD206002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91A256A6-962E-4D61-887C-2E7BAD206002}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91A256A6-962E-4D61-887C-2E7BAD206002}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91A256A6-962E-4D61-887C-2E7BAD206002}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {92E0A98C-A330-485F-B3CA-F3DEC02824B2} - EndGlobalSection -EndGlobal diff --git a/AppDemo/AppDemo/AppDemo.csproj b/AppDemo/AppDemo/AppDemo.csproj deleted file mode 100644 index f3d2391..0000000 --- a/AppDemo/AppDemo/AppDemo.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - Exe - net5.0 - Linux - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/AppDemo/AppDemo/Dockerfile b/AppDemo/AppDemo/Dockerfile deleted file mode 100644 index 46376c7..0000000 --- a/AppDemo/AppDemo/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/runtime:5.0 AS base -WORKDIR /app - -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build -WORKDIR /src -COPY ["AppDemo/AppDemo.csproj", "AppDemo/"] -RUN dotnet restore "AppDemo/AppDemo.csproj" -COPY . . -WORKDIR "/src/AppDemo" -RUN dotnet build "AppDemo.csproj" -c Release -o /app/buildQ-- - -FROM build AS publish -RUN dotnet publish "AppDemo.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "AppDemo.dll"] \ No newline at end of file diff --git a/AppDemo/AppDemo/Program.cs b/AppDemo/AppDemo/Program.cs deleted file mode 100644 index 95866cc..0000000 --- a/AppDemo/AppDemo/Program.cs +++ /dev/null @@ -1,68 +0,0 @@ -using Microsoft.Extensions.Configuration; - -using System; -using System.Diagnostics; -using System.Threading; - -namespace AppDemo -{ - class Program - { - static void Main(string[] args) - { - var netcoreEnvironmentName = "DOTNET_ENVIRONMENT"; - var environmentValue = Environment.GetEnvironmentVariable(netcoreEnvironmentName); - - - var builder = new ConfigurationBuilder() - .SetBasePath(AppDomain.CurrentDomain.BaseDirectory) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{environmentValue}.json", optional: true, reloadOnChange: true) - .AddEnvironmentVariables() - .AddCommandLine(args); - - var configurationRoot = builder.Build(); - - var jsonSerializerSettings = new Newtonsoft.Json.JsonSerializerSettings() - { - Formatting = Newtonsoft.Json.Formatting.Indented, - }; - - while (true) - { - Console.WriteLine("当前运行环境"); - Console.WriteLine($"运行模式：{(Debugger.IsAttached ? "调试模式" : "发布模式")}"); - Console.WriteLine($"args参数：{string.Join(",", args ?? new string[0])}"); - - var environmetValue = configurationRoot.GetValue(netcoreEnvironmentName); - Console.WriteLine($"配置项中，{netcoreEnvironmentName}={environmetValue}"); - - if (args != null) - { - foreach (var arg in args) - { - Console.WriteLine($"args传参数：{arg}"); - if (!string.IsNullOrWhiteSpace(arg)) - { - var argList = arg.Split('='); - if (argList.Length == 2) - { - Console.WriteLine($"配置管理中，{argList[0]}的值为:{configurationRoot.GetValue(argList[0])}"); - } - } - } - } - - Console.WriteLine("---------------------------------------------------------------------"); - Console.WriteLine(); - - //var configText = Newtonsoft.Json.JsonConvert.SerializeObject(configurationRoot.GetChildren(),jsonSerializerSettings); - //Console.WriteLine("当前配置："); - //Console.WriteLine(configText); - //Console.WriteLine("---------------------------------------------------------------------"); - //Console.WriteLine(); - Thread.Sleep(5000); - } - } - } -} diff --git a/AppDemo/AppDemo/Properties/launchSettings.json b/AppDemo/AppDemo/Properties/launchSettings.json deleted file mode 100644 index b4c1f6d..0000000 --- a/AppDemo/AppDemo/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "AppDemo": { - "commandName": "Project", - "environmentVariables": { - "DOTNET_ENVIRONMENT": "Development" - } - }, - "Docker": { - "commandName": "Docker" - } - } -} \ No newline at end of file diff --git a/AppDemo/Dockerfile b/AppDemo/Dockerfile deleted file mode 100644 index 8ad2984..0000000 --- a/AppDemo/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/runtime:5.0 AS base -WORKDIR /app - -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build -WORKDIR /src -COPY ["AppDemo/AppDemo.csproj", "AppDemo/"] -RUN dotnet restore "AppDemo/AppDemo.csproj" -COPY . . -WORKDIR "/src/AppDemo" -RUN dotnet build "AppDemo.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "AppDemo.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "AppDemo.dll"] \ No newline at end of file diff --git a/Demo/Dockerfile.ARG b/Build/Dockerfile.ARG similarity index 100% rename from Demo/Dockerfile.ARG rename to Build/Dockerfile.ARG diff --git a/Demo/Dockerfile.CMD b/Build/Dockerfile.CMD similarity index 100% rename from Demo/Dockerfile.CMD rename to Build/Dockerfile.CMD diff --git a/Demo/Dockerfile.CMD2 b/Build/Dockerfile.CMD2 similarity index 100% rename from Demo/Dockerfile.CMD2 rename to Build/Dockerfile.CMD2 diff --git a/Demo/Dockerfile.ENV b/Build/Dockerfile.ENV similarity index 100% rename from Demo/Dockerfile.ENV rename to Build/Dockerfile.ENV diff --git a/Demo/Dockerfile.FROM b/Build/Dockerfile.FROM similarity index 100% rename from Demo/Dockerfile.FROM rename to Build/Dockerfile.FROM diff --git a/Demo/Dockerfile.RUN b/Build/Dockerfile.RUN similarity index 100% rename from Demo/Dockerfile.RUN rename to Build/Dockerfile.RUN diff --git a/AppDemo/AppDemo/App.config b/Build/NetAppDemo/App/App.config similarity index 100% rename from AppDemo/AppDemo/App.config rename to Build/NetAppDemo/App/App.config diff --git a/Demo/NetAppDemo/App/AppDemo b/Build/NetAppDemo/App/AppDemo similarity index 100% rename from Demo/NetAppDemo/App/AppDemo rename to Build/NetAppDemo/App/AppDemo diff --git a/Demo/NetAppDemo/App/AppDemo.deps.json b/Build/NetAppDemo/App/AppDemo.deps.json similarity index 100% rename from Demo/NetAppDemo/App/AppDemo.deps.json rename to Build/NetAppDemo/App/AppDemo.deps.json diff --git a/Demo/NetAppDemo/App/AppDemo.dll b/Build/NetAppDemo/App/AppDemo.dll similarity index 100% rename from Demo/NetAppDemo/App/AppDemo.dll rename to Build/NetAppDemo/App/AppDemo.dll diff --git a/Demo/NetAppDemo/App/AppDemo.dll.config b/Build/NetAppDemo/App/AppDemo.dll.config similarity index 100% rename from Demo/NetAppDemo/App/AppDemo.dll.config rename to Build/NetAppDemo/App/AppDemo.dll.config diff --git a/Demo/NetAppDemo/App/AppDemo.runtimeconfig.json b/Build/NetAppDemo/App/AppDemo.runtimeconfig.json similarity index 100% rename from Demo/NetAppDemo/App/AppDemo.runtimeconfig.json rename to Build/NetAppDemo/App/AppDemo.runtimeconfig.json diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Abstractions.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Abstractions.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Abstractions.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Abstractions.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Binder.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Binder.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Binder.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Binder.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.CommandLine.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.CommandLine.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.CommandLine.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.CommandLine.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.EnvironmentVariables.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.EnvironmentVariables.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.EnvironmentVariables.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.EnvironmentVariables.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.FileExtensions.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.FileExtensions.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.FileExtensions.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.FileExtensions.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Json.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Json.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.Json.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.Json.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Configuration.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Configuration.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Configuration.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.FileProviders.Abstractions.dll b/Build/NetAppDemo/App/Microsoft.Extensions.FileProviders.Abstractions.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.FileProviders.Abstractions.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.FileProviders.Abstractions.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.FileProviders.Physical.dll b/Build/NetAppDemo/App/Microsoft.Extensions.FileProviders.Physical.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.FileProviders.Physical.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.FileProviders.Physical.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.FileSystemGlobbing.dll b/Build/NetAppDemo/App/Microsoft.Extensions.FileSystemGlobbing.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.FileSystemGlobbing.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.FileSystemGlobbing.dll diff --git a/Demo/NetAppDemo/App/Microsoft.Extensions.Primitives.dll b/Build/NetAppDemo/App/Microsoft.Extensions.Primitives.dll similarity index 100% rename from Demo/NetAppDemo/App/Microsoft.Extensions.Primitives.dll rename to Build/NetAppDemo/App/Microsoft.Extensions.Primitives.dll diff --git a/Demo/NetAppDemo/App/Newtonsoft.Json.dll b/Build/NetAppDemo/App/Newtonsoft.Json.dll similarity index 100% rename from Demo/NetAppDemo/App/Newtonsoft.Json.dll rename to Build/NetAppDemo/App/Newtonsoft.Json.dll diff --git a/Demo/NetAppDemo/App/System.Runtime.CompilerServices.Unsafe.dll b/Build/NetAppDemo/App/System.Runtime.CompilerServices.Unsafe.dll similarity index 100% rename from Demo/NetAppDemo/App/System.Runtime.CompilerServices.Unsafe.dll rename to Build/NetAppDemo/App/System.Runtime.CompilerServices.Unsafe.dll diff --git a/Demo/NetAppDemo/App/System.Text.Encodings.Web.dll b/Build/NetAppDemo/App/System.Text.Encodings.Web.dll similarity index 100% rename from Demo/NetAppDemo/App/System.Text.Encodings.Web.dll rename to Build/NetAppDemo/App/System.Text.Encodings.Web.dll diff --git a/Demo/NetAppDemo/App/System.Text.Json.dll b/Build/NetAppDemo/App/System.Text.Json.dll similarity index 100% rename from Demo/NetAppDemo/App/System.Text.Json.dll rename to Build/NetAppDemo/App/System.Text.Json.dll diff --git a/AppDemo/AppDemo/appsettings.Development.json b/Build/NetAppDemo/App/appsettings.Development.json similarity index 100% rename from AppDemo/AppDemo/appsettings.Development.json rename to Build/NetAppDemo/App/appsettings.Development.json diff --git a/AppDemo/AppDemo/appsettings.json b/Build/NetAppDemo/App/appsettings.json similarity index 100% rename from AppDemo/AppDemo/appsettings.json rename to Build/NetAppDemo/App/appsettings.json diff --git a/Demo/NetAppDemo/Dockerfile b/Build/NetAppDemo/Dockerfile similarity index 100% rename from Demo/NetAppDemo/Dockerfile rename to Build/NetAppDemo/Dockerfile diff --git a/Demo/WebApiPublish/DockerStudyApi.deps.json b/Build/WebApiPublish/DockerStudyApi.deps.json similarity index 100% rename from Demo/WebApiPublish/DockerStudyApi.deps.json rename to Build/WebApiPublish/DockerStudyApi.deps.json diff --git a/Demo/WebApiPublish/DockerStudyApi.dll b/Build/WebApiPublish/DockerStudyApi.dll similarity index 100% rename from Demo/WebApiPublish/DockerStudyApi.dll rename to Build/WebApiPublish/DockerStudyApi.dll diff --git a/Demo/WebApiPublish/DockerStudyApi.exe b/Build/WebApiPublish/DockerStudyApi.exe similarity index 100% rename from Demo/WebApiPublish/DockerStudyApi.exe rename to Build/WebApiPublish/DockerStudyApi.exe diff --git a/Demo/WebApiPublish/DockerStudyApi.runtimeconfig.json b/Build/WebApiPublish/DockerStudyApi.runtimeconfig.json similarity index 100% rename from Demo/WebApiPublish/DockerStudyApi.runtimeconfig.json rename to Build/WebApiPublish/DockerStudyApi.runtimeconfig.json diff --git a/Demo/WebApiPublish/DockerStudyApi.xml b/Build/WebApiPublish/DockerStudyApi.xml similarity index 100% rename from Demo/WebApiPublish/DockerStudyApi.xml rename to Build/WebApiPublish/DockerStudyApi.xml diff --git a/Demo/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll b/Build/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll rename to Build/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll diff --git a/Demo/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll b/Build/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll rename to Build/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll b/Build/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll rename to Build/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll b/Build/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll rename to Build/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/Build/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll rename to Build/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll b/Build/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll rename to Build/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll b/Build/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll rename to Build/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Options.dll b/Build/WebApiPublish/Microsoft.Extensions.Options.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Options.dll rename to Build/WebApiPublish/Microsoft.Extensions.Options.dll diff --git a/Demo/WebApiPublish/Microsoft.Extensions.Primitives.dll b/Build/WebApiPublish/Microsoft.Extensions.Primitives.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.Extensions.Primitives.dll rename to Build/WebApiPublish/Microsoft.Extensions.Primitives.dll diff --git a/Demo/WebApiPublish/Microsoft.OpenApi.dll b/Build/WebApiPublish/Microsoft.OpenApi.dll similarity index 100% rename from Demo/WebApiPublish/Microsoft.OpenApi.dll rename to Build/WebApiPublish/Microsoft.OpenApi.dll diff --git a/Demo/WebApiPublish/Newtonsoft.Json.Bson.dll b/Build/WebApiPublish/Newtonsoft.Json.Bson.dll similarity index 100% rename from Demo/WebApiPublish/Newtonsoft.Json.Bson.dll rename to Build/WebApiPublish/Newtonsoft.Json.Bson.dll diff --git a/Demo/WebApiPublish/Newtonsoft.Json.dll b/Build/WebApiPublish/Newtonsoft.Json.dll similarity index 100% rename from Demo/WebApiPublish/Newtonsoft.Json.dll rename to Build/WebApiPublish/Newtonsoft.Json.dll diff --git a/Demo/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll b/Build/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll similarity index 100% rename from Demo/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll rename to Build/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll diff --git a/Demo/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll b/Build/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll similarity index 100% rename from Demo/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll rename to Build/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll diff --git a/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll b/Build/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll similarity index 100% rename from Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll rename to Build/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll diff --git a/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll b/Build/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll similarity index 100% rename from Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll rename to Build/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll diff --git a/Demo/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll b/Build/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll similarity index 100% rename from Demo/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll rename to Build/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll diff --git a/Demo/WebApiPublish/appsettings.Development.json b/Build/WebApiPublish/appsettings.Development.json similarity index 100% rename from Demo/WebApiPublish/appsettings.Development.json rename to Build/WebApiPublish/appsettings.Development.json diff --git a/Demo/WebApiPublish/appsettings.json b/Build/WebApiPublish/appsettings.json similarity index 100% rename from Demo/WebApiPublish/appsettings.json rename to Build/WebApiPublish/appsettings.json diff --git a/Demo/WebApiPublish/web.config b/Build/WebApiPublish/web.config similarity index 100% rename from Demo/WebApiPublish/web.config rename to Build/WebApiPublish/web.config diff --git a/Demo/images/DockerBuild.png b/Build/images/DockerBuild.png similarity index 100% rename from Demo/images/DockerBuild.png rename to Build/images/DockerBuild.png diff --git a/Demo/images/build.png b/Build/images/build.png similarity index 100% rename from Demo/images/build.png rename to Build/images/build.png diff --git a/Demo/images/build2.png b/Build/images/build2.png similarity index 100% rename from Demo/images/build2.png rename to Build/images/build2.png diff --git a/Demo/images/构建流程示意图.drawio b/Build/images/构建流程示意图.drawio similarity index 100% rename from Demo/images/构建流程示意图.drawio rename to Build/images/构建流程示意图.drawio diff --git a/Demo/project/1.txt b/Build/project/1.txt similarity index 100% rename from Demo/project/1.txt rename to Build/project/1.txt diff --git a/Demo/project/2.txt b/Build/project/2.txt similarity index 100% rename from Demo/project/2.txt rename to Build/project/2.txt diff --git a/Demo/project/3.txt b/Build/project/3.txt similarity index 100% rename from Demo/project/3.txt rename to Build/project/3.txt diff --git a/Demo/学习.md b/Build/学习.md similarity index 100% rename from Demo/学习.md rename to Build/学习.md diff --git a/Demo/最佳实践.md b/Build/最佳实践.md similarity index 100% rename from Demo/最佳实践.md rename to Build/最佳实践.md diff --git a/Demo/NetAppDemo/App/App.config b/Demo/NetAppDemo/App/App.config deleted file mode 100644 index 49cc43e..0000000 --- a/Demo/NetAppDemo/App/App.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Demo/NetAppDemo/App/appsettings.Development.json b/Demo/NetAppDemo/App/appsettings.Development.json deleted file mode 100644 index 7bd8da1..0000000 --- a/Demo/NetAppDemo/App/appsettings.Development.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "urls": ["https://www.baidu.com","cn.bing.com"] -} \ No newline at end of file diff --git a/Demo/NetAppDemo/App/appsettings.json b/Demo/NetAppDemo/App/appsettings.json deleted file mode 100644 index deb7bd6..0000000 --- a/Demo/NetAppDemo/App/appsettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "NETCORE": "Development", - "urls": [ "https://www.baidu.com", "cn.bing.com" ], - "exclude": [ - "**/bin", - "**/bower_components", - "**/jspm_packages", - "**/node_modules", - "**/obj", - "**/platforms" - ] -} \ No newline at end of file diff --git a/DockerStudyApi/DockerStudyApi.sln b/DockerStudyApi.sln similarity index 100% rename from DockerStudyApi/DockerStudyApi.sln rename to DockerStudyApi.sln diff --git a/DockerStudyApi/DockerStudyApi/.config/dotnet-tools.json b/DockerStudyApi/.config/dotnet-tools.json similarity index 100% rename from DockerStudyApi/DockerStudyApi/.config/dotnet-tools.json rename to DockerStudyApi/.config/dotnet-tools.json diff --git a/DockerStudyApi/DockerStudyApi/Config/TestOption.cs b/DockerStudyApi/Config/TestOption.cs similarity index 100% rename from DockerStudyApi/DockerStudyApi/Config/TestOption.cs rename to DockerStudyApi/Config/TestOption.cs diff --git a/DockerStudyApi/DockerStudyApi/Controllers/DemoController.cs b/DockerStudyApi/Controllers/DemoController.cs similarity index 100% rename from DockerStudyApi/DockerStudyApi/Controllers/DemoController.cs rename to DockerStudyApi/Controllers/DemoController.cs diff --git a/DockerStudyApi/DockerStudyApi/DockerStudyApi.csproj b/DockerStudyApi/DockerStudyApi.csproj similarity index 100% rename from DockerStudyApi/DockerStudyApi/DockerStudyApi.csproj rename to DockerStudyApi/DockerStudyApi.csproj diff --git a/DockerStudyApi/DockerStudyApi/Dockerfile b/DockerStudyApi/Dockerfile similarity index 100% rename from DockerStudyApi/DockerStudyApi/Dockerfile rename to DockerStudyApi/Dockerfile diff --git a/DockerStudyApi/DockerStudyApi/Program.cs b/DockerStudyApi/Program.cs similarity index 100% rename from DockerStudyApi/DockerStudyApi/Program.cs rename to DockerStudyApi/Program.cs diff --git a/DockerStudyApi/DockerStudyApi/Properties/launchSettings.json b/DockerStudyApi/Properties/launchSettings.json similarity index 100% rename from DockerStudyApi/DockerStudyApi/Properties/launchSettings.json rename to DockerStudyApi/Properties/launchSettings.json diff --git a/DockerStudyApi/DockerStudyApi/Startup.cs b/DockerStudyApi/Startup.cs similarity index 100% rename from DockerStudyApi/DockerStudyApi/Startup.cs rename to DockerStudyApi/Startup.cs diff --git a/DockerStudyApi/DockerStudyApi/appsettings.Development.json b/DockerStudyApi/appsettings.Development.json similarity index 100% rename from DockerStudyApi/DockerStudyApi/appsettings.Development.json rename to DockerStudyApi/appsettings.Development.json diff --git a/DockerStudyApi/DockerStudyApi/appsettings.json b/DockerStudyApi/appsettings.json similarity index 100% rename from DockerStudyApi/DockerStudyApi/appsettings.json rename to DockerStudyApi/appsettings.json