From 1f5534e690376c5102c0942299b1974e61fb38e4 Mon Sep 17 00:00:00 2001
From: "agile.zhou" <kklldog@live.cn>
Date: Fri, 24 Nov 2023 11:51:51 +0800
Subject: [PATCH] Upgrade to .NET8

---
 Dockerfile                                    |  4 +-
 .../Agile.Config.Protocol.csproj              |  2 +-
 ...AgileConfig - Backup.Server.Apisite.csproj | 65 +++++++++++++++++++
 .../AgileConfig.Server.Apisite.csproj         | 28 ++++----
 src/AgileConfig.Server.Apisite/Program.cs     |  4 --
 .../AgileConfig.Server.Common.csproj          | 12 ++--
 .../AgileConfig.Server.Data.Entity.csproj     |  3 +-
 .../AgileConfig.Server.Data.Freesql.csproj    |  2 +-
 .../AgileConfig.Server.IService.csproj        | 21 +++---
 .../AgileConfig.Server.OIDC.csproj            |  4 +-
 .../AgileConfig.Server.Service.csproj         |  2 +-
 .../RemoteServerNodeProxy.cs                  |  1 -
 .../ServerNodeService.cs                      |  1 -
 .../src/layouts/compos/LayoutFooter.tsx       |  2 +-
 .../AgileConfig.Server.CommonTests.csproj     |  2 +-
 .../AgileConfig.Server.ServiceTests.csproj    |  2 +-
 test/ApiSiteTests/ApiSiteTests.csproj         |  2 +-
 17 files changed, 105 insertions(+), 52 deletions(-)
 create mode 100644 src/AgileConfig.Server.Apisite/AgileConfig - Backup.Server.Apisite.csproj

diff --git a/Dockerfile b/Dockerfile
index 7c716358..db13e02d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 RUN sed -i 's/DEFAULT@SECLEVEL=2/DEFAULT@SECLEVEL=1/g' /etc/ssl/openssl.cnf
 RUN sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf
 RUN sed -i 's/DEFAULT@SECLEVEL=2/DEFAULT@SECLEVEL=1/g' /usr/lib/ssl/openssl.cnf
@@ -6,7 +6,7 @@ RUN sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /usr/lib/ssl/openssl.
 WORKDIR /app
 EXPOSE 5000
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj", "AgileConfig.Server.Apisite/"]
 COPY ["src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj", "AgileConfig.Server.Data.Entity/"]
diff --git a/src/Agile.Config.Protocol/Agile.Config.Protocol.csproj b/src/Agile.Config.Protocol/Agile.Config.Protocol.csproj
index dbc15171..58990cd5 100644
--- a/src/Agile.Config.Protocol/Agile.Config.Protocol.csproj
+++ b/src/Agile.Config.Protocol/Agile.Config.Protocol.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig - Backup.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig - Backup.Server.Apisite.csproj
new file mode 100644
index 00000000..8c424cc6
--- /dev/null
+++ b/src/AgileConfig.Server.Apisite/AgileConfig - Backup.Server.Apisite.csproj	
@@ -0,0 +1,65 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <AssemblyVersion>1.8</AssemblyVersion>
+    <Version>1.8</Version>
+    <PackageVersion>1.6.20</PackageVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <FileVersion>1.7.3</FileVersion>
+    <Authors>kklldog</Authors>
+    <Company>kklldog</Company>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\AgileConfig.Server.Apisite.xml</DocumentationFile>
+    <NoWarn>1701;1702;1591;1573</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DocumentationFile>bin\Release\AgileConfig.Server.Apisite.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="agile_config.db" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
+    <PackageReference Include="NLog" Version="5.2.6" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Agile.Config.Protocol\Agile.Config.Protocol.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Data.Freesql\AgileConfig.Server.Data.Freesql.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Service\AgileConfig.Server.Service.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.Development.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="logs\" />
+    <Folder Include="Views\Shared" />
+    <Folder Include="wwwroot\ui\" />
+  </ItemGroup>
+
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
+</Project>
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
index 62742144..7a25e770 100644
--- a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
+++ b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>1.7.3</AssemblyVersion>
-    <Version>1.7.3</Version>
-    <PackageVersion>1.6.20</PackageVersion>
+    <AssemblyVersion>1.8</AssemblyVersion>
+    <Version>1.8</Version>
+    <PackageVersion>1.8</PackageVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <FileVersion>1.7.3</FileVersion>
+    <FileVersion>1.8</FileVersion>
     <Authors>kklldog</Authors>
     <Company>kklldog</Company>
   </PropertyGroup>
@@ -26,15 +26,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="NLog" Version="4.7.12" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
+    <PackageReference Include="NLog" Version="5.2.6" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AgileConfig.Server.Apisite/Program.cs b/src/AgileConfig.Server.Apisite/Program.cs
index 475a4b93..d8da189f 100644
--- a/src/AgileConfig.Server.Apisite/Program.cs
+++ b/src/AgileConfig.Server.Apisite/Program.cs
@@ -1,12 +1,8 @@
 using System;
-using System.IO;
 using AgileConfig.Server.Common;
-using AgileConfig.Server.IService;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using NLog.Web;
 
 namespace AgileConfig.Server.Apisite
diff --git a/src/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj b/src/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj
index fac82794..0ed6ad66 100644
--- a/src/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj
+++ b/src/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="MySql.Data" Version="8.0.19" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
+	<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj b/src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj
index 114a83d7..2f74890f 100644
--- a/src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj
+++ b/src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FreeSql" Version="2.5.200" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj b/src/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj
index 29091334..4fb5adc6 100644
--- a/src/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj
+++ b/src/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj b/src/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj
index 6485ad29..0f5bb84b 100644
--- a/src/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj
+++ b/src/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Agile.Config.Protocol\Agile.Config.Protocol.csproj" />
-    <ProjectReference Include="..\AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<ProjectReference Include="..\Agile.Config.Protocol\Agile.Config.Protocol.csproj" />
+		<ProjectReference Include="..\AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/AgileConfig.Server.OIDC/AgileConfig.Server.OIDC.csproj b/src/AgileConfig.Server.OIDC/AgileConfig.Server.OIDC.csproj
index 50f69027..ff97aaf8 100644
--- a/src/AgileConfig.Server.OIDC/AgileConfig.Server.OIDC.csproj
+++ b/src/AgileConfig.Server.OIDC/AgileConfig.Server.OIDC.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AgileHttp" Version="0.0.6" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.31.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj b/src/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj
index cd7d6a1c..363061e7 100644
--- a/src/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj
+++ b/src/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AgileConfig.Server.Service/RemoteServerNodeProxy.cs b/src/AgileConfig.Server.Service/RemoteServerNodeProxy.cs
index c7e97bdd..ec2130ea 100644
--- a/src/AgileConfig.Server.Service/RemoteServerNodeProxy.cs
+++ b/src/AgileConfig.Server.Service/RemoteServerNodeProxy.cs
@@ -12,7 +12,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
 
 namespace AgileConfig.Server.Service
 {
diff --git a/src/AgileConfig.Server.Service/ServerNodeService.cs b/src/AgileConfig.Server.Service/ServerNodeService.cs
index 6d434d97..2a87fd85 100644
--- a/src/AgileConfig.Server.Service/ServerNodeService.cs
+++ b/src/AgileConfig.Server.Service/ServerNodeService.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AgileConfig.Server.Common;
-using Microsoft.EntityFrameworkCore;
 using System;
 using AgileConfig.Server.Data.Freesql;
 
diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx
index 2a86a6b5..225af795 100644
--- a/src/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx
+++ b/src/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx
@@ -14,7 +14,7 @@ const LayoutFooter : React.FC =()=>{
           { getAppVer()}
           &nbsp;&nbsp;  
           <a title={'agileconfig ' + getAppVer()} href="https://github.com/kklldog/AgileConfig" style={{color:'#bfbfbf'}}><GithubOutlined/> </a>
-          &nbsp; Powered by .NET6.0 ant-design-pro4
+          &nbsp; Powered by .NET8 ant-design-pro4
         </div>
       )
 }
diff --git a/test/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj b/test/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj
index 412f6a16..343ed964 100644
--- a/test/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj
+++ b/test/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj b/test/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj
index c19aa5e3..581ad7c0 100644
--- a/test/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj
+++ b/test/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/ApiSiteTests/ApiSiteTests.csproj b/test/ApiSiteTests/ApiSiteTests.csproj
index fbc4b726..94188534 100644
--- a/test/ApiSiteTests/ApiSiteTests.csproj
+++ b/test/ApiSiteTests/ApiSiteTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>