diff --git a/build/pipelines/templates/build-console-public.yaml b/build/pipelines/templates/build-console-public.yaml
index f9570a14..8292f89d 100644
--- a/build/pipelines/templates/build-console-public.yaml
+++ b/build/pipelines/templates/build-console-public.yaml
@@ -19,7 +19,12 @@ jobs:
     inputs:
       packageType: sdk
       version: 6.0.x
-      installationPath: $(Agent.ToolsDirectory)/dotnet
+      
+  - task: UseDotNet@2
+    displayName: 'Use .NET 8 SDK'
+    inputs:
+      packageType: sdk
+      version: 8.0.x
 
   # The first task is the dotnet command build, pointing to our csproj file
   - task: DotNetCoreCLI@2
diff --git a/build/pipelines/templates/build-extension-public.yaml b/build/pipelines/templates/build-extension-public.yaml
index 18d0147c..3b24a458 100644
--- a/build/pipelines/templates/build-extension-public.yaml
+++ b/build/pipelines/templates/build-extension-public.yaml
@@ -19,7 +19,19 @@ jobs:
       filePath: 'build\update-version.ps1'
       arguments: $(major).$(Get-Date -Format "yyMM").$(patch)
       pwsh: true
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 6 SDK'
+    inputs:
+      packageType: sdk
+      version: 6.0.x
       
+  - task: UseDotNet@2
+    displayName: 'Use .NET 8 SDK'
+    inputs:
+      packageType: sdk
+      version: 8.0.x
+
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet Tools'
 
diff --git a/src/XamlStyler.Console/XamlStyler.Console.csproj b/src/XamlStyler.Console/XamlStyler.Console.csproj
index 463c7056..270234e1 100644
--- a/src/XamlStyler.Console/XamlStyler.Console.csproj
+++ b/src/XamlStyler.Console/XamlStyler.Console.csproj
@@ -13,7 +13,7 @@
     <RepositoryUrl>https://github.com/Xavalon/XamlStyler</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <RootNamespace>Xavalon.XamlStyler.Console</RootNamespace>
     <AssemblyName>xstyler</AssemblyName>
     <PackAsTool>true</PackAsTool>
@@ -21,6 +21,7 @@
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin\Debug\Console\</OutputPath>
diff --git a/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj b/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
index 62c9a9b2..aea0e9c7 100644
--- a/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
+++ b/src/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <RootNamespace>Xavalon.XamlStyler.UnitTests</RootNamespace>
     <Copyright>Copyright © Xavalon 2024</Copyright>
     <Company>Xavalon</Company>