Merge pull request #139 from LBHackney-IT/dotnet-8-update

Miles-Alford · web-flow · commit 9d3b3bfc08d2 · 2025-01-28T14:04:32.000Z
.Net 8 upgrade
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ executors:
       - image: hashicorp/terraform:latest
   docker-dotnet:
     docker:
-      - image: mcr.microsoft.com/dotnet/sdk:6.0
+      - image: mcr.microsoft.com/dotnet/sdk:8.0
 
 references:
   workspace_root: &workspace_root "~"
diff --git a/Makefile b/Makefile
@@ -1,26 +1,26 @@
 .PHONY: setup
 setup:
-	docker-compose build
+	docker compose build
 
 .PHONY: build
 build:
-	docker-compose build SingleViewApi
+	docker compose build SingleViewApi
 
 .PHONY: serve
 serve:
-	docker-compose build SingleViewApi && docker-compose up SingleViewApi
+	docker compose build SingleViewApi && docker compose up SingleViewApi
 
 .PHONY: shell
 shell:
-	docker-compose run SingleViewApi bash
+	docker compose run SingleViewApi bash
 
 .PHONY: test
 test:
-	docker-compose up test-database & docker-compose build SingleViewApi-test && docker-compose up SingleViewApi-test
+	docker compose up test-database & docker compose build SingleViewApi-test && docker compose up SingleViewApi-test
 
 .PHONY: test-db
 test-db:
-	docker-compose up test-database
+	docker compose up test-database
 
 .PHONY: lint
 lint:
@@ -33,4 +33,4 @@ restart-db:
 	docker stop $$(docker ps -q --filter ancestor=test-database -a)
 	-docker rm $$(docker ps -q --filter ancestor=test-database -a)
 	docker rmi test-database
-	docker-compose up -d test-database
+	docker compose up -d test-database
diff --git a/SingleViewApi.Tests/Dockerfile b/SingleViewApi.Tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:8.0
 
 # disable microsoft telematry
 ENV DOTNET_CLI_TELEMETRY_OPTOUT='true'
diff --git a/SingleViewApi.Tests/SingleViewApi.Tests.csproj b/SingleViewApi.Tests/SingleViewApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
@@ -19,14 +19,14 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="Bogus" Version="25.0.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/SingleViewApi.Tests/V1/Controllers/BaseControllerTests.cs b/SingleViewApi.Tests/V1/Controllers/BaseControllerTests.cs
@@ -41,7 +41,7 @@ public void GetCorrelationShouldThrowExceptionIfCorrelationHeaderUnavailable()
         public void GetCorrelationShouldReturnCorrelationIdWhenExists()
         {
             // Arrange
-            _stubHttpContext.Request.Headers.Add(HeaderConstants.CorrelationId, "123");
+            _stubHttpContext.Request.Headers.Append(HeaderConstants.CorrelationId, "123");
 
             // Act
             var result = _sut.GetCorrelationId();
diff --git a/SingleViewApi/Dockerfile b/SingleViewApi/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:8.0
 
 ARG LBHPACKAGESTOKEN
 ENV LBHPACKAGESTOKEN=$LBHPACKAGESTOKEN
diff --git a/SingleViewApi/SingleViewApi.csproj b/SingleViewApi/SingleViewApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
     <PropertyGroup>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -12,8 +12,10 @@
     </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="5.1.1" />
+    <PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="8.1.1" />
     <PackageReference Include="AngleSharp" Version="1.0.0-alpha-844" />
+      <PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
+      <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="AspectInjector" Version="2.5.0" />
     <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.0.21" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.0.1" />
@@ -30,10 +32,8 @@
     <PackageReference Include="Hackney.Shared.ContactDetail" Version="0.5.0" />
     <PackageReference Include="Hackney.Shared.Person" Version="0.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22310.1">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -42,13 +42,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
     <PackageReference Include="ServiceStack.Redis" Version="6.0.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.4.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.4.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.4.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SingleViewApi/Startup.cs b/SingleViewApi/Startup.cs
@@ -11,9 +11,8 @@
 using SingleViewApi.Versioning;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.AspNetCore.Mvc.Versioning;
+using Asp.Versioning;
+using Asp.Versioning.ApiExplorer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/SingleViewApi/V1/Controllers/AcademyController.cs b/SingleViewApi/V1/Controllers/AcademyController.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/CombinedSearchController.cs b/SingleViewApi/V1/Controllers/CombinedSearchController.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SingleViewApi.V1.Boundary.Response;
 using SingleViewApi.V1.UseCase.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/CustomerController.cs b/SingleViewApi/V1/Controllers/CustomerController.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using SingleViewApi.V1.Boundary.Request;
 using SingleViewApi.V1.Gateways.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/JigsawCasesController.cs b/SingleViewApi/V1/Controllers/JigsawCasesController.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SingleViewApi.V1.Boundary;
 using SingleViewApi.V1.UseCase.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/JigsawController.cs b/SingleViewApi/V1/Controllers/JigsawController.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Logging;
 using SingleViewApi.V1.Boundary.Response;
 using SingleViewApi.V1.UseCase.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/NotesController.cs b/SingleViewApi/V1/Controllers/NotesController.cs
@@ -6,6 +6,7 @@
 using SingleViewApi.V1.Boundary;
 using SingleViewApi.V1.Boundary.Request;
 using SingleViewApi.V1.Boundary.Response;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/PersonApiController.cs b/SingleViewApi/V1/Controllers/PersonApiController.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/PostgresController.cs b/SingleViewApi/V1/Controllers/PostgresController.cs
@@ -5,6 +5,7 @@
 using SingleViewApi.V1.Boundary.Response;
 using SingleViewApi.V1.Gateways;
 using SingleViewApi.V1.Gateways.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/SharedPlanController.cs b/SingleViewApi/V1/Controllers/SharedPlanController.cs
@@ -5,6 +5,7 @@
 using SingleViewApi.V1.Boundary.Request;
 using SingleViewApi.V1.Boundary.Response;
 using SingleViewApi.V1.UseCase.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/V1/Controllers/StoreJigsawCredentialsController.cs b/SingleViewApi/V1/Controllers/StoreJigsawCredentialsController.cs
@@ -6,6 +6,7 @@
 using SingleViewApi.V1.Boundary.Response;
 using SingleViewApi.V1.UseCase;
 using SingleViewApi.V1.UseCase.Interfaces;
+using Asp.Versioning;
 
 namespace SingleViewApi.V1.Controllers
 {
diff --git a/SingleViewApi/Versioning/ApiVersionDescriptionExtensions.cs b/SingleViewApi/Versioning/ApiVersionDescriptionExtensions.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Asp.Versioning.ApiExplorer;
 
 namespace SingleViewApi.Versioning
 {
diff --git a/SingleViewApi/Versioning/ApiVersionExtensions.cs b/SingleViewApi/Versioning/ApiVersionExtensions.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
 
 namespace SingleViewApi.Versioning
 {
diff --git a/SingleViewApi/build.cmd b/SingleViewApi/build.cmd
@@ -1,2 +1,2 @@
 dotnet restore
-dotnet lambda package --configuration release --framework net6.0 --output-package bin/release/SingleViewApi.zip
+dotnet lambda package --configuration release --framework net8.0 --output-package bin/release/SingleViewApi.zip
diff --git a/SingleViewApi/build.sh b/SingleViewApi/build.sh
@@ -18,4 +18,4 @@ then
 fi
 
 dotnet restore
-dotnet lambda package --configuration release --framework net6.0 --output-package ./bin/release/SingleViewApi.zip
+dotnet lambda package --configuration release --framework net8.0 --output-package ./bin/release/SingleViewApi.zip
diff --git a/SingleViewApi/serverless.yml b/SingleViewApi/serverless.yml
@@ -1,7 +1,7 @@
 service: SingleViewApi
 provider:
   name: aws
-  runtime: dotnet6
+  runtime: dotnet8
   memorySize: 2048
   timeout: 30
   tracing:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/sdk:6.0`
	`1`	`+FROM mcr.microsoft.com/dotnet/sdk:8.0`
`2`	`2`
`3`	`3`	`# disable microsoft telematry`
`4`	`4`	`ENV DOTNET_CLI_TELEMETRY_OPTOUT='true'`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void GetCorrelationShouldThrowExceptionIfCorrelationHeaderUnavailable()`
`41`	`41`	`public void GetCorrelationShouldReturnCorrelationIdWhenExists()`
`42`	`42`	`{`
`43`	`43`	`// Arrange`
`44`		`- _stubHttpContext.Request.Headers.Add(HeaderConstants.CorrelationId, "123");`
	`44`	`+ _stubHttpContext.Request.Headers.Append(HeaderConstants.CorrelationId, "123");`
`45`	`45`
`46`	`46`	`// Act`
`47`	`47`	`var result = _sut.GetCorrelationId();`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.AspNetCore.Http;`
`5`	`5`	`using Microsoft.AspNetCore.Mvc;`
`6`	`6`	`using Microsoft.Extensions.Logging;`
	`7`	`+using Asp.Versioning;`
`7`	`8`
`8`	`9`	`namespace SingleViewApi.V1.Controllers`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.AspNetCore.Mvc;`
`5`	`5`	`using SingleViewApi.V1.Boundary.Response;`
`6`	`6`	`using SingleViewApi.V1.UseCase.Interfaces;`
	`7`	`+using Asp.Versioning;`
`7`	`8`
`8`	`9`	`namespace SingleViewApi.V1.Controllers`
`9`	`10`	`{`