From 025fed6dae3af22cabf56d6b0ea8ccf9746c119a Mon Sep 17 00:00:00 2001
From: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
Date: Fri, 1 Nov 2024 09:28:32 +0000
Subject: [PATCH 1/2] TD-4771 Upgrading framework

---
 .../DigitalLearningSolutions.Data.Migrations.csproj             | 2 +-
 .../DigitalLearningSolutions.Data.csproj                        | 2 +-
 .../DigitalLearningSolutions.Web.AutomatedUiTests.csproj        | 2 +-
 .../DigitalLearningSolutions.Web.IntegrationTests.csproj        | 2 +-
 .../DigitalLearningSolutions.Web.Tests.csproj                   | 2 +-
 .../DigitalLearningSolutions.Web.csproj                         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj b/DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj
index d692456b9f..08c13f7e23 100644
--- a/DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj
+++ b/DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj
index 104ed2df0e..05556966ee 100644
--- a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj
+++ b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj b/DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj
index 1806d4d9a0..24fa297560 100644
--- a/DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj
+++ b/DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <UserSecretsId>7298e35a-fc38-4595-80ec-abb0846cd5b8</UserSecretsId>
   </PropertyGroup>
diff --git a/DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj b/DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj
index b0d70d46ca..143736b1c4 100644
--- a/DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj
+++ b/DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj b/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj
index f43657d338..3d9fc081ad 100644
--- a/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj
+++ b/DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
index 5bc762436e..6447fc9560 100644
--- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
+++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>annotations</Nullable>
     </PropertyGroup>
 

From f43f51fbc8a10233bb0484a68f5d79d6662156a9 Mon Sep 17 00:00:00 2001
From: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
Date: Thu, 7 Nov 2024 17:40:05 +0000
Subject: [PATCH 2/2] TD-4773 GitHub Actions Target To Dot Net 8

---
 .github/workflows/build-and-deploy-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml
index cfc4aadf96..0cd9b7b31a 100644
--- a/.github/workflows/build-and-deploy-dev.yml
+++ b/.github/workflows/build-and-deploy-dev.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with: