diff --git a/README.md b/README.md
index 7c5847d9f..50dbe96c7 100644
--- a/README.md
+++ b/README.md
@@ -66,13 +66,13 @@ build.cmd
 To use the tool locally, you need to build it from source. Once it's built, the tool will live under:
 
 ```
-/artifacts/bin/try-convert/Debug/net5.0/try-convert.exe
+/artifacts/bin/try-convert/Debug/net6.0/try-convert.exe
 ```
 
 Alternatively, you can look at the following directory and copy that into somewhere else on your machine:
 
 ```
-mv /artifacts/bin/try-convert/Debug/net5.0/publish C:/Users/<user>/try-convert
+mv /artifacts/bin/try-convert/Debug/net6.0/publish C:/Users/<user>/try-convert
 ```
 
 You can invoke the tool from the publish directory as well.
diff --git a/src/MSBuild.Conversion.Facts/MSBuildFacts.cs b/src/MSBuild.Conversion.Facts/MSBuildFacts.cs
index 1e3d3fbdf..3b7ad2ec1 100644
--- a/src/MSBuild.Conversion.Facts/MSBuildFacts.cs
+++ b/src/MSBuild.Conversion.Facts/MSBuildFacts.cs
@@ -296,8 +296,8 @@ public static class MSBuildFacts
         public const string PackagesSubstring = @"\packages";
         public const string NetStandard20 = "netstandard2.0";
         public const string NetCoreApp31 = "netcoreapp3.1";
-        public const string Net5 = "net5.0";
-        public const string Net5Windows = "net5.0-windows";
+        public const string Net5 = "net6.0";
+        public const string Net5Windows = "net6.0-windows";
         public const string AppConfig = "App.config";
         public const string EmbeddedResourceGeneratorProperty = "Generator";
         public const string SettingsSingleFileGenerator = "SettingsSingleFileGenerator";
diff --git a/tests/TestData/SmokeTests.FSharpConsoleNet5Baseline/SmokeTests.FSharpConsoleNet5Baseline.fsproj b/tests/TestData/SmokeTests.FSharpConsoleNet5Baseline/SmokeTests.FSharpConsoleNet5Baseline.fsproj
index 1a429f3d8..7d52d6826 100644
--- a/tests/TestData/SmokeTests.FSharpConsoleNet5Baseline/SmokeTests.FSharpConsoleNet5Baseline.fsproj
+++ b/tests/TestData/SmokeTests.FSharpConsoleNet5Baseline/SmokeTests.FSharpConsoleNet5Baseline.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/tests/TestData/SmokeTests.MSTestVbNet5Baseline/SmokeTests.MSTestVbNet5Baseline.vbproj b/tests/TestData/SmokeTests.MSTestVbNet5Baseline/SmokeTests.MSTestVbNet5Baseline.vbproj
index 6c1b3c6ba..183ac81c1 100644
--- a/tests/TestData/SmokeTests.MSTestVbNet5Baseline/SmokeTests.MSTestVbNet5Baseline.vbproj
+++ b/tests/TestData/SmokeTests.MSTestVbNet5Baseline/SmokeTests.MSTestVbNet5Baseline.vbproj
@@ -14,7 +14,7 @@
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/tests/TestData/SmokeTests.WebLibraryNet5Baseline/SmokeTests.WebLibraryNet5Baseline.csproj b/tests/TestData/SmokeTests.WebLibraryNet5Baseline/SmokeTests.WebLibraryNet5Baseline.csproj
index 67e3a1a18..5d8afc00c 100644
--- a/tests/TestData/SmokeTests.WebLibraryNet5Baseline/SmokeTests.WebLibraryNet5Baseline.csproj
+++ b/tests/TestData/SmokeTests.WebLibraryNet5Baseline/SmokeTests.WebLibraryNet5Baseline.csproj
@@ -3,7 +3,7 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/tests/TestData/SmokeTests.WinformsNet5Baseline/SmokeTests.WinformsNet5Baseline.csproj b/tests/TestData/SmokeTests.WinformsNet5Baseline/SmokeTests.WinformsNet5Baseline.csproj
index b464db592..31037dfd1 100644
--- a/tests/TestData/SmokeTests.WinformsNet5Baseline/SmokeTests.WinformsNet5Baseline.csproj
+++ b/tests/TestData/SmokeTests.WinformsNet5Baseline/SmokeTests.WinformsNet5Baseline.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/tests/TestData/SmokeTests.WinformsNet5RemoveCustomImportsBaseline/SmokeTests.WinformsNet5RemoveCustomImportsBaseline.csproj b/tests/TestData/SmokeTests.WinformsNet5RemoveCustomImportsBaseline/SmokeTests.WinformsNet5RemoveCustomImportsBaseline.csproj
index b464db592..31037dfd1 100644
--- a/tests/TestData/SmokeTests.WinformsNet5RemoveCustomImportsBaseline/SmokeTests.WinformsNet5RemoveCustomImportsBaseline.csproj
+++ b/tests/TestData/SmokeTests.WinformsNet5RemoveCustomImportsBaseline/SmokeTests.WinformsNet5RemoveCustomImportsBaseline.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/tests/TestData/SmokeTests.WpfNet5Baseline/SmokeTests.WpfNet5Baseline.csproj b/tests/TestData/SmokeTests.WpfNet5Baseline/SmokeTests.WpfNet5Baseline.csproj
index 6965a7640..04ffc1c63 100644
--- a/tests/TestData/SmokeTests.WpfNet5Baseline/SmokeTests.WpfNet5Baseline.csproj
+++ b/tests/TestData/SmokeTests.WpfNet5Baseline/SmokeTests.WpfNet5Baseline.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
diff --git a/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj b/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj
index e330ac719..c26ddba59 100644
--- a/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj
+++ b/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>WpfApp1</RootNamespace>
     <AssemblyName>WpfApp1</AssemblyName>
diff --git a/tests/end-to-end/Smoke.Tests/BasicConversions.cs b/tests/end-to-end/Smoke.Tests/BasicConversions.cs
index 6fd2e4ea4..4ea1fec69 100644
--- a/tests/end-to-end/Smoke.Tests/BasicConversions.cs
+++ b/tests/end-to-end/Smoke.Tests/BasicConversions.cs
@@ -41,7 +41,7 @@ public void ConvertsLegacyFSharpConsoleToNet50()
         {
             var projectToConvertPath = GetFSharpProjectPath("SmokeTests.LegacyFSharpConsole");
             var projectBaselinePath = GetFSharpProjectPath("SmokeTests.FSharpConsoleNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0");
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0");
         }
 
         [Fact]
@@ -57,7 +57,7 @@ public void ConvertsWpfFrameworkTemplateForNet50()
         {
             var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WpfFramework");
             var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WpfNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-windows");
         }
 
         [Fact]
@@ -65,7 +65,7 @@ public void ConvertsWpfVbFrameworkTemplateForNet50()
         {
             var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.WpfVbFramework");
             var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.WpfVbNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-windows");
         }
 
         [Fact]
@@ -89,7 +89,7 @@ public void ConvertsWinformsFrameworkTemplateForNet50()
         {
             var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
             var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-windows");
         }
 
         [Fact]
@@ -97,7 +97,7 @@ public void ConvertsWinformsFrameworkTemplateForNet50WithForceRemoveCustomImport
         {
             var projectToConvertPath = GetCSharpProjectPath("SmokeTests.WinformsFramework");
             var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WinformsNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows", forceRemoveCustomImports : true);
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-windows", forceRemoveCustomImports : true);
         }
 
         [Fact]
@@ -113,7 +113,7 @@ public void ConvertsLegacyMSTestVB()
         {
             var projectToConvertPath = GetVisualBasicProjectPath("SmokeTests.LegacyMSTestVB");
             var projectBaselinePath = GetVisualBasicProjectPath("SmokeTests.MSTestVbNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0-windows");
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0-windows");
         }
 
         [Fact]
@@ -129,7 +129,7 @@ public void ConvertsLegacyWebLibraryToNet5()
         {
             var projectToConvertPath = GetCSharpProjectPath("SmokeTests.LegacyWebLibrary");
             var projectBaselinePath = GetCSharpProjectPath("SmokeTests.WebLibraryNet5Baseline");
-            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net5.0", true);
+            AssertConversionWorks(projectToConvertPath, projectBaselinePath, "net6.0", true);
         }
 
         private void AssertConversionWorks(string projectToConvertPath, string projectBaselinePath, string targetTFM, bool forceWeb = false, bool keepTargetFramework = false, bool forceRemoveCustomImports = false)