From 9ab7cf312ff699ee9138864549af6a4df86e830a Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Mon, 4 Aug 2025 20:09:22 +0200
Subject: [PATCH] Remove dependency on .NET 6 and Framework 4.8 (#19199)

* .NET 6 is EOL
* Framework 4.7.2 comes by default with VS, but 4.8 doesn't
---
 .config/dotnet-tools.json                                    | 2 +-
 .vsconfig                                                    | 1 -
 build/config/esrp.build.batch.wpfdotnet.json                 | 2 +-
 .../WindowsTerminal.UIA.Tests.csproj                         | 2 +-
 src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj    | 5 ++---
 .../WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj     | 3 +--
 src/host/ft_uia/Host.Tests.UIA.csproj                        | 2 +-
 src/host/ft_uia/app.config                                   | 2 +-
 src/tools/TerminalStress/TerminalStress.csproj               | 3 +--
 src/tools/vtapp/VTApp.csproj                                 | 2 +-
 10 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 4479fcd487..1ee6bf9359 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "XamlStyler.Console": {
-      "version": "3.2311.2",
+      "version": "3.2501.8",
       "commands": [
         "xstyler"
       ]
diff --git a/.vsconfig b/.vsconfig
index 4d39a491cc..a3997ad694 100644
--- a/.vsconfig
+++ b/.vsconfig
@@ -17,7 +17,6 @@
     "Microsoft.VisualStudio.Component.AppInsights.Tools",
     "Microsoft.Net.Component.4.8.TargetingPack",
     "Microsoft.VisualStudio.Component.DiagnosticTools",
-    "Microsoft.NetCore.Component.Runtime.6.0",
     "Microsoft.VisualStudio.Component.ClassDesigner",
     "Microsoft.VisualStudio.Component.GraphDocument",
     "Microsoft.VisualStudio.Component.CodeMap",
diff --git a/build/config/esrp.build.batch.wpfdotnet.json b/build/config/esrp.build.batch.wpfdotnet.json
index 316aa70116..2f36710deb 100644
--- a/build/config/esrp.build.batch.wpfdotnet.json
+++ b/build/config/esrp.build.batch.wpfdotnet.json
@@ -2,7 +2,7 @@
     {
         "MatchedPath": [
             "WpfTerminalControl/net472/Microsoft.Terminal.Wpf.dll",
-            "WpfTerminalControl/net6.0-windows/Microsoft.Terminal.Wpf.dll"
+            "WpfTerminalControl/net8.0-windows/Microsoft.Terminal.Wpf.dll"
         ],
         "SigningInfo": {
             "Operations": [
diff --git a/src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj b/src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
index f4cc6652f6..a67bd0a88c 100644
--- a/src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
+++ b/src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
@@ -6,7 +6,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WindowsTerminal.UIA.Tests</RootNamespace>
     <AssemblyName>WindowsTerminal.UIA.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj b/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
index 8a299b5c05..518fe6b77b 100644
--- a/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
+++ b/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    
-    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
     <RootNamespace>Microsoft.Terminal.Wpf</RootNamespace>
     <AssemblyName>Microsoft.Terminal.Wpf</AssemblyName>
     <UseWpf>true</UseWpf>
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj b/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
index b3b839c485..29aa38bc09 100644
--- a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
+++ b/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
   </PropertyGroup>
diff --git a/src/host/ft_uia/Host.Tests.UIA.csproj b/src/host/ft_uia/Host.Tests.UIA.csproj
index fcbb087bde..ce471cf7fd 100644
--- a/src/host/ft_uia/Host.Tests.UIA.csproj
+++ b/src/host/ft_uia/Host.Tests.UIA.csproj
@@ -6,7 +6,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Conhost.UIA.Tests</RootNamespace>
     <AssemblyName>Conhost.UIA.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/src/host/ft_uia/app.config b/src/host/ft_uia/app.config
index 7062d498c8..dc25723ee0 100644
--- a/src/host/ft_uia/app.config
+++ b/src/host/ft_uia/app.config
@@ -13,6 +13,6 @@
     </assemblyBinding>
   </runtime>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
 </configuration>
diff --git a/src/tools/TerminalStress/TerminalStress.csproj b/src/tools/TerminalStress/TerminalStress.csproj
index 208c8da8e4..b1eedf24b1 100644
--- a/src/tools/TerminalStress/TerminalStress.csproj
+++ b/src/tools/TerminalStress/TerminalStress.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
 
   <!-- This project has no PGO, but the build will fail if the target doesn't exist. -->
diff --git a/src/tools/vtapp/VTApp.csproj b/src/tools/vtapp/VTApp.csproj
index e42b141f0a..c14d36f427 100644
--- a/src/tools/vtapp/VTApp.csproj
+++ b/src/tools/vtapp/VTApp.csproj
@@ -7,7 +7,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>VTApp</RootNamespace>
     <AssemblyName>VTApp</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />