From 647353a6abaa02af47bd7de54a7df4658b6ccac3 Mon Sep 17 00:00:00 2001 From: Andy Pack Date: Thu, 16 Nov 2023 17:49:24 +0000 Subject: [PATCH] migrating to .net 8 --- .github/workflows/ci.yml | 6 ++--- Dockerfile.CLI | 8 +++---- Dockerfile.Web | 8 +++---- Selector.CLI/Selector.CLI.csproj | 22 +++++++++---------- Selector.Cache/Selector.Cache.csproj | 8 +++---- Selector.Data/Selector.Data.csproj | 4 ++-- Selector.Event/Selector.Event.csproj | 2 +- Selector.MAUI/Selector.MAUI.csproj | 28 ++++++++++++------------ Selector.Model/Selector.Model.csproj | 18 +++++++-------- Selector.SignalR/Selector.SignalR.csproj | 6 ++--- Selector.Tests/Selector.Tests.csproj | 10 ++++----- Selector.Web/Selector.Web.csproj | 24 ++++++++++---------- Selector/Selector.csproj | 8 +++---- 13 files changed, 74 insertions(+), 78 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8599fb9..4664850 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - dotnet-version: [ '7.0.x' ] + dotnet-version: [ '8.0.x' ] steps: - uses: actions/checkout@v2 @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - dotnet-version: [ '7.0.x' ] + dotnet-version: [ '8.0.x' ] steps: - uses: actions/checkout@v2 @@ -84,7 +84,7 @@ jobs: strategy: fail-fast: false matrix: - node: [16] + node: [21] steps: - uses: actions/checkout@v2 diff --git a/Dockerfile.CLI b/Dockerfile.CLI index e262ba2..d17e564 100644 --- a/Dockerfile.CLI +++ b/Dockerfile.CLI @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base COPY *.sln . COPY Selector/*.csproj ./Selector/ @@ -15,14 +15,12 @@ COPY . ./ FROM base as publish RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release -o /app -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 WORKDIR /app COPY --from=publish /app ./ ENV DOTNET_EnableDiagnostics=0 -ARG DOCKER_USER=selector -RUN useradd -r $DOCKER_USER -USER $DOCKER_USER +USER app ENTRYPOINT ["dotnet", "Selector.CLI.dll"] diff --git a/Dockerfile.Web b/Dockerfile.Web index 260de8c..daebcaf 100644 --- a/Dockerfile.Web +++ b/Dockerfile.Web @@ -6,7 +6,7 @@ RUN npm ci COPY ./Selector.Web ./ RUN npm run build -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base COPY *.sln . COPY Selector/*.csproj ./Selector/ @@ -25,14 +25,12 @@ FROM base as publish COPY --from=frontend /Selector.Web/wwwroot Selector.Web/wwwroot/ RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 EXPOSE 80 WORKDIR /app COPY --from=publish /app ./ ENV DOTNET_EnableDiagnostics=0 -ARG DOCKER_USER=selector -RUN useradd -r $DOCKER_USER -USER $DOCKER_USER +USER app ENTRYPOINT ["dotnet", "Selector.Web.dll"] diff --git a/Selector.CLI/Selector.CLI.csproj b/Selector.CLI/Selector.CLI.csproj index 5ad3e58..521b531 100644 --- a/Selector.CLI/Selector.CLI.csproj +++ b/Selector.CLI/Selector.CLI.csproj @@ -2,29 +2,29 @@ Exe - net7.0 + net8.0 Selector.CLI.Program latest - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + - + - + diff --git a/Selector.Cache/Selector.Cache.csproj b/Selector.Cache/Selector.Cache.csproj index 6bbc151..261a64f 100644 --- a/Selector.Cache/Selector.Cache.csproj +++ b/Selector.Cache/Selector.Cache.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 true latest - - - + + + diff --git a/Selector.Data/Selector.Data.csproj b/Selector.Data/Selector.Data.csproj index b9a9e6c..1d6078a 100644 --- a/Selector.Data/Selector.Data.csproj +++ b/Selector.Data/Selector.Data.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable @@ -11,7 +11,7 @@ - + diff --git a/Selector.Event/Selector.Event.csproj b/Selector.Event/Selector.Event.csproj index d122e68..18728aa 100644 --- a/Selector.Event/Selector.Event.csproj +++ b/Selector.Event/Selector.Event.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable diff --git a/Selector.MAUI/Selector.MAUI.csproj b/Selector.MAUI/Selector.MAUI.csproj index bba3700..3ea3b48 100644 --- a/Selector.MAUI/Selector.MAUI.csproj +++ b/Selector.MAUI/Selector.MAUI.csproj @@ -1,10 +1,10 @@  - $(TargetFrameworks);net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 - + Exe Selector.MAUI true @@ -31,31 +31,31 @@ 6.5 - + maccatalyst-arm64 - + false Automatic iPhone Developer - + false None - + false Mac Developer 3rd Party Mac Developer Installer True Platforms/MacCatalyst/Entitlements.Debug.plist - + false Mac Developer 3rd Party Mac Developer Installer @@ -77,13 +77,13 @@ - - - - + + + + - - + + diff --git a/Selector.Model/Selector.Model.csproj b/Selector.Model/Selector.Model.csproj index 17fc171..3c6e21a 100644 --- a/Selector.Model/Selector.Model.csproj +++ b/Selector.Model/Selector.Model.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 true latest @@ -12,20 +12,20 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/Selector.SignalR/Selector.SignalR.csproj b/Selector.SignalR/Selector.SignalR.csproj index 9cdad7e..23cf53c 100644 --- a/Selector.SignalR/Selector.SignalR.csproj +++ b/Selector.SignalR/Selector.SignalR.csproj @@ -1,8 +1,8 @@ - net7.0 - $(TargetFrameworks);net7.0-ios;net7.0-maccatalyst + net8.0 + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst enable enable @@ -15,7 +15,7 @@ --> - + diff --git a/Selector.Tests/Selector.Tests.csproj b/Selector.Tests/Selector.Tests.csproj index 96728ee..3b4afeb 100644 --- a/Selector.Tests/Selector.Tests.csproj +++ b/Selector.Tests/Selector.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false latest @@ -9,14 +9,14 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Selector.Web/Selector.Web.csproj b/Selector.Web/Selector.Web.csproj index a13338e..7a614dd 100644 --- a/Selector.Web/Selector.Web.csproj +++ b/Selector.Web/Selector.Web.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 latest true @@ -17,24 +17,24 @@ - - + + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - - - - - - + + + + + + diff --git a/Selector/Selector.csproj b/Selector/Selector.csproj index 402f4f4..7dc5df0 100644 --- a/Selector/Selector.csproj +++ b/Selector/Selector.csproj @@ -1,15 +1,15 @@  - net7.0 - $(TargetFrameworks);net7.0-ios;net7.0-maccatalyst + net8.0 + $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst true latest - - + +