microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-10 00:48:23 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Remove dependency on .NET 6 and Framework 4.8 (#19199)

Browse Source 
* .NET 6 is EOL
* Framework 4.7.2 comes by default with VS, but 4.8 doesn't
This commit is contained in:
Leonard Hecker 2025-08-04 20:09:22 +02:00 committed by GitHub
parent a5d916f5d3
commit 9ab7cf312f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/dotnet-tools.json
View File

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"XamlStyler.Console": { "XamlStyler.Console": {
"version": "3.2311.2", "version": "3.2501.8",
"commands": [ "commands": [
"xstyler" "xstyler"
] ]

1
.vsconfig
View File

@ -17,7 +17,6 @@
"Microsoft.VisualStudio.Component.AppInsights.Tools", "Microsoft.VisualStudio.Component.AppInsights.Tools",
"Microsoft.Net.Component.4.8.TargetingPack", "Microsoft.Net.Component.4.8.TargetingPack",
"Microsoft.VisualStudio.Component.DiagnosticTools", "Microsoft.VisualStudio.Component.DiagnosticTools",
"Microsoft.NetCore.Component.Runtime.6.0",
"Microsoft.VisualStudio.Component.ClassDesigner", "Microsoft.VisualStudio.Component.ClassDesigner",
"Microsoft.VisualStudio.Component.GraphDocument", "Microsoft.VisualStudio.Component.GraphDocument",
"Microsoft.VisualStudio.Component.CodeMap", "Microsoft.VisualStudio.Component.CodeMap",

2
build/config/esrp.build.batch.wpfdotnet.json
View File

@ -2,7 +2,7 @@
{ {
"MatchedPath": [ "MatchedPath": [
"WpfTerminalControl/net472/Microsoft.Terminal.Wpf.dll", "WpfTerminalControl/net472/Microsoft.Terminal.Wpf.dll",
"WpfTerminalControl/net6.0-windows/Microsoft.Terminal.Wpf.dll" "WpfTerminalControl/net8.0-windows/Microsoft.Terminal.Wpf.dll"
], ],
"SigningInfo": { "SigningInfo": {
"Operations": [ "Operations": [

2
src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
View File

@ -6,7 +6,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WindowsTerminal.UIA.Tests</RootNamespace> <RootNamespace>WindowsTerminal.UIA.Tests</RootNamespace>
<AssemblyName>WindowsTerminal.UIA.Tests</AssemblyName> <AssemblyName>WindowsTerminal.UIA.Tests</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

5
src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<RootNamespace>Microsoft.Terminal.Wpf</RootNamespace> <RootNamespace>Microsoft.Terminal.Wpf</RootNamespace>
<AssemblyName>Microsoft.Terminal.Wpf</AssemblyName> <AssemblyName>Microsoft.Terminal.Wpf</AssemblyName>
<UseWpf>true</UseWpf> <UseWpf>true</UseWpf>

3
src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
View File

@ -2,8 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>AnyCPU;x64;x86;ARM64</Platforms> <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
</PropertyGroup> </PropertyGroup>

2
src/host/ft_uia/Host.Tests.UIA.csproj
View File

@ -6,7 +6,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Conhost.UIA.Tests</RootNamespace> <RootNamespace>Conhost.UIA.Tests</RootNamespace>
<AssemblyName>Conhost.UIA.Tests</AssemblyName> <AssemblyName>Conhost.UIA.Tests</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

2
src/host/ft_uia/app.config
View File

@ -13,6 +13,6 @@
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup> </startup>
</configuration> </configuration>

3
src/tools/TerminalStress/TerminalStress.csproj
View File

@ -2,8 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<!-- This project has no PGO, but the build will fail if the target doesn't exist. --> <!-- This project has no PGO, but the build will fail if the target doesn't exist. -->

2
src/tools/vtapp/VTApp.csproj
View File

@ -7,7 +7,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VTApp</RootNamespace> <RootNamespace>VTApp</RootNamespace>
<AssemblyName>VTApp</AssemblyName> <AssemblyName>VTApp</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />