diff --git a/Bruce/Bruce.csproj b/Bruce/Bruce.csproj
index d5888e61..90db23b5 100644
--- a/Bruce/Bruce.csproj
+++ b/Bruce/Bruce.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>Kerberos.NET.CommandLine</RootNamespace>
 
     <PackAsTool>true</PackAsTool>
@@ -41,4 +41,10 @@
     <ProjectReference Include="..\Samples\KerbDumpCore\KerbDumpCore.csproj" />
   </ItemGroup>
 
+  <Target Name="RemoveTargetPlatformIdBeforePackingTool" BeforeTargets="_PackToolValidation">
+    <PropertyGroup>
+      <TargetPlatformIdentifier />
+    </PropertyGroup>
+  </Target>
+
 </Project>
diff --git a/Samples/KerbDumpCore/KerbDumpCore.csproj b/Samples/KerbDumpCore/KerbDumpCore.csproj
index 28e42d49..54bac921 100644
--- a/Samples/KerbDumpCore/KerbDumpCore.csproj
+++ b/Samples/KerbDumpCore/KerbDumpCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
 
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Samples/KerberosClientApp/KerberosClientApp.csproj b/Samples/KerberosClientApp/KerberosClientApp.csproj
index 81ed2ea2..36ef5f44 100644
--- a/Samples/KerberosClientApp/KerberosClientApp.csproj
+++ b/Samples/KerberosClientApp/KerberosClientApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Samples/KerberosKdcHostApp/KerberosKdcHostApp.csproj b/Samples/KerberosKdcHostApp/KerberosKdcHostApp.csproj
index 86c7431d..9c07a696 100644
--- a/Samples/KerberosKdcHostApp/KerberosKdcHostApp.csproj
+++ b/Samples/KerberosKdcHostApp/KerberosKdcHostApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj b/Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj
index 89b4628c..5afde531 100644
--- a/Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj
+++ b/Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
 
     <DebugType>pdbonly</DebugType>
diff --git a/Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj b/Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj
index 642e9926..6d522bb4 100644
--- a/Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj
+++ b/Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
 
     <DebugType>Full</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/build.yaml b/build.yaml
index 44392b69..dd65bbdb 100644
--- a/build.yaml
+++ b/build.yaml
@@ -16,14 +16,13 @@ stages:
       vmImage: windows-latest
 
     variables:
-      BuildConfiguration: Release
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Use .NET Core SDK 3.1.x'
+      displayName: 'Use .NET SDK'
       inputs:
-        version: 5.x
+        version: 6.x
         performMultiLevelLookup: true
 
     - task: DotNetCoreCLI@2
@@ -36,29 +35,20 @@ stages:
     - script: nbgv cloud
       displayName: Set Version
 
-    - task: MSBuild@1
-      displayName: 'Build solution Kerberos.NET.sln'
+    - task: DotNetCoreCLI@2
+      displayName: 'Build and pack solution Kerberos.NET.sln'
       inputs:
-        solution: Kerberos.NET.sln
-        configuration: $(BuildConfiguration)
-        msbuildArguments: /restore /p:CreatePackage=true
-        maximumCpuCount: true
+        command: 'custom'
+        custom: 'pack'
+        arguments: Kerberos.NET.sln -c Release --verbosity minimal
 
 #    - task: DotNetCoreCLI@2
 #      inputs:
 #        command: test
 #        projects: Tests/**/*.csproj
-#        arguments: -c $(BuildConfiguration) --no-build --no-restore --settings CodeCoverage.runsettings --collect:"XPlat Code Coverage" 
+#        arguments: -c Release --no-build --no-restore --settings CodeCoverage.runsettings --collect:"XPlat Code Coverage" 
 #      displayName: Run Unit Tests
 
-    - task: DotNetCoreCLI@2
-      inputs:
-        command: 'pack'
-        packagesToPack: './Bruce/Bruce.csproj'
-        nobuild: true
-        outputDir: $(Build.ArtifactStagingDirectory)
-      displayName: Pack Bruce tool
-  
     - task: PublishBuildArtifacts@1
       inputs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)'