diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.yml b/.github/ISSUE_TEMPLATE/Bug_Report.yml index 2a647a35d51..b618e7c6828 100644 --- a/.github/ISSUE_TEMPLATE/Bug_Report.yml +++ b/.github/ISSUE_TEMPLATE/Bug_Report.yml @@ -22,7 +22,7 @@ body: - type: input attributes: label: Windows build number - placeholder: "10.0.22621.0" + placeholder: "10.0.26100.0" description: | Please run `ver` or `[Environment]::OSVersion`. validations: diff --git a/.vsconfig b/.vsconfig index 4d39a491cc8..7a8b2f6409e 100644 --- a/.vsconfig +++ b/.vsconfig @@ -23,7 +23,7 @@ "Microsoft.VisualStudio.Component.CodeMap", "Microsoft.VisualStudio.Component.VC.CoreIde", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows11SDK.22621", + "Microsoft.VisualStudio.Component.Windows11SDK.26100", "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs", "Microsoft.ComponentGroup.Blend", diff --git a/README.md b/README.md index e178ad2eb36..b2ee0f21151 100644 --- a/README.md +++ b/README.md @@ -359,7 +359,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/templates-v2/job-build-project.yml b/build/pipelines/templates-v2/job-build-project.yml index 47390bbbf31..218dc5e6189 100644 --- a/build/pipelines/templates-v2/job-build-project.yml +++ b/build/pipelines/templates-v2/job-build-project.yml @@ -90,7 +90,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/scripts/Create-AppxBundle.ps1 b/build/scripts/Create-AppxBundle.ps1 index 9c120f63203..23774a4bdbb 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 3a9985936aa..35384930684 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 92c8bad5565..3137a5d19a2 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 9f8d295be85..8818e813f43 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 b492eca05f1..d6fe8987cac 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/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj index ddd8590864d..68d2b1b685a 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 1cb3a5c8492..2d3c2eb55b7 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 f2beb373fd4..12e84c1b79a 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/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml b/src/cascadia/ut_app/TerminalApp.Unit.Tests.AppxManifest.xml index be33718464a..a0dd8499f33 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 4e2346eb05b..787313fdd33 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 diff --git a/src/wap-common.build.pre.props b/src/wap-common.build.pre.props index f99f1e164b1..79fddd9b195 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