From f3bc0b5267cf0f79ad832bdbb042431e8bd7fe04 Mon Sep 17 00:00:00 2001 From: Bram1903 <70259613+Bram1903@users.noreply.github.com> Date: Sat, 6 Jan 2024 19:58:25 +0100 Subject: [PATCH 1/4] Update copyright year in app settings The copyright year in the appsettings.json file was updated to reflect the current year 2024 instead of the previously used 2023. --- src/Server.UI/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Server.UI/appsettings.json b/src/Server.UI/appsettings.json index b77db2d3a..827b0a54d 100644 --- a/src/Server.UI/appsettings.json +++ b/src/Server.UI/appsettings.json @@ -34,7 +34,7 @@ "AppFlavor": "Blazor .NET 8.0", "AppFlavorSubscript": ".NET 8.0", "Company": "Company", - "Copyright": "@2023 Copyright" + "Copyright": "@2024 Copyright" }, "AllowedHosts": "*", "SmtpClientOptions": { From 512eeb181d2eb1a483af947e22490220961d0cd0 Mon Sep 17 00:00:00 2001 From: "hualin.zhu" Date: Sun, 21 Jan 2024 11:20:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20fixed=20run=20add-migration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Server.UI/Server.UI.csproj | 4 ++++ src/Server/Server.csproj | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj index 369a33b42..9bfe39396 100644 --- a/src/Server.UI/Server.UI.csproj +++ b/src/Server.UI/Server.UI.csproj @@ -20,6 +20,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj index 8defd6280..ea6face42 100644 --- a/src/Server/Server.csproj +++ b/src/Server/Server.csproj @@ -22,10 +22,7 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + From 2ddbf70f4e126982178bcfd4f9b91dea9737a7ba Mon Sep 17 00:00:00 2001 From: "hualin.zhu" Date: Sun, 21 Jan 2024 11:24:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=A8=20upgrade=20nuget=20packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Application/Application.csproj | 8 ++--- src/Domain/Domain.csproj | 6 ++-- src/Infrastructure/Infrastructure.csproj | 30 +++++++++---------- src/Server.UI/Server.UI.csproj | 2 +- src/Server/Server.csproj | 14 ++++----- .../Application.IntegrationTests.csproj | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj index eba437e53..19fd1ff76 100644 --- a/src/Application/Application.csproj +++ b/src/Application/Application.csproj @@ -20,11 +20,11 @@ - + - - - + + + diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj index cccaa204d..8cd426a35 100644 --- a/src/Domain/Domain.csproj +++ b/src/Domain/Domain.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index a63e11cbf..17b980c29 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -9,31 +9,31 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + - + diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj index 9bfe39396..81d23d4ec 100644 --- a/src/Server.UI/Server.UI.csproj +++ b/src/Server.UI/Server.UI.csproj @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj index ea6face42..ef96bb336 100644 --- a/src/Server/Server.csproj +++ b/src/Server/Server.csproj @@ -11,17 +11,17 @@ - - + + - - - - - + + + + + diff --git a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj index b1ea8573b..fb5510214 100644 --- a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj +++ b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj @@ -29,7 +29,7 @@ - + From 8b76acf1e591e831cba04dca4f559a94d12773cb Mon Sep 17 00:00:00 2001 From: "neo.zhu" Date: Mon, 22 Jan 2024 10:40:11 +0800 Subject: [PATCH 4/4] Update Dockerfile --- src/Server.UI/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Server.UI/Dockerfile b/src/Server.UI/Dockerfile index 3e24fcdc4..1a6886401 100644 --- a/src/Server.UI/Dockerfile +++ b/src/Server.UI/Dockerfile @@ -1,11 +1,11 @@ #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/aspnet:7.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["src/Server.UI/Server.UI.csproj", "src/Server.UI/"] COPY ["src/Server/Server.csproj", "src/Server/"]