diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 63c5e08c..02c00ad9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,6 +93,10 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
+        with:
+          dotnet-version: | 
+            6.0.x
+            8.0.x
 
       - name: Run restore
         run: dotnet restore
@@ -128,6 +132,10 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
+        with:
+          dotnet-version: | 
+            6.0.x
+            8.0.x
 
       - name: Run restore
         run: dotnet restore
@@ -177,6 +185,10 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
+        with:
+          dotnet-version: | 
+            6.0.x
+            8.0.x
 
       # Publish to GitHub package registry every time, whether it's a prerelease
       # version or a stable release version.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0192b169..16724840 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,10 +14,10 @@ jobs:
     vmImage: $(TargetWindowsVMImage)
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 7.0 SDK'
+    displayName: 'Use .NET 8.0 SDK'
     inputs:
       packageType: 'sdk'
-      version: '7.0.x'
+      version: '8.0.x'
       installationPath: $(Agent.ToolsDirectory)/dotnet-demo
   - task: DotNetCoreCLI@2
     displayName: 'dotnet restore'
@@ -50,10 +50,10 @@ jobs:
     vmImage: $(TargetWindowsVMImage)
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET 7.0 SDK'
+    displayName: 'Use .NET 8.0 SDK'
     inputs:
       packageType: 'sdk'
-      version: '7.0.x'
+      version: '8.0.x'
   - task: DotNetCoreCLI@2
     displayName: 'dotnet restore'
     inputs:
@@ -78,10 +78,10 @@ jobs:
       packageType: 'sdk'
       version: '6.0.x'
   - task: UseDotNet@2
-    displayName: 'Install .NET 7.0 SDK'
+    displayName: 'Install .NET 8.0 SDK'
     inputs:
       packageType: 'sdk'
-      version: '7.0.x'  
+      version: '8.0.x'  
   - task: DotNetCoreCLI@2
     displayName: 'dotnet restore'
     inputs:
@@ -136,10 +136,10 @@ jobs:
       packageType: 'sdk'
       version: '6.0.x'
   - task: UseDotNet@2
-    displayName: 'Use .NET 7.0 SDK'
+    displayName: 'Use .NET 8.0 SDK'
     inputs:
       packageType: 'sdk'
-      version: '7.0.x'
+      version: '8.0.x'
   - task: DotNetCoreCLI@2
     displayName: 'dotnet restore'
     inputs: