Upgrade to .NET 8

DFE-Digital · Jan 27, 2025 · fd849d9 · fd849d9
1 parent 54407bd
commit fd849d9
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.202'
+          dotnet-version: '8.0.x'
 
       - name: Restore
         run: dotnet restore
@@ -80,7 +80,7 @@ jobs:
             echo "::notice::Linting entire codebase"
           fi
 
-          dotnet tool install -g dotnet-format --version "7.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json >/dev/null
+          dotnet tool install -g dotnet-format --version "8.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json >/dev/null
           dotnet-format --no-restore --verify-no-changes $INCLUDE_ARG
         env:
           EVENT_NAME: ${{ github.event_name }}

diff --git a/dotnet-authserver/TeacherIdentity.sln b/dotnet-authserver/TeacherIdentity.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
-		global.json = global.json
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject

diff --git a/dotnet-authserver/global.json b/dotnet-authserver/global.json
diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Dockerfile b/dotnet-authserver/src/TeacherIdentity.AuthServer/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 ARG GIT_SHA
 
-COPY bin/Release/net7.0/publish/ App/
+COPY bin/Release/net8.0/publish/ App/
 
 ENV GitSha ${GIT_SHA}
 WORKDIR /App

diff --git a/...ver/src/TeacherIdentity.AuthServer/Infrastructure/Security/ApiKeyAuthenticationHandler.cs b/...ver/src/TeacherIdentity.AuthServer/Infrastructure/Security/ApiKeyAuthenticationHandler.cs
@@ -14,12 +14,10 @@ public class ApiKeyAuthenticationHandler : AuthenticationHandler<AuthenticationS
     private readonly IApiClientRepository _clientRepository;
 
     public ApiKeyAuthenticationHandler(
-        IApiClientRepository clientRepository,
         IOptionsMonitor<AuthenticationSchemeOptions> options,
         ILoggerFactory logger,
         UrlEncoder encoder,
-        ISystemClock clock)
-        : base(options, logger, encoder, clock)
+        IApiClientRepository clientRepository) : base(options, logger, encoder)
     {
         _clientRepository = clientRepository;
     }

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Program.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Program.cs
@@ -566,7 +566,7 @@ public static async Task Main(string[] args)
         {
             options.PreSerializeFilters.Add((_, request) =>
             {
-                request.HttpContext.Response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
+                request.HttpContext.Response.Headers.TryAdd("Cache-Control", "no-cache, no-store, must-revalidate");
             });
         });
 

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj b/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>TeacherIdentityServer</UserSecretsId>
   </PropertyGroup>
 

diff --git a/...rc/TeacherIdentity.ClientCredentialsSample/TeacherIdentity.ClientCredentialsSample.csproj b/...rc/TeacherIdentity.ClientCredentialsSample/TeacherIdentity.ClientCredentialsSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/dotnet-authserver/src/TeacherIdentity.DevBootstrap/TeacherIdentity.DevBootstrap.csproj b/dotnet-authserver/src/TeacherIdentity.DevBootstrap/TeacherIdentity.DevBootstrap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>TeacherIdentityServer</UserSecretsId>
   </PropertyGroup>
 

diff --git a/dotnet-authserver/src/TeacherIdentity.KeyGenerator/TeacherIdentity.KeyGenerator.csproj b/dotnet-authserver/src/TeacherIdentity.KeyGenerator/TeacherIdentity.KeyGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj b/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'ResourceServer' " />

diff --git a/dotnet-authserver/src/TeacherIdentity.TestClient/Dockerfile b/dotnet-authserver/src/TeacherIdentity.TestClient/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-  FROM mcr.microsoft.com/dotnet/aspnet:7.0
-  COPY bin/Release/net7.0/publish/ App/
+  FROM mcr.microsoft.com/dotnet/aspnet:8.0
+  COPY bin/Release/net8.0/publish/ App/
   WORKDIR /App
   ENTRYPOINT ["dotnet", "TeacherIdentity.TestClient.dll"]
   EXPOSE 80
diff --git a/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj b/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/.../TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj b/.../TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>TeacherIdentityServerEndToEndTests</UserSecretsId>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <IsPackable>false</IsPackable>

diff --git a/.../tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj b/.../tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RunSettingsFilePath>$(MSBuildProjectDirectory)\local.runsettings</RunSettingsFilePath>
   </PropertyGroup>

diff --git a/.../tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj b/.../tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 

diff --git a/.../tests/TeacherIdentity.AuthServer.Tests/Infrastructure/TestCookieAuthenticationHandler.cs b/.../tests/TeacherIdentity.AuthServer.Tests/Infrastructure/TestCookieAuthenticationHandler.cs
@@ -12,11 +12,10 @@ public class TestCookieAuthenticationHandler : CookieAuthenticationHandler
     private readonly CurrentUserIdContainer _currentUserIdContainer;
 
     public TestCookieAuthenticationHandler(
-        CurrentUserIdContainer currentUserIdContainer,
         IOptionsMonitor<CookieAuthenticationOptions> options,
         ILoggerFactory logger,
         UrlEncoder encoder,
-        ISystemClock clock) : base(options, logger, encoder, clock)
+        CurrentUserIdContainer currentUserIdContainer) : base(options, logger, encoder)
     {
         _currentUserIdContainer = currentUserIdContainer;
     }

diff --git a/...authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj b/...authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>TeacherIdentityAuthServerTests</UserSecretsId>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <IsPackable>false</IsPackable>
-Original file line number
+Diff line change
@@ Expand Up / @@ -566,7 +566,7 @@ public static async Task Main(string[] args) @@
             {
                 options.PreSerializeFilters.Add((_, request) =>
                 {
-                    request.HttpContext.Response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
+                    request.HttpContext.Response.Headers.TryAdd("Cache-Control", "no-cache, no-store, must-revalidate");
                 });
             });
@@ Expand Down @@