From 1eb2291ef579da32938a9a6720b318a4c2cc8e14 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Mon, 1 Jul 2024 14:47:45 +0100 Subject: [PATCH 1/4] Upgrade to dotnet8 --- .github/workflows/continuous-integration-dotnet.yml | 2 +- .../Dfe.Academies.Infrastructure.csproj | 2 +- .../Dfe.Academies.Application.Tests.csproj | 2 +- Dfe.Academies.Application/Dfe.Academies.Application.csproj | 2 +- Dfe.Academies.Domain/Dfe.Academies.Domain.csproj | 2 +- Dfe.Academies.Utils/Dfe.Academies.Utils.csproj | 2 +- TramsDataApi/TramsDataApi.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration-dotnet.yml b/.github/workflows/continuous-integration-dotnet.yml index 64651ed3b..628e78000 100644 --- a/.github/workflows/continuous-integration-dotnet.yml +++ b/.github/workflows/continuous-integration-dotnet.yml @@ -17,7 +17,7 @@ on: - '!Dfe.Academies.Performance/**' env: - DOTNET_VERSION: '6.0.403' + DOTNET_VERSION: '8.20.x' EF_VERSION: '6.0.5' JAVA_VERSION: '17' CONNECTION_STRING: 'Server=localhost,1433;Database=sip;TrustServerCertificate=True;User Id=sa;Password=StrongPassword905' diff --git a/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj b/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj index 0e961091f..2c2e68f4e 100644 --- a/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj +++ b/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/Dfe.Academies.Application.Tests/Dfe.Academies.Application.Tests.csproj b/Dfe.Academies.Application.Tests/Dfe.Academies.Application.Tests.csproj index ff0abe736..4f81c9a29 100644 --- a/Dfe.Academies.Application.Tests/Dfe.Academies.Application.Tests.csproj +++ b/Dfe.Academies.Application.Tests/Dfe.Academies.Application.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/Dfe.Academies.Application/Dfe.Academies.Application.csproj b/Dfe.Academies.Application/Dfe.Academies.Application.csproj index 69d808bf9..61b6930a0 100644 --- a/Dfe.Academies.Application/Dfe.Academies.Application.csproj +++ b/Dfe.Academies.Application/Dfe.Academies.Application.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj b/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj index 58e82744b..5eb411b04 100644 --- a/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj +++ b/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/Dfe.Academies.Utils/Dfe.Academies.Utils.csproj b/Dfe.Academies.Utils/Dfe.Academies.Utils.csproj index 27ac3865b..fa71b7ae6 100644 --- a/Dfe.Academies.Utils/Dfe.Academies.Utils.csproj +++ b/Dfe.Academies.Utils/Dfe.Academies.Utils.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/TramsDataApi/TramsDataApi.csproj b/TramsDataApi/TramsDataApi.csproj index 07e600b3c..0cbf9a30d 100644 --- a/TramsDataApi/TramsDataApi.csproj +++ b/TramsDataApi/TramsDataApi.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 1ce62ee2-ff0b-4f40-9066-cfbdae2e889f true From c50dcf6e1eceaaec46ad7a6b18a5daa90b5ef65f Mon Sep 17 00:00:00 2001 From: Chris Sherlock <99017916+cshnimble@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:54:38 +0100 Subject: [PATCH 2/4] Update continuous-integration-dotnet.yml --- .github/workflows/continuous-integration-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-dotnet.yml b/.github/workflows/continuous-integration-dotnet.yml index 628e78000..4429809bc 100644 --- a/.github/workflows/continuous-integration-dotnet.yml +++ b/.github/workflows/continuous-integration-dotnet.yml @@ -17,7 +17,7 @@ on: - '!Dfe.Academies.Performance/**' env: - DOTNET_VERSION: '8.20.x' + DOTNET_VERSION: '8.0.x' EF_VERSION: '6.0.5' JAVA_VERSION: '17' CONNECTION_STRING: 'Server=localhost,1433;Database=sip;TrustServerCertificate=True;User Id=sa;Password=StrongPassword905' From ebc1ab41f21755c701c24b7e7f53235b0871e1f8 Mon Sep 17 00:00:00 2001 From: Chris Sherlock <99017916+cshnimble@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:03:04 +0100 Subject: [PATCH 3/4] Update Dockerfile to dotnet sdk8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d02218532..d4b68f535 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build WORKDIR /build ENV DEBIAN_FRONTEND=noninteractive From 6adf740b28d936dd007492eda8b73787566af1ef Mon Sep 17 00:00:00 2001 From: Chris Sherlock <99017916+cshnimble@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:07:38 +0100 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4b68f535..ff76e284e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build WORKDIR /build ENV DEBIAN_FRONTEND=noninteractive