Feature/upgrade dotnet10 (#148)

* Upgraded to dotnet10

Author: FrostyApeOne

.github/workflows/docker.yml

@@ -36,7 +36,7 @@ jobs:
         run: docker save -o ${{ steps.build.outputs.imageid }}.tar ${{ steps.build.outputs.imageid }}
 
       - name: Scan Docker image for CVEs
-        uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # 0.30.0
+        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
         with:
           input: ${{ steps.build.outputs.imageid }}.tar
           format: 'sarif'
@@ -48,6 +48,6 @@ jobs:
 
       - name: Upload scan results to GitHub Security
         uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3
-        if: always()
+        if: always() && hashFiles('trivy-results.sarif') != ''
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/dotnet-ci.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   JAVA_VERSION: '21'
-  DOTNET_VERSION: '8.0.x'
+  DOTNET_VERSION: '10.0.x'
 
 jobs:
   build:

CHANGELOG.md

@@ -64,6 +64,10 @@ All notable changes to this service will be documented in this file.
 ### Notes
 - Added root level template property "hideFieldLabelWhenOnlyOneField" to toggle labels hiding for single field pages.
 
-- ## [1.2.13]
+## [1.2.13]
 ### Notes
-- Replaced hardcoded values with Layout:ServiceName
+- Replaced hardcoded values with Layout:ServiceName
+
+## [1.3.0]
+### Notes
+- Upgraded to .NET10

Dockerfile

@@ -1,5 +1,5 @@
 # Set the major version of dotnet
-ARG DOTNET_VERSION=8.0
+ARG DOTNET_VERSION=10.0
 # Application to build (Transfers, Lsrp, etc.) - determines which configuration folder to use
 ARG APPLICATION=Transfers
 

src/DfE.ExternalApplications.Application/DfE.ExternalApplications.Application.csproj

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="GovUK.Dfe.ExternalApplications.Api.Client" Version="0.1.40" />
+	  <PackageReference Include="GovUK.Dfe.ExternalApplications.Api.Client" Version="0.1.42-prerelease-7" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.0" />
   </ItemGroup>

src/DfE.ExternalApplications.Domain/DfE.ExternalApplications.Domain.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/DfE.ExternalApplications.Infrastructure/Consumers/ScanResultConsumer.cs

@@ -613,7 +613,7 @@ private async Task CleanupCollectionFlowSessionsAsync(Guid applicationId, Guid f
                     try
                     {
                         // Parse the flow progress data
-                        var flowData = JsonSerializer.Deserialize<Dictionary<string, object>>(sessionData!);
+                        var flowData = JsonSerializer.Deserialize<Dictionary<string, object>>((string)sessionData!);
                         if (flowData == null)
                             continue;
 

src/DfE.ExternalApplications.Infrastructure/DfE.ExternalApplications.Infrastructure.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GovUK.Dfe.CoreLibs.Caching" Version="1.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
     <PackageReference Include="GovUK.Dfe.CoreLibs.Messaging.Contracts" Version="0.1.5" />
     <PackageReference Include="GovUK.Dfe.CoreLibs.Messaging.MassTransit" Version="0.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.3.0" />

src/DfE.ExternalApplications.Web/DfE.ExternalApplications.Web.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UserSecretsId>8051c984-585b-4a5e-b6d7-833e5dd4afe7</UserSecretsId>
-		<Version>1.2.13</Version>
-		<InformationalVersion>1.2.13</InformationalVersion>
+		<Version>1.3.0</Version>
+		<InformationalVersion>1.3.0</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	</PropertyGroup>
 

src/DfE.ExternalApplications.Web/configurations/Lsrp/appsettings.Development.json

@@ -1,10 +1,10 @@
 {
   "ApplicationInsights": {
     "ConnectionString": "",
-    "CookieDomain": "s184d01-rsd-frontdoor-extapp-lsrp-gqfzg3agadhmg4aj.a03.azurefd.net"
+    "CookieDomain": "dev.submit-send-reform-plans.education.gov.uk"
   },
   "DfESignIn": {
-    "RedirectUri": "https://s184d01-rsd-frontdoor-extapp-lsrp-gqfzg3agadhmg4aj.a03.azurefd.net/signin-oidc",
+    "RedirectUri": "https://dev.submit-send-reform-plans.education.gov.uk/signin-oidc",
     "Authority": "https://test-oidc.signin.education.gov.uk"
   },
   "ExternalApplicationsApiClient": {