From d4778aba927abfa18546124a2a8158fcd623497b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:31:55 +0000
Subject: [PATCH] Update dotnet monorepo
---
.../Dfe.PrepareConversions.Data.csproj | 2 +-
.../Dfe.PrepareConversions.Redirector/Dockerfile | 6 +++---
.../Dfe.PrepareConversions/Dfe.PrepareConversions.csproj | 2 +-
Dockerfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Dfe.PrepareConversions.Data.csproj b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Dfe.PrepareConversions.Data.csproj
index 8fbe47f74..05cfc32ee 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Dfe.PrepareConversions.Data.csproj
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Dfe.PrepareConversions.Data.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Redirector/Dockerfile b/Dfe.PrepareConversions/Dfe.PrepareConversions.Redirector/Dockerfile
index ebf91d5a9..198942452 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Redirector/Dockerfile
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Redirector/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src
COPY ["Dfe.PrepareConversions.Redirector/Dfe.PrepareConversions.Redirector.csproj", "Dfe.PrepareConversions.Redirector/"]
RUN dotnet restore "Dfe.PrepareConversions.Redirector/Dfe.PrepareConversions.Redirector.csproj"
@@ -13,13 +13,13 @@ RUN npm run build
RUN mkdir -p /src/Dfe.PrepareConversions.Redirector/wwwroot/css/
RUN mv dist/site.css /src/Dfe.PrepareConversions.Redirector/wwwroot/css/site.css
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS sdk
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS sdk
COPY --from=frontend /src /src
WORKDIR /src/Dfe.PrepareConversions.Redirector
RUN dotnet build "Dfe.PrepareConversions.Redirector.csproj" -c Release
RUN dotnet publish "Dfe.PrepareConversions.Redirector.csproj" -c Release -o /app /p:UseAppHost=false
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS final
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final
COPY --from=sdk /app /app
WORKDIR /app
ENTRYPOINT ["dotnet", "Dfe.PrepareConversions.Redirector.dll"]
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj b/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj
index f032e2e06..1d43dfa6b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj
@@ -54,7 +54,7 @@
-
+
diff --git a/Dockerfile b/Dockerfile
index 17ce2868f..d02de5496 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
# Stage 1 - Restore and publish .NET layers
ARG ASPNET_IMAGE_TAG=8.0-bookworm-slim
ARG NODEJS_IMAGE_TAG=18.20-bullseye
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS publish
WORKDIR /build
COPY ./Dfe.PrepareConversions/ ./Dfe.PrepareConversions/