Move to Visual Studio 2026, SDK 26100 and toolset v145 (#20225)

2026-07-08 17:46:05 +00:00 · 2026-06-10 17:43:30 -05:00
parent 56bb43c265
commit fc958b13ce
26 changed files with 35 additions and 26 deletions
--- a/README.md
+++ b/README.md
@@ -353,7 +353,7 @@ winget configure .config\configuration.winget
  app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
  to locally install and run Windows Terminal
 * You must have [PowerShell 7 or later](https://github.com/PowerShell/PowerShell/releases/latest) installed
-* You must have the [Windows 11 (10.0.22621.0)
+* You must have the [Windows 11 (10.0.26100.0)
  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
  installed
 * You must have at least [VS
--- a/build/pipelines/ci.yml
+++ b/build/pipelines/ci.yml
@@ -59,6 +59,7 @@ stages:
                name: SHINE-INT-L
              ${{ else }}:
                name: SHINE-OSS-L
+              demands: ImageOverride -equals SHINE-VS18-Latest
            buildPlatforms: [x64]
            buildConfigurations: [AuditMode]
            buildEverything: true
@@ -82,6 +83,7 @@ stages:
                name: SHINE-INT-L
              ${{ else }}:
                name: SHINE-OSS-L
+              demands: ImageOverride -equals SHINE-VS18-Latest
            buildPlatforms:
              - ${{ platform }}
            buildConfigurations: [Release]
--- a/build/pipelines/feature-flag-ci.yml
+++ b/build/pipelines/feature-flag-ci.yml
@@ -32,6 +32,7 @@ stages:
          parameters:
            pool: # This only runs in CI
              name: SHINE-OSS-L
+              demands: ImageOverride -equals SHINE-VS18-Latest
            buildPlatforms: [x64]
            buildConfigurations: [Release]
            buildEverything: true
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -44,6 +44,7 @@ stages:
              name: SHINE-INT-L
            ${{ else }}:
              name: SHINE-OSS-L
+            demands: ImageOverride -equals SHINE-VS18-Latest
          branding: ${{ parameters.branding }}
          buildPlatforms: ${{ parameters.buildPlatforms }}
          buildConfigurations: [Release]
--- a/build/pipelines/templates-v2/job-build-project.yml
+++ b/build/pipelines/templates-v2/job-build-project.yml
@@ -97,7 +97,7 @@ jobs:
            ${{ else }}:
              OutputBuildPlatform: ${{ platform }}
  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
+    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
    # Azure DevOps abhors a vacuum
    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
--- a/build/pipelines/templates-v2/pipeline-1espt-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-1espt-full-release-build.yml
@@ -78,6 +78,7 @@ extends:
    - 1ES.PT.ViaStartRight
    pool:
      name: SHINE-INT-L
+      demands: ImageOverride -equals SHINE-VS18-Latest
      os: windows
    sdl:
      tsa:
@@ -162,6 +163,7 @@ extends:
              parameters:
                pool:
                  name: SHINE-INT-S
+                  demands: ImageOverride -equals SHINE-VS18-Latest
                  os: windows
                outerTemplateContext:
                  outputs:
@@ -182,6 +184,7 @@ extends:
              parameters:
                pool:
                  name: SHINE-INT-S
+                  demands: ImageOverride -equals SHINE-VS18-Latest
                  os: windows
                outerTemplateContext:
                  outputs:
@@ -200,6 +203,7 @@ extends:
              parameters:
                pool:
                  name: SHINE-INT-S
+                  demands: ImageOverride -equals SHINE-VS18-Latest
                  os: windows
                outerTemplateContext:
                  outputs:
@@ -224,6 +228,7 @@ extends:
            parameters:
              pool:
                name: SHINE-INT-S
+                demands: ImageOverride -equals SHINE-VS18-Latest
                os: windows
              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
              symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
--- a/build/pipelines/templates-v2/pipeline-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-full-release-build.yml
@@ -58,7 +58,7 @@ parameters:
    type: object
    default:
      name: SHINE-INT-S # By default, send jobs to the small agent pool.
-      demands: ImageOverride -equals SHINE-VS17-Latest
+      demands: ImageOverride -equals SHINE-VS18-Latest

 variables:
  - template: variables-nuget-package-version.yml
@@ -81,7 +81,7 @@ stages:
        parameters:
          pool:
            name: SHINE-INT-L # Run the compilation on the large agent pool, rather than the default small one.
-            demands: ImageOverride -equals SHINE-VS17-Latest
+            demands: ImageOverride -equals SHINE-VS18-Latest
          branding: ${{ parameters.branding }}
          buildTerminal: ${{ parameters.buildTerminal }}
          buildConPTY: ${{ parameters.buildConPTY }}
--- a/build/pipelines/templates-v2/steps-install-vcpkg.yml
+++ b/build/pipelines/templates-v2/steps-install-vcpkg.yml
@@ -1,6 +1,6 @@
 steps:
  - pwsh: |-
-      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -requires Microsoft.VisualStudio.Component.Vcpkg -property installationPath
+      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -requires Microsoft.VisualStudio.Component.Vcpkg -property installationPath -latest
      If ([String]::IsNullOrEmpty($VsInstallRoot)) {
        Remove-Item -Recurse -Force dep/vcpkg -ErrorAction:Ignore
        git clone https://github.com/microsoft/vcpkg dep/vcpkg
--- a/build/scripts/Create-AppxBundle.ps1
+++ b/build/scripts/Create-AppxBundle.ps1
@@ -22,7 +22,7 @@ Param(
    [Parameter(HelpMessage="Path to makeappx.exe")]
    [ValidateScript({Test-Path $_ -Type Leaf})]
    [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe"
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe"
 )

 If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {
--- a/build/scripts/Merge-PriFiles.ps1
+++ b/build/scripts/Merge-PriFiles.ps1
@@ -16,7 +16,7 @@ Param(
    [Parameter(HelpMessage="Path to makepri.exe")]
    [ValidateScript({Test-Path $_ -Type Leaf})]
    [string]
-    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakePri.exe"
+    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\MakePri.exe"
 )

 $ErrorActionPreference = 'Stop'
--- a/build/scripts/Merge-TerminalAndXamlResources.ps1
+++ b/build/scripts/Merge-TerminalAndXamlResources.ps1
@@ -17,7 +17,7 @@ Param(
    [Parameter(HelpMessage="Path to makepri.exe")]
    [ValidateScript({Test-Path $_ -Type Leaf})]
    [string]
-    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakePri.exe"
+    $MakePriPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\MakePri.exe"
 )

 $ErrorActionPreference = 'Stop'
--- a/build/scripts/New-UnpackagedTerminalDistribution.ps1
+++ b/build/scripts/New-UnpackagedTerminalDistribution.ps1
@@ -25,7 +25,7 @@ Param(
    [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='Layout')]
    [ValidateScript({Test-Path $_ -Type Leaf})]
    [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe",
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\MakeAppx.exe",

    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='AppX')]
    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='Layout')]
--- a/build/scripts/Test-WindowsTerminalPackage.ps1
+++ b/build/scripts/Test-WindowsTerminalPackage.ps1
@@ -8,7 +8,7 @@ Param(
    [Parameter(HelpMessage="Path to Windows Kit")]
    [ValidateScript({Test-Path $_ -Type Leaf})]
    [string]
-    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0"
+    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0"
 )

 $ErrorActionPreference = "Stop"
--- a/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
@@ -5,4 +5,4 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)
--- a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
@@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)

 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
@@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)

 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
@@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)

 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
@@ -5,4 +5,4 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)
--- a/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
@@ -5,4 +5,4 @@ set(VCPKG_LIBRARY_LINKAGE static)

 # ...but with explicit platform toolset, so that future toolsets
 # aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
+set(VCPKG_PLATFORM_TOOLSET v145)
--- a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj
+++ b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj
@@ -23,7 +23,7 @@
    <ProjectGuid>{96274800-9574-423E-892A-909FBE2AC8BE}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>EchoCon</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml
@@ -28,7 +28,7 @@
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.26100.0" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
  </Dependencies>
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest
@@ -9,7 +9,7 @@
    <uap:SupportedUsers>multiple</uap:SupportedUsers>
  </Properties>
  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.26100.0" />
  </Dependencies>
  <Resources>
    <Resource Language="x-generate" />
--- a/src/cascadia/UnitTests_SettingsModel/KeyBindingsTests.cpp
+++ b/src/cascadia/UnitTests_SettingsModel/KeyBindingsTests.cpp
@@ -176,9 +176,9 @@ namespace SettingsModelUnitTests
        auto hashFromKey = [&](auto& kc) {
            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*actionMap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().as<NewTabArgs>();
+            const auto& realArgs = actionAndArgs.Args().template as<NewTabArgs>();
            VERIFY_IS_NOT_NULL(realArgs.ContentArgs());
-            const auto terminalArgs{ realArgs.ContentArgs().try_as<NewTerminalArgs>() };
+            const auto terminalArgs{ realArgs.ContentArgs().template try_as<NewTerminalArgs>() };
            return terminalArgs.Hash();
        };

--- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml
+++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml
@@ -29,7 +29,7 @@
    <Description>TAEF Packaged Cwa FullTrust Application Host Process</Description>
  </Properties>
  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
    <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
  </Dependencies>
--- a/src/common.build.pre.props
+++ b/src/common.build.pre.props
@@ -75,7 +75,7 @@
  </ItemGroup>

  <PropertyGroup Label="Globals">
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.26100.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)' == ''">10.0.18362.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>

@@ -95,7 +95,8 @@

  <!-- For ALL build types-->
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '18.0'">v145</PlatformToolset>
+    <PlatformToolset Condition="'$(PlatformToolset)' == ''">v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <LinkIncremental>false</LinkIncremental>
    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -196,7 +197,6 @@
    </ClCompile>
    <Link>
      <SetChecksum>false</SetChecksum>
-      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>

--- a/src/wap-common.build.pre.props
+++ b/src/wap-common.build.pre.props
@@ -63,7 +63,7 @@
  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />

  <PropertyGroup>
-    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
    <DefaultLanguage>en-US</DefaultLanguage>
  </PropertyGroup>