From 50e24f54a373fb12ebc57a64f71a7862997b0982 Mon Sep 17 00:00:00 2001 From: qinyouzeng Date: Wed, 12 Feb 2025 16:46:40 +0800 Subject: [PATCH] feat: upgrade dotnet 8.0 --- Directory.Build.props | 6 ++-- ...sa.Dcc.Infrastructure.Domain.Shared.csproj | 5 ++-- .../Masa.Dcc.Infrastructure.Domain.csproj | 3 +- ...cc.Infrastructure.EFCore.PostgreSql.csproj | 7 ++--- ...Dcc.Infrastructure.EFCore.SqlServer.csproj | 7 ++--- .../Masa.Dcc.Infrastructure.EFCore.csproj | 3 +- .../Masa.Dcc.Infrastructure.Repository.csproj | 3 +- .../Masa.Dcc.ApiGateways.Caller.csproj | 3 +- .../Masa.Dcc.Contracts.Admin.csproj | 3 +- src/Services/Masa.Dcc.Service/Dockerfile | 4 +-- .../Masa.Dcc.Service.Admin.csproj | 29 ++++++++----------- .../Masa.Dcc.Web.Admin.Rcl.csproj | 7 ++--- .../Pages/Config.razor.cs | 2 +- .../Masa.Dcc.Web.Admin.Rcl/_Imports.razor | 2 +- .../Masa.Dcc.Web.Admin.Server/Dockerfile | 4 +-- .../Masa.Dcc.Web.Admin.Server.csproj | 3 +- .../Masa.Dcc.Web.Admin.WebAssembly.csproj | 7 ++--- 17 files changed, 42 insertions(+), 56 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8a65bc83..a25cae63 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,8 @@ - 1.2.0-preview.4 - 1.2.1-preview.8 + 1.2.0-preview.5 + 1.2.1-preview.17 + net8.0 + 8.0 \ No newline at end of file diff --git a/Masa.Dcc.Infrastructure.Domain.Shared/Masa.Dcc.Infrastructure.Domain.Shared.csproj b/Masa.Dcc.Infrastructure.Domain.Shared/Masa.Dcc.Infrastructure.Domain.Shared.csproj index 567a5685..ea6d3c9f 100644 --- a/Masa.Dcc.Infrastructure.Domain.Shared/Masa.Dcc.Infrastructure.Domain.Shared.csproj +++ b/Masa.Dcc.Infrastructure.Domain.Shared/Masa.Dcc.Infrastructure.Domain.Shared.csproj @@ -1,7 +1,6 @@ - - net6.0 + enable enable @@ -10,7 +9,7 @@ - + diff --git a/Masa.Dcc.Infrastructure.Domain/Masa.Dcc.Infrastructure.Domain.csproj b/Masa.Dcc.Infrastructure.Domain/Masa.Dcc.Infrastructure.Domain.csproj index b6fb78da..9537f165 100644 --- a/Masa.Dcc.Infrastructure.Domain/Masa.Dcc.Infrastructure.Domain.csproj +++ b/Masa.Dcc.Infrastructure.Domain/Masa.Dcc.Infrastructure.Domain.csproj @@ -1,7 +1,6 @@  - - net6.0 + enable enable diff --git a/Masa.Dcc.Infrastructure.EFCore.PostgreSql/Masa.Dcc.Infrastructure.EFCore.PostgreSql.csproj b/Masa.Dcc.Infrastructure.EFCore.PostgreSql/Masa.Dcc.Infrastructure.EFCore.PostgreSql.csproj index 6e04f7f0..ce9f4113 100644 --- a/Masa.Dcc.Infrastructure.EFCore.PostgreSql/Masa.Dcc.Infrastructure.EFCore.PostgreSql.csproj +++ b/Masa.Dcc.Infrastructure.EFCore.PostgreSql/Masa.Dcc.Infrastructure.EFCore.PostgreSql.csproj @@ -1,14 +1,13 @@  - - net6.0 + enable enable - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Masa.Dcc.Infrastructure.EFCore.SqlServer/Masa.Dcc.Infrastructure.EFCore.SqlServer.csproj b/Masa.Dcc.Infrastructure.EFCore.SqlServer/Masa.Dcc.Infrastructure.EFCore.SqlServer.csproj index 774bec9b..5270a30a 100644 --- a/Masa.Dcc.Infrastructure.EFCore.SqlServer/Masa.Dcc.Infrastructure.EFCore.SqlServer.csproj +++ b/Masa.Dcc.Infrastructure.EFCore.SqlServer/Masa.Dcc.Infrastructure.EFCore.SqlServer.csproj @@ -1,15 +1,14 @@  - - net6.0 + enable enable - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Masa.Dcc.Infrastructure.EFCore/Masa.Dcc.Infrastructure.EFCore.csproj b/Masa.Dcc.Infrastructure.EFCore/Masa.Dcc.Infrastructure.EFCore.csproj index 91af62b5..e36abe64 100644 --- a/Masa.Dcc.Infrastructure.EFCore/Masa.Dcc.Infrastructure.EFCore.csproj +++ b/Masa.Dcc.Infrastructure.EFCore/Masa.Dcc.Infrastructure.EFCore.csproj @@ -1,7 +1,6 @@ - - net6.0 + enable enable diff --git a/Masa.Dcc.Infrastructure.Repository/Masa.Dcc.Infrastructure.Repository.csproj b/Masa.Dcc.Infrastructure.Repository/Masa.Dcc.Infrastructure.Repository.csproj index 65665631..e7bdb03f 100644 --- a/Masa.Dcc.Infrastructure.Repository/Masa.Dcc.Infrastructure.Repository.csproj +++ b/Masa.Dcc.Infrastructure.Repository/Masa.Dcc.Infrastructure.Repository.csproj @@ -1,7 +1,6 @@  - - net6.0 + enable enable diff --git a/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj b/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj index fd957ed6..5bbd5d4d 100644 --- a/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj +++ b/src/ApiGateways/Masa.Dcc.ApiGateways.Caller/Masa.Dcc.ApiGateways.Caller.csproj @@ -1,7 +1,6 @@  - - net6.0 + enable enable diff --git a/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj b/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj index 69be4265..ce9bc229 100644 --- a/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj +++ b/src/Contracts/Masa.Dcc.Contracts.Admin/Masa.Dcc.Contracts.Admin.csproj @@ -1,7 +1,6 @@ - - net6.0 + enable enable diff --git a/src/Services/Masa.Dcc.Service/Dockerfile b/src/Services/Masa.Dcc.Service/Dockerfile index 93248c0f..e24eddda 100644 --- a/src/Services/Masa.Dcc.Service/Dockerfile +++ b/src/Services/Masa.Dcc.Service/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:6.0.403 AS publish +FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:8.0 AS publish WORKDIR /src COPY . . ENV CSPROJ="src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj" RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:6.0.4 +FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:8.0 WORKDIR /app COPY --from=publish /app/publish . ENV ASPNETCORE_URLS=http://0.0.0.0:80 diff --git a/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj b/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj index 5860a4bf..576968fa 100644 --- a/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj +++ b/src/Services/Masa.Dcc.Service/Masa.Dcc.Service.Admin.csproj @@ -1,43 +1,38 @@  - - net6.0 + enable - enable - a8be382e-6dcb-4a0a-82ca-83e1685b9c73 - Linux - ..\..\.. + enable - - + - - + + - - - - + - - + - + + + + + diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj index 7f8cb9c8..a2b14d69 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Masa.Dcc.Web.Admin.Rcl.csproj @@ -1,7 +1,6 @@  - - net6.0 + enable enable @@ -11,8 +10,8 @@ - - + + diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs index 97f0aa08..0400a14e 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/Pages/Config.razor.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the Apache License. See LICENSE.txt in the project root for license information. -using Force.DeepCloner; +using DeepCloner.Core; namespace Masa.Dcc.Web.Admin.Rcl.Pages { diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor index 6d15f0a7..b6a3da55 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Rcl/_Imports.razor @@ -13,6 +13,6 @@ @using System.Reflection; @using Masa.BuildingBlocks.StackSdks.Config; @using Masa.Contrib.StackSdks.Config; -@using Force.DeepCloner; +@using DeepCloner.Core;; @using Masa.Contrib.StackSdks.Caller; @using Masa.Dcc.Contracts.Admin; \ No newline at end of file diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Dockerfile b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Dockerfile index 8d497d5a..07f241c2 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Dockerfile +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:6.0.403 AS publish +FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:8.0 AS publish WORKDIR /src COPY . . ENV CSPROJ="src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Masa.Dcc.Web.Admin.Server.csproj" RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:6.0.4 +FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:8.0 WORKDIR /app COPY --from=publish /app/publish . ENV ASPNETCORE_URLS=https://0.0.0.0:443 diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Masa.Dcc.Web.Admin.Server.csproj b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Masa.Dcc.Web.Admin.Server.csproj index 21efb2fb..765d82f4 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Masa.Dcc.Web.Admin.Server.csproj +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.Server/Masa.Dcc.Web.Admin.Server.csproj @@ -1,7 +1,6 @@ - - net6.0 + enable enable false diff --git a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.WebAssembly/Masa.Dcc.Web.Admin.WebAssembly.csproj b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.WebAssembly/Masa.Dcc.Web.Admin.WebAssembly.csproj index 544ab567..5a832b0d 100644 --- a/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.WebAssembly/Masa.Dcc.Web.Admin.WebAssembly.csproj +++ b/src/Web/Masa.Dcc.Web.Admin/Masa.Dcc.Web.Admin.WebAssembly/Masa.Dcc.Web.Admin.WebAssembly.csproj @@ -1,14 +1,13 @@  - - net6.0 + enable enable - - + +