diff --git a/README.md b/README.md index 83baebea3a..ad6ec22bd2 100644 --- 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 diff --git a/build/pipelines/ci.yml b/build/pipelines/ci.yml index 7b0b25c047..7d91556827 100644 --- 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] diff --git a/build/pipelines/feature-flag-ci.yml b/build/pipelines/feature-flag-ci.yml index 72ce2e392f..5e3adb7def 100644 --- 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 diff --git a/build/pipelines/pgo.yml b/build/pipelines/pgo.yml index a62d41598e..ebb6d81b0d 100644 --- 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] diff --git a/build/pipelines/templates-v2/job-build-project.yml b/build/pipelines/templates-v2/job-build-project.yml index 659f95a126..99af9494ae 100644 --- 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* diff --git a/build/pipelines/templates-v2/pipeline-1espt-full-release-build.yml b/build/pipelines/templates-v2/pipeline-1espt-full-release-build.yml index 62e541a2c1..f42ced7709 100644 --- 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 }} diff --git a/build/pipelines/templates-v2/pipeline-full-release-build.yml b/build/pipelines/templates-v2/pipeline-full-release-build.yml index 9a65d6e08a..05aba3f9a2 100644 --- 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 }} diff --git a/build/pipelines/templates-v2/steps-install-vcpkg.yml b/build/pipelines/templates-v2/steps-install-vcpkg.yml index ec7c3f3c9a..1e926b86ea 100644 --- 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 diff --git a/build/scripts/Create-AppxBundle.ps1 b/build/scripts/Create-AppxBundle.ps1 index 9c120f6320..23774a4bdb 100644 --- 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)) { diff --git a/build/scripts/Merge-PriFiles.ps1 b/build/scripts/Merge-PriFiles.ps1 index 3a9985936a..3538493068 100644 --- 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' diff --git a/build/scripts/Merge-TerminalAndXamlResources.ps1 b/build/scripts/Merge-TerminalAndXamlResources.ps1 index 92c8bad556..3137a5d19a 100644 --- 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' diff --git a/build/scripts/New-UnpackagedTerminalDistribution.ps1 b/build/scripts/New-UnpackagedTerminalDistribution.ps1 index 9f8d295be8..8818e813f4 100644 --- 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')] diff --git a/build/scripts/Test-WindowsTerminalPackage.ps1 b/build/scripts/Test-WindowsTerminalPackage.ps1 index b492eca05f..d6fe8987ca 100644 --- 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" diff --git a/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake index 37b85c3e0c..5f43308b81 100644 --- 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) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake index 9f2c8d0a13..01f4d3f6d7 100644 --- 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) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake index 7b3aeea850..dbd423385a 100644 --- 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) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake index 9e6a72cdff..95219a2808 100644 --- 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) diff --git a/dep/vcpkg-overlay-triplets/x64-windows-static.cmake b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake index 12e0256ddf..2e4b4dca94 100644 --- 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) diff --git a/dep/vcpkg-overlay-triplets/x86-windows-static.cmake b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake index 45869c1dd3..bde2ad647e 100644 --- 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) diff --git a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj index ddd8590864..68d2b1b685 100644 --- a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj +++ b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj @@ -23,7 +23,7 @@ {96274800-9574-423E-892A-909FBE2AC8BE} Win32Proj EchoCon - 10.0.22621.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml index 1cb3a5c849..2d3c2eb55b 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml @@ -28,7 +28,7 @@ - + diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest index f2beb373fd..12e84c1b79 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest @@ -9,7 +9,7 @@ multiple - + diff --git a/src/cascadia/UnitTests_SettingsModel/KeyBindingsTests.cpp b/src/cascadia/UnitTests_SettingsModel/KeyBindingsTests.cpp index 771fa87ed8..efeefcc27e 100644 --- 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(); + const auto& realArgs = actionAndArgs.Args().template as(); VERIFY_IS_NOT_NULL(realArgs.ContentArgs()); - const auto terminalArgs{ realArgs.ContentArgs().try_as() }; + const auto terminalArgs{ realArgs.ContentArgs().template try_as() }; return terminalArgs.Hash(); }; diff --git a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index be33718464..a0dd8499f3 100644 --- a/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml +++ b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml @@ -29,7 +29,7 @@ TAEF Packaged Cwa FullTrust Application Host Process - + diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 0b9ee8a966..7d0f35f6f3 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -75,7 +75,7 @@ - 10.0.22621.0 + 10.0.26100.0 10.0.18362.0 @@ -95,7 +95,8 @@ - v143 + v145 + v143 Unicode false x64 @@ -196,7 +197,6 @@ false - DebugFastLink diff --git a/src/wap-common.build.pre.props b/src/wap-common.build.pre.props index f99f1e164b..79fddd9b19 100644 --- a/src/wap-common.build.pre.props +++ b/src/wap-common.build.pre.props @@ -63,7 +63,7 @@ - 10.0.22621.0 + 10.0.26100.0 10.0.18362.0 en-US