From 3c139fe981c0c1b073ecfcf7b2a465f27f68cc0c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 22:48:11 +0000 Subject: [PATCH 01/13] Initial plan From c84b677a4e1e75785ac3537301f313c02bdb68ea Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 22:55:24 +0000 Subject: [PATCH 02/13] Add VS 2026 support to InstallVisualStudio.ps1 Co-authored-by: adityamandaleeka <219224+adityamandaleeka@users.noreply.github.com> --- eng/scripts/InstallVisualStudio.ps1 | 8 +++-- eng/scripts/vs.19.buildtools.intpreview.json | 31 ++++++++++++++++++++ eng/scripts/vs.19.buildtools.json | 31 ++++++++++++++++++++ eng/scripts/vs.19.buildtools.preview.json | 31 ++++++++++++++++++++ eng/scripts/vs.19.intpreview.json | 26 ++++++++++++++++ eng/scripts/vs.19.json | 26 ++++++++++++++++ eng/scripts/vs.19.preview.json | 26 ++++++++++++++++ 7 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 eng/scripts/vs.19.buildtools.intpreview.json create mode 100644 eng/scripts/vs.19.buildtools.json create mode 100644 eng/scripts/vs.19.buildtools.preview.json create mode 100644 eng/scripts/vs.19.intpreview.json create mode 100644 eng/scripts/vs.19.json create mode 100644 eng/scripts/vs.19.preview.json diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 164e86a7918f..72f0bb8cdb76 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -16,6 +16,7 @@ .PARAMETER Version Selects which version of Visual Studio to install. Must be one of these values: 2022 + 2026 .PARAMETER InstallPath The location on disk where Visual Studio should be installed or updated. Default path is location of latest existing installation of the specified edition, if any. If that VS edition is not currently installed, default @@ -37,7 +38,7 @@ param( [string]$Edition = 'Community', [ValidateSet('Release', 'Preview', 'IntPreview', 'Dogfood')] [string]$Channel = 'Release', - [ValidateSet('2022')] + [ValidateSet('2022', '2026')] [string]$Version = '2022', [string]$InstallPath, [switch]$Passive, @@ -67,6 +68,9 @@ $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 if ("$Version" -eq "2022") { $vsversion = 17; } +elseif ("$Version" -eq "2026") { + $vsversion = 19; +} $channelUri = "https://aka.ms/vs/$vsversion/release" $responseFileName = "vs.$vsversion" if ("$Edition" -eq "BuildTools") { @@ -107,7 +111,7 @@ if (-not $InstallPath) { } if (-not $InstallPath) { - if ($vsversion -eq "17") { + if (($vsversion -eq "17") -or ($vsversion -eq "19")) { $pathPrefix = "${env:ProgramFiles}"; } if ("$Channel" -eq "Preview") { diff --git a/eng/scripts/vs.19.buildtools.intpreview.json b/eng/scripts/vs.19.buildtools.intpreview.json new file mode 100644 index 000000000000..9a84bff8ea4f --- /dev/null +++ b/eng/scripts/vs.19.buildtools.intpreview.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/19/intpreview/channel", + "channelId": "VisualStudio.19.IntPreview", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.FSharp.MSBuild", + "Microsoft.VisualStudio.Component.NuGet", + "Microsoft.VisualStudio.Component.NuGet.BuildTools", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", + "Microsoft.VisualStudio.Workload.MSBuildTools", + "Microsoft.VisualStudio.Workload.NetCoreBuildTools", + "Microsoft.VisualStudio.Workload.VCTools", + "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools", + "Microsoft.VisualStudio.Workload.WebBuildTools" + ] +} diff --git a/eng/scripts/vs.19.buildtools.json b/eng/scripts/vs.19.buildtools.json new file mode 100644 index 000000000000..ab8304ef1398 --- /dev/null +++ b/eng/scripts/vs.19.buildtools.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/19/release/channel", + "channelId": "VisualStudio.19.Release", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.FSharp.MSBuild", + "Microsoft.VisualStudio.Component.NuGet", + "Microsoft.VisualStudio.Component.NuGet.BuildTools", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", + "Microsoft.VisualStudio.Workload.MSBuildTools", + "Microsoft.VisualStudio.Workload.NetCoreBuildTools", + "Microsoft.VisualStudio.Workload.VCTools", + "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools", + "Microsoft.VisualStudio.Workload.WebBuildTools" + ] +} diff --git a/eng/scripts/vs.19.buildtools.preview.json b/eng/scripts/vs.19.buildtools.preview.json new file mode 100644 index 000000000000..22c43693f4b8 --- /dev/null +++ b/eng/scripts/vs.19.buildtools.preview.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/19/pre/channel", + "channelId": "VisualStudio.19.Preview", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.FSharp.MSBuild", + "Microsoft.VisualStudio.Component.NuGet", + "Microsoft.VisualStudio.Component.NuGet.BuildTools", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", + "Microsoft.VisualStudio.Workload.MSBuildTools", + "Microsoft.VisualStudio.Workload.NetCoreBuildTools", + "Microsoft.VisualStudio.Workload.VCTools", + "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools", + "Microsoft.VisualStudio.Workload.WebBuildTools" + ] +} diff --git a/eng/scripts/vs.19.intpreview.json b/eng/scripts/vs.19.intpreview.json new file mode 100644 index 000000000000..5695abea388a --- /dev/null +++ b/eng/scripts/vs.19.intpreview.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/19/intpreview/channel", + "channelId": "VisualStudio.19.IntPreview", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NetWeb", + "Microsoft.VisualStudio.Workload.VisualStudioExtension" + ] +} diff --git a/eng/scripts/vs.19.json b/eng/scripts/vs.19.json new file mode 100644 index 000000000000..2f78a6b7e03e --- /dev/null +++ b/eng/scripts/vs.19.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/19/release/channel", + "channelId": "VisualStudio.19.Release", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NetWeb", + "Microsoft.VisualStudio.Workload.VisualStudioExtension" + ] +} diff --git a/eng/scripts/vs.19.preview.json b/eng/scripts/vs.19.preview.json new file mode 100644 index 000000000000..2aa35e1e870f --- /dev/null +++ b/eng/scripts/vs.19.preview.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/19/pre/channel", + "channelId": "VisualStudio.19.Preview", + "includeRecommended": false, + "addProductLang": [ + "en-US" + ], + "add": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NetWeb", + "Microsoft.VisualStudio.Workload.VisualStudioExtension" + ] +} From 9c0c23619eb98caf9458a54116dc5f523a34dae7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 23:23:29 +0000 Subject: [PATCH 03/13] Fix VS 2026 internal version number to 18 Co-authored-by: adityamandaleeka <219224+adityamandaleeka@users.noreply.github.com> --- eng/scripts/InstallVisualStudio.ps1 | 4 ++-- ...tools.intpreview.json => vs.18.buildtools.intpreview.json} | 4 ++-- eng/scripts/{vs.19.buildtools.json => vs.18.buildtools.json} | 4 ++-- ....buildtools.preview.json => vs.18.buildtools.preview.json} | 4 ++-- eng/scripts/{vs.19.intpreview.json => vs.18.intpreview.json} | 4 ++-- eng/scripts/{vs.19.json => vs.18.json} | 4 ++-- eng/scripts/{vs.19.preview.json => vs.18.preview.json} | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename eng/scripts/{vs.19.buildtools.intpreview.json => vs.18.buildtools.intpreview.json} (92%) rename eng/scripts/{vs.19.buildtools.json => vs.18.buildtools.json} (92%) rename eng/scripts/{vs.19.buildtools.preview.json => vs.18.buildtools.preview.json} (93%) rename eng/scripts/{vs.19.intpreview.json => vs.18.intpreview.json} (90%) rename eng/scripts/{vs.19.json => vs.18.json} (91%) rename eng/scripts/{vs.19.preview.json => vs.18.preview.json} (91%) diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 72f0bb8cdb76..e01433b85af2 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -69,7 +69,7 @@ if ("$Version" -eq "2022") { $vsversion = 17; } elseif ("$Version" -eq "2026") { - $vsversion = 19; + $vsversion = 18; } $channelUri = "https://aka.ms/vs/$vsversion/release" $responseFileName = "vs.$vsversion" @@ -111,7 +111,7 @@ if (-not $InstallPath) { } if (-not $InstallPath) { - if (($vsversion -eq "17") -or ($vsversion -eq "19")) { + if (($vsversion -eq "17") -or ($vsversion -eq "18")) { $pathPrefix = "${env:ProgramFiles}"; } if ("$Channel" -eq "Preview") { diff --git a/eng/scripts/vs.19.buildtools.intpreview.json b/eng/scripts/vs.18.buildtools.intpreview.json similarity index 92% rename from eng/scripts/vs.19.buildtools.intpreview.json rename to eng/scripts/vs.18.buildtools.intpreview.json index 9a84bff8ea4f..573c5a846d18 100644 --- a/eng/scripts/vs.19.buildtools.intpreview.json +++ b/eng/scripts/vs.18.buildtools.intpreview.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/intpreview/channel", - "channelId": "VisualStudio.19.IntPreview", + "channelUri": "https://aka.ms/vs/18/intpreview/channel", + "channelId": "VisualStudio.18.IntPreview", "includeRecommended": false, "addProductLang": [ "en-US" diff --git a/eng/scripts/vs.19.buildtools.json b/eng/scripts/vs.18.buildtools.json similarity index 92% rename from eng/scripts/vs.19.buildtools.json rename to eng/scripts/vs.18.buildtools.json index ab8304ef1398..6becff52f763 100644 --- a/eng/scripts/vs.19.buildtools.json +++ b/eng/scripts/vs.18.buildtools.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/release/channel", - "channelId": "VisualStudio.19.Release", + "channelUri": "https://aka.ms/vs/18/release/channel", + "channelId": "VisualStudio.18.Release", "includeRecommended": false, "addProductLang": [ "en-US" diff --git a/eng/scripts/vs.19.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json similarity index 93% rename from eng/scripts/vs.19.buildtools.preview.json rename to eng/scripts/vs.18.buildtools.preview.json index 22c43693f4b8..d2337152859a 100644 --- a/eng/scripts/vs.19.buildtools.preview.json +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/pre/channel", - "channelId": "VisualStudio.19.Preview", + "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelId": "VisualStudio.18.Preview", "includeRecommended": false, "addProductLang": [ "en-US" diff --git a/eng/scripts/vs.19.intpreview.json b/eng/scripts/vs.18.intpreview.json similarity index 90% rename from eng/scripts/vs.19.intpreview.json rename to eng/scripts/vs.18.intpreview.json index 5695abea388a..ac502656d308 100644 --- a/eng/scripts/vs.19.intpreview.json +++ b/eng/scripts/vs.18.intpreview.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/intpreview/channel", - "channelId": "VisualStudio.19.IntPreview", + "channelUri": "https://aka.ms/vs/18/intpreview/channel", + "channelId": "VisualStudio.18.IntPreview", "includeRecommended": false, "addProductLang": [ "en-US" diff --git a/eng/scripts/vs.19.json b/eng/scripts/vs.18.json similarity index 91% rename from eng/scripts/vs.19.json rename to eng/scripts/vs.18.json index 2f78a6b7e03e..3a9a6b1f0196 100644 --- a/eng/scripts/vs.19.json +++ b/eng/scripts/vs.18.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/release/channel", - "channelId": "VisualStudio.19.Release", + "channelUri": "https://aka.ms/vs/18/release/channel", + "channelId": "VisualStudio.18.Release", "includeRecommended": false, "addProductLang": [ "en-US" diff --git a/eng/scripts/vs.19.preview.json b/eng/scripts/vs.18.preview.json similarity index 91% rename from eng/scripts/vs.19.preview.json rename to eng/scripts/vs.18.preview.json index 2aa35e1e870f..7d2f4513819b 100644 --- a/eng/scripts/vs.19.preview.json +++ b/eng/scripts/vs.18.preview.json @@ -1,6 +1,6 @@ { - "channelUri": "https://aka.ms/vs/19/pre/channel", - "channelId": "VisualStudio.19.Preview", + "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelId": "VisualStudio.18.Preview", "includeRecommended": false, "addProductLang": [ "en-US" From 2e99d8c37bac8186bbc5f4b55b0ec7e10a4f9929 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 13:13:10 -0800 Subject: [PATCH 04/13] Update channel names for 2026. --- eng/scripts/InstallVisualStudio.ps1 | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index e01433b85af2..8af86c4d294e 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -11,8 +11,8 @@ Enterprise .PARAMETER Channel Selects which channel of Visual Studio to install. Must be one of these values: - Release (the default) - Preview + Release (the default) - for VS 2022: "Release", for VS 2026+: "Stable" + Preview - for VS 2022: "Preview", for VS 2026+: "Insiders" .PARAMETER Version Selects which version of Visual Studio to install. Must be one of these values: 2022 @@ -71,7 +71,7 @@ if ("$Version" -eq "2022") { elseif ("$Version" -eq "2026") { $vsversion = 18; } -$channelUri = "https://aka.ms/vs/$vsversion/release" + $responseFileName = "vs.$vsversion" if ("$Edition" -eq "BuildTools") { $responseFileName += ".buildtools" @@ -79,12 +79,27 @@ if ("$Edition" -eq "BuildTools") { if ("$Channel" -eq "Dogfood") { $Channel = "IntPreview" } + +# Channel URIs differ between VS 2022 and VS 2026+ +# VS 2022: release, pre, intpreview +# VS 2026+: stable, insiders if ("$Channel" -eq "Preview") { $responseFileName += ".preview" - $channelUri = "https://aka.ms/vs/$vsversion/pre" + if ($vsversion -ge 18) { + $channelUri = "https://aka.ms/vs/$vsversion/insiders" + } else { + $channelUri = "https://aka.ms/vs/$vsversion/pre" + } } elseif ("$Channel" -eq "IntPreview") { $responseFileName += ".intpreview" $channelUri = "https://aka.ms/vs/$vsversion/intpreview" +} else { + # Release channel + if ($vsversion -ge 18) { + $channelUri = "https://aka.ms/vs/$vsversion/stable" + } else { + $channelUri = "https://aka.ms/vs/$vsversion/release" + } } $responseFile = "$PSScriptRoot\$responseFileName.json" @@ -115,7 +130,11 @@ if (-not $InstallPath) { $pathPrefix = "${env:ProgramFiles}"; } if ("$Channel" -eq "Preview") { - $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Pre" + if ($vsversion -ge 18) { + $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Insiders" + } else { + $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Pre" + } } elseif ("$Channel" -eq "IntPreview") { $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_IntPre" } else { From 83951b2bd3d9ae6d943080179b4b145365fd744e Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 13:17:49 -0800 Subject: [PATCH 05/13] More updating of channel names. --- eng/scripts/vs.18.buildtools.json | 2 +- eng/scripts/vs.18.buildtools.preview.json | 2 +- eng/scripts/vs.18.json | 2 +- eng/scripts/vs.18.preview.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/scripts/vs.18.buildtools.json b/eng/scripts/vs.18.buildtools.json index 6becff52f763..93659a39106b 100644 --- a/eng/scripts/vs.18.buildtools.json +++ b/eng/scripts/vs.18.buildtools.json @@ -1,5 +1,5 @@ { - "channelUri": "https://aka.ms/vs/18/release/channel", + "channelUri": "https://aka.ms/vs/18/stable/channel", "channelId": "VisualStudio.18.Release", "includeRecommended": false, "addProductLang": [ diff --git a/eng/scripts/vs.18.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json index d2337152859a..2b5dbce94cdc 100644 --- a/eng/scripts/vs.18.buildtools.preview.json +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -1,5 +1,5 @@ { - "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelUri": "https://aka.ms/vs/18/insiders/channel", "channelId": "VisualStudio.18.Preview", "includeRecommended": false, "addProductLang": [ diff --git a/eng/scripts/vs.18.json b/eng/scripts/vs.18.json index 3a9a6b1f0196..63cd44a9ee87 100644 --- a/eng/scripts/vs.18.json +++ b/eng/scripts/vs.18.json @@ -1,5 +1,5 @@ { - "channelUri": "https://aka.ms/vs/18/release/channel", + "channelUri": "https://aka.ms/vs/18/stable/channel", "channelId": "VisualStudio.18.Release", "includeRecommended": false, "addProductLang": [ diff --git a/eng/scripts/vs.18.preview.json b/eng/scripts/vs.18.preview.json index 7d2f4513819b..08ba8e971205 100644 --- a/eng/scripts/vs.18.preview.json +++ b/eng/scripts/vs.18.preview.json @@ -1,5 +1,5 @@ { - "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelUri": "https://aka.ms/vs/18/insiders/channel", "channelId": "VisualStudio.18.Preview", "includeRecommended": false, "addProductLang": [ From 7a9000cccee8a5e6be95c877d3a985ac6b7bcd7c Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 13:21:22 -0800 Subject: [PATCH 06/13] Update to available Win11 SDK. --- eng/scripts/vs.18.buildtools.intpreview.json | 2 +- eng/scripts/vs.18.buildtools.json | 2 +- eng/scripts/vs.18.buildtools.preview.json | 2 +- eng/scripts/vs.18.intpreview.json | 2 +- eng/scripts/vs.18.json | 2 +- eng/scripts/vs.18.preview.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/scripts/vs.18.buildtools.intpreview.json b/eng/scripts/vs.18.buildtools.intpreview.json index 573c5a846d18..74ed058e5d35 100644 --- a/eng/scripts/vs.18.buildtools.intpreview.json +++ b/eng/scripts/vs.18.buildtools.intpreview.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.18.buildtools.json b/eng/scripts/vs.18.buildtools.json index 93659a39106b..e5cc3b6c0b3c 100644 --- a/eng/scripts/vs.18.buildtools.json +++ b/eng/scripts/vs.18.buildtools.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.18.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json index 2b5dbce94cdc..900facb2a74e 100644 --- a/eng/scripts/vs.18.buildtools.preview.json +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.18.intpreview.json b/eng/scripts/vs.18.intpreview.json index ac502656d308..9ebd49ac6164 100644 --- a/eng/scripts/vs.18.intpreview.json +++ b/eng/scripts/vs.18.intpreview.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/eng/scripts/vs.18.json b/eng/scripts/vs.18.json index 63cd44a9ee87..a100583574d9 100644 --- a/eng/scripts/vs.18.json +++ b/eng/scripts/vs.18.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/eng/scripts/vs.18.preview.json b/eng/scripts/vs.18.preview.json index 08ba8e971205..66f5b8ca8bc7 100644 --- a/eng/scripts/vs.18.preview.json +++ b/eng/scripts/vs.18.preview.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", From bc464903af8e77f359c1a22cae2db21615b30cf2 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 14:04:47 -0800 Subject: [PATCH 07/13] Update Windows SDK from 10.0.19041.0 to 10.0.22621.0 The Windows 10 SDK 19041 is not available in VS 2026. Update to Windows 11 SDK 22621 which is available in both VS 2022 and VS 2026. - Update Cpp.Common.props WindowsTargetPlatformVersion - Update all vs.17.*.json and vs.18.*.json installer configs --- eng/scripts/vs.17.buildtools.intpreview.json | 2 +- eng/scripts/vs.17.buildtools.json | 2 +- eng/scripts/vs.17.buildtools.preview.json | 2 +- eng/scripts/vs.17.intpreview.json | 2 +- eng/scripts/vs.17.json | 2 +- eng/scripts/vs.17.preview.json | 2 +- eng/targets/Cpp.Common.props | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/scripts/vs.17.buildtools.intpreview.json b/eng/scripts/vs.17.buildtools.intpreview.json index 8a7c5ac445cb..5e27f5b52ab5 100644 --- a/eng/scripts/vs.17.buildtools.intpreview.json +++ b/eng/scripts/vs.17.buildtools.intpreview.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.17.buildtools.json b/eng/scripts/vs.17.buildtools.json index 3a125c9d35eb..a00df84f9373 100644 --- a/eng/scripts/vs.17.buildtools.json +++ b/eng/scripts/vs.17.buildtools.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.17.buildtools.preview.json b/eng/scripts/vs.17.buildtools.preview.json index 571a49978103..9b1c3ac6aa0d 100644 --- a/eng/scripts/vs.17.buildtools.preview.json +++ b/eng/scripts/vs.17.buildtools.preview.json @@ -20,7 +20,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", "Microsoft.VisualStudio.Workload.NetCoreBuildTools", diff --git a/eng/scripts/vs.17.intpreview.json b/eng/scripts/vs.17.intpreview.json index 67b7a1f8e90d..a4d195acc76b 100644 --- a/eng/scripts/vs.17.intpreview.json +++ b/eng/scripts/vs.17.intpreview.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/eng/scripts/vs.17.json b/eng/scripts/vs.17.json index 86acfd28fdbe..ac50b0374bf5 100644 --- a/eng/scripts/vs.17.json +++ b/eng/scripts/vs.17.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/eng/scripts/vs.17.preview.json b/eng/scripts/vs.17.preview.json index 39f8297f1f96..3cc22c12d5fb 100644 --- a/eng/scripts/vs.17.preview.json +++ b/eng/scripts/vs.17.preview.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index ca1335ef2c85..4f2f7662b977 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -22,7 +22,7 @@ x64 v143 $(PlatformToolsetVersion) - - 10.0.19041.0 + + 10.0.22621.0 From 482d06e4f606dea426516de378796150995eee6d Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 15:50:55 -0800 Subject: [PATCH 08/13] Add v143 toolset to Dev18 components. --- eng/scripts/vs.18.buildtools.intpreview.json | 2 ++ eng/scripts/vs.18.buildtools.json | 2 ++ eng/scripts/vs.18.buildtools.preview.json | 2 ++ eng/scripts/vs.18.intpreview.json | 2 ++ eng/scripts/vs.18.json | 2 ++ eng/scripts/vs.18.preview.json | 2 ++ 6 files changed, 12 insertions(+) diff --git a/eng/scripts/vs.18.buildtools.intpreview.json b/eng/scripts/vs.18.buildtools.intpreview.json index 74ed058e5d35..3532cb7fe994 100644 --- a/eng/scripts/vs.18.buildtools.intpreview.json +++ b/eng/scripts/vs.18.buildtools.intpreview.json @@ -16,6 +16,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", diff --git a/eng/scripts/vs.18.buildtools.json b/eng/scripts/vs.18.buildtools.json index e5cc3b6c0b3c..9e0cc47c0895 100644 --- a/eng/scripts/vs.18.buildtools.json +++ b/eng/scripts/vs.18.buildtools.json @@ -16,6 +16,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", diff --git a/eng/scripts/vs.18.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json index 900facb2a74e..827e356ef146 100644 --- a/eng/scripts/vs.18.buildtools.preview.json +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -16,6 +16,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", diff --git a/eng/scripts/vs.18.intpreview.json b/eng/scripts/vs.18.intpreview.json index 9ebd49ac6164..01670fc85f39 100644 --- a/eng/scripts/vs.18.intpreview.json +++ b/eng/scripts/vs.18.intpreview.json @@ -13,6 +13,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", diff --git a/eng/scripts/vs.18.json b/eng/scripts/vs.18.json index a100583574d9..529fd821839a 100644 --- a/eng/scripts/vs.18.json +++ b/eng/scripts/vs.18.json @@ -13,6 +13,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", diff --git a/eng/scripts/vs.18.preview.json b/eng/scripts/vs.18.preview.json index 66f5b8ca8bc7..44a2ecba9ff2 100644 --- a/eng/scripts/vs.18.preview.json +++ b/eng/scripts/vs.18.preview.json @@ -13,6 +13,8 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v143.ARM64", + "Microsoft.VisualStudio.Component.VC.v143.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", From e08e7867d3c37bdce1fed135f757db3ecfb71379 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 15:58:43 -0800 Subject: [PATCH 09/13] Update VCTools to v143. --- eng/scripts/vs.18.buildtools.intpreview.json | 10 ++++------ eng/scripts/vs.18.buildtools.json | 10 ++++------ eng/scripts/vs.18.buildtools.preview.json | 10 ++++------ eng/scripts/vs.18.intpreview.json | 10 ++++------ eng/scripts/vs.18.json | 10 ++++------ eng/scripts/vs.18.preview.json | 10 ++++------ 6 files changed, 24 insertions(+), 36 deletions(-) diff --git a/eng/scripts/vs.18.buildtools.intpreview.json b/eng/scripts/vs.18.buildtools.intpreview.json index 3532cb7fe994..7c32d3cf404d 100644 --- a/eng/scripts/vs.18.buildtools.intpreview.json +++ b/eng/scripts/vs.18.buildtools.intpreview.json @@ -16,12 +16,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.18.buildtools.json b/eng/scripts/vs.18.buildtools.json index 9e0cc47c0895..4307d3705bc0 100644 --- a/eng/scripts/vs.18.buildtools.json +++ b/eng/scripts/vs.18.buildtools.json @@ -16,12 +16,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.18.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json index 827e356ef146..e43598698d36 100644 --- a/eng/scripts/vs.18.buildtools.preview.json +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -16,12 +16,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.18.intpreview.json b/eng/scripts/vs.18.intpreview.json index 01670fc85f39..2fd07fb719d5 100644 --- a/eng/scripts/vs.18.intpreview.json +++ b/eng/scripts/vs.18.intpreview.json @@ -13,12 +13,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.18.json b/eng/scripts/vs.18.json index 529fd821839a..65393cf4a014 100644 --- a/eng/scripts/vs.18.json +++ b/eng/scripts/vs.18.json @@ -13,12 +13,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.18.preview.json b/eng/scripts/vs.18.preview.json index 44a2ecba9ff2..ad23cf27b40a 100644 --- a/eng/scripts/vs.18.preview.json +++ b/eng/scripts/vs.18.preview.json @@ -13,12 +13,10 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v143.ARM64", - "Microsoft.VisualStudio.Component.VC.v143.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", From a504f479682bd51faade9db6b9507f835e0fb0e4 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 16:20:37 -0800 Subject: [PATCH 10/13] Avoid double definition of IHttpResponse4. --- .../InProcessRequestHandler/managedexports.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index abc20ef05ecf..5377847887a3 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -13,8 +13,10 @@ extern IHttpServer* g_pHttpServer; // // Add support for certain HTTP/2.0 features like trailing headers // and GOAWAY or RST_STREAM frames. +// Only define if not already provided by the Windows SDK (available in SDK 10.0.22621.0+) // +#if NTDDI_VERSION < NTDDI_WIN10_NI class __declspec(uuid("1a2acc57-cae2-4f28-b4ab-00c8f96b12ec")) IHttpResponse4 : public IHttpResponse3 { @@ -53,6 +55,7 @@ class __declspec(uuid("1a2acc57-cae2-4f28-b4ab-00c8f96b12ec")) _In_ BOOL fReplace ) = 0; }; +#endif // NTDDI_VERSION < NTDDI_WIN10_NI // // Initialization export From d3cfd61cef2a363707477a20f4ef0b88e25f4aed Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 16:33:09 -0800 Subject: [PATCH 11/13] Remove interface definition entirely. --- .../managedexports.cpp | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 5377847887a3..056ba647f4ba 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -10,53 +10,6 @@ extern bool g_fInProcessApplicationCreated; extern std::string g_errorPageContent; extern IHttpServer* g_pHttpServer; -// -// Add support for certain HTTP/2.0 features like trailing headers -// and GOAWAY or RST_STREAM frames. -// Only define if not already provided by the Windows SDK (available in SDK 10.0.22621.0+) -// - -#if NTDDI_VERSION < NTDDI_WIN10_NI -class __declspec(uuid("1a2acc57-cae2-4f28-b4ab-00c8f96b12ec")) - IHttpResponse4 : public IHttpResponse3 -{ -public: - virtual - HRESULT - DeleteTrailer( - _In_ PCSTR pszHeaderName - ) = 0; - - virtual - PCSTR - GetTrailer( - _In_ PCSTR pszHeaderName, - _Out_ USHORT* pcchHeaderValue = nullptr - ) const = 0; - - virtual - VOID - ResetStream( - _In_ ULONG errorCode - ) = 0; - - virtual - VOID - SetNeedGoAway( - VOID - ) = 0; - - virtual - HRESULT - SetTrailer( - _In_ PCSTR pszHeaderName, - _In_ PCSTR pszHeaderValue, - _In_ USHORT cchHeaderValue, - _In_ BOOL fReplace - ) = 0; -}; -#endif // NTDDI_VERSION < NTDDI_WIN10_NI - // // Initialization export // From 3681b4f2bc84a578192be22d92664830aa6c7306 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 4 Dec 2025 16:51:17 -0800 Subject: [PATCH 12/13] Accept Stable and Insiders as channel name aliases. --- eng/scripts/InstallVisualStudio.ps1 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 8af86c4d294e..bd0736935554 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -11,8 +11,8 @@ Enterprise .PARAMETER Channel Selects which channel of Visual Studio to install. Must be one of these values: - Release (the default) - for VS 2022: "Release", for VS 2026+: "Stable" - Preview - for VS 2022: "Preview", for VS 2026+: "Insiders" + Release/Stable (the default) + Preview/Insiders .PARAMETER Version Selects which version of Visual Studio to install. Must be one of these values: 2022 @@ -36,7 +36,7 @@ param( [ValidateSet('BuildTools','Community', 'Professional', 'Enterprise')] [string]$Edition = 'Community', - [ValidateSet('Release', 'Preview', 'IntPreview', 'Dogfood')] + [ValidateSet('Release', 'Stable', 'Preview', 'Insiders', 'IntPreview', 'Dogfood')] [string]$Channel = 'Release', [ValidateSet('2022', '2026')] [string]$Version = '2022', @@ -72,13 +72,17 @@ elseif ("$Version" -eq "2026") { $vsversion = 18; } +# Normalize channel names (Stable=Release, Insiders=Preview, Dogfood=IntPreview) +switch ($Channel) { + 'Stable' { $Channel = 'Release' } + 'Insiders' { $Channel = 'Preview' } + 'Dogfood' { $Channel = 'IntPreview' } +} + $responseFileName = "vs.$vsversion" if ("$Edition" -eq "BuildTools") { $responseFileName += ".buildtools" } -if ("$Channel" -eq "Dogfood") { - $Channel = "IntPreview" -} # Channel URIs differ between VS 2022 and VS 2026+ # VS 2022: release, pre, intpreview From 20e12e32dbadf16591309938975dd6886e2049f9 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Fri, 5 Dec 2025 14:28:10 -0800 Subject: [PATCH 13/13] Minor. --- eng/scripts/InstallVisualStudio.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index bd0736935554..bed4e987491d 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -86,7 +86,7 @@ if ("$Edition" -eq "BuildTools") { # Channel URIs differ between VS 2022 and VS 2026+ # VS 2022: release, pre, intpreview -# VS 2026+: stable, insiders +# VS 2026+: stable, insiders, intpreview (canary) if ("$Channel" -eq "Preview") { $responseFileName += ".preview" if ($vsversion -ge 18) { @@ -130,7 +130,7 @@ if (-not $InstallPath) { } if (-not $InstallPath) { - if (($vsversion -eq "17") -or ($vsversion -eq "18")) { + if (($vsversion -eq 17) -or ($vsversion -eq 18)) { $pathPrefix = "${env:ProgramFiles}"; } if ("$Channel" -eq "Preview") {