From db7ab39faa58c7374952fd5d8ff1be0a4096ce3f Mon Sep 17 00:00:00 2001
From: Brian Dukes <bdukes@engagesoftware.com>
Date: Mon, 20 Nov 2023 19:25:57 -0600
Subject: [PATCH 1/2] Use .NET 8 for build

---
 Build/Build.csproj                                            | 2 +-
 .../DotNetNuke.Tests.SourceGenerators.csproj                  | 2 +-
 azure-pipelines.yml                                           | 4 ++--
 global.json                                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Build/Build.csproj b/Build/Build.csproj
index 7d3fbc4c721..326df1ec5e3 100644
--- a/Build/Build.csproj
+++ b/Build/Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj
index 670b7b0c3f2..bc004e3ecad 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ed5e80386f0..40a217b8185 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,9 +54,9 @@ steps:
     path: $(YARN_CACHE_FOLDER)
   
 - task: UseDotNet@2
-  displayName: 'Use .NET 6.x SDK'
+  displayName: 'Use .NET 8.x SDK'
   inputs:
-    version: 6.x
+    version: 8.x
 
 - task: PowerShell@2
   displayName: 'Run DNN Update Versions'
diff --git a/global.json b/global.json
index ab11801d6e9..219be5d60f4 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.404",
+    "version": "8.0.100",
     "allowPrerelease": false,
     "rollForward": "latestMinor"
   }

From a5153b256d94c79c7eed0fb7978fdc1b82265ef3 Mon Sep 17 00:00:00 2001
From: Brian Dukes <bdukes@engagesoftware.com>
Date: Mon, 20 Nov 2023 19:26:48 -0600
Subject: [PATCH 2/2] Upgrade Cake from 3.1.0 to 4.0.0

---
 Build/Build.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/Build.csproj b/Build/Build.csproj
index 326df1ec5e3..40c6b91c322 100644
--- a/Build/Build.csproj
+++ b/Build/Build.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Cake.BuildSystems.Module" Version="5.0.0" />
     <PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
-    <PackageReference Include="Cake.Frosting" Version="3.1.0" />
+    <PackageReference Include="Cake.Frosting" Version="4.0.0" />
     <PackageReference Include="Cake.Git" Version="3.0.0" />
     <PackageReference Include="Cake.Issues" Version="3.0.0" />
     <PackageReference Include="Cake.Issues.MsBuild" Version="3.0.0" />