From 1ff94ce291a52be6087e9d83fad4ac0b0476c076 Mon Sep 17 00:00:00 2001
From: Ryan Richter <ryan@chocolatey.io>
Date: Fri, 20 Sep 2024 09:45:07 -0400
Subject: [PATCH 1/2] (#274) Update Dependencies For CCM 0.13.0 Update the .Net
 Core dependencies of CCM to target .Net core V8 packages

---
 Start-C4bCcmSetup.ps1 | 6 +++---
 files/chocolatey.json | 6 +++---
 tests/packages.ps1    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Start-C4bCcmSetup.ps1 b/Start-C4bCcmSetup.ps1
index 2492b67..70ceb3a 100644
--- a/Start-C4bCcmSetup.ps1
+++ b/Start-C4bCcmSetup.ps1
@@ -97,13 +97,13 @@ process {
     $chocoArgs = @('install', 'IIS-ApplicationInit', "--source='windowsfeatures'" ,'--no-progress', '-y')
     & choco @chocoArgs -ValidExitCodes 0, 3010
 
-    $chocoArgs = @('install', 'dotnet-aspnetcoremodule-v2', "--version='$($Packages.Where{$_.Name -eq 'dotnet-aspnetcoremodule-v2'}.Version)'", '--no-progress', '--pin', '--pin-reason="Latest version compatible with chocolatey-management-web V 0.12.0"', '-y')
+    $chocoArgs = @('install', 'dotnet-aspnetcoremodule-v2', "--version='$($Packages.Where{$_.Name -eq 'dotnet-aspnetcoremodule-v2'}.Version)'", '--no-progress', '-y')
     & choco @chocoArgs
 
-    $chocoArgs = @('install', 'dotnet-6.0-runtime', "--version=$($Packages.Where{$_.Name -eq 'dotnet-6.0-runtime'}.Version)", '--no-progress', '--pin', '--pin-reason="Latest version compatible with chocolatey-management-database V 0.12.0"', '-y')
+    $chocoArgs = @('install', 'dotnet-8.0-runtime', "--version=$($Packages.Where{$_.Name -eq 'dotnet-8.0-runtime'}.Version)", '--no-progress', '-y')
     & choco @chocoArgs
 
-    $chocoArgs = @('install', 'dotnet-6.0-aspnetruntime', "--version=$($Packages.Where{$_.Name -eq 'dotnet-6.0-aspnetruntime'}.Version)", '--no-progress', '--pin', '--pin-reason="Latest version compatible with chocolatey-management-database V 0.12.0"', '-y')
+    $chocoArgs = @('install', 'dotnet-8.0-aspnetruntime', "--version=$($Packages.Where{$_.Name -eq 'dotnet-8.0-aspnetruntime'}.Version)", '--no-progress', '-y')
     & choco @chocoArgs
 
     Write-Host "Creating Chocolatey Central Management Database"
diff --git a/files/chocolatey.json b/files/chocolatey.json
index b8f0481..3b73a5a 100644
--- a/files/chocolatey.json
+++ b/files/chocolatey.json
@@ -12,9 +12,9 @@
         { "name": "chocolatey" },
         { "name": "chocolateygui.extension" },
         { "name": "chocolateygui" },
-        { "name": "dotnet-6.0-aspnetruntime", "version": "6.0.31" },
-        { "name": "dotnet-6.0-runtime", "version": "6.0.31" },
-        { "name": "dotnet-aspnetcoremodule-v2", "version": "16.0.24141" },
+        { "name": "dotnet-8.0-aspnetruntime", "version": "8.0.8" },
+        { "name": "dotnet-8.0-runtime", "version": "8.0.8" },
+        { "name": "dotnet-aspnetcoremodule-v2", "version": "18.0.24201" },
         { "name": "dotnetfx" },
         { "name": "jenkins" },
         { "name": "KB2919355", "internalize": false },
diff --git a/tests/packages.ps1 b/tests/packages.ps1
index 16b3324..acba7d9 100644
--- a/tests/packages.ps1
+++ b/tests/packages.ps1
@@ -12,8 +12,8 @@ $JointPackages = @(
 )
 $ServerOnlyPackages = @(
     @{Name = 'chocolatey-windowsupdate.extension' }
-    @{Name = 'dotnet-6.0-aspnetruntime' }
-    @{Name = 'dotnet-6.0-runtime' }
+    @{Name = 'dotnet-8.0-aspnetruntime' }
+    @{Name = 'dotnet-8.0-runtime' }
     @{Name = 'dotnet-aspnetcoremodule-v2' }
     @{Name = 'jenkins' }
     @{Name = 'KB2999226' }

From 1fb57795589790364bd3d434268a8eb8af2c72d7 Mon Sep 17 00:00:00 2001
From: James Ruskin <james@chocolatey.io>
Date: Mon, 23 Sep 2024 14:01:04 +0100
Subject: [PATCH 2/2] (#274) Remove KB3063858 from Packages and Tests

---
 files/chocolatey.json | 1 -
 tests/packages.ps1    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/files/chocolatey.json b/files/chocolatey.json
index 3b73a5a..5a92de0 100644
--- a/files/chocolatey.json
+++ b/files/chocolatey.json
@@ -22,7 +22,6 @@
         { "name": "KB2999226", "internalize": false },
         { "name": "KB3033929", "internalize": false },
         { "name": "KB3035131", "internalize": false },
-        { "name": "KB3063858", "internalize": false },
         { "name": "microsoft-edge" },
         { "name": "nexus-repository" },
         { "name": "sql-server-express" },
diff --git a/tests/packages.ps1 b/tests/packages.ps1
index acba7d9..6ecaa87 100644
--- a/tests/packages.ps1
+++ b/tests/packages.ps1
@@ -19,7 +19,6 @@ $ServerOnlyPackages = @(
     @{Name = 'KB2999226' }
     @{Name = 'KB3033929' }
     @{Name = 'KB3035131' }
-    @{Name = 'KB3063858' }
     @{Name = 'nexus-repository' }
     @{Name = 'Pester' }
     @{Name = 'sql-server-express' }