diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 164e86a7918f..e01433b85af2 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 = 18; +} $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 "18")) { $pathPrefix = "${env:ProgramFiles}"; } if ("$Channel" -eq "Preview") { diff --git a/eng/scripts/vs.18.buildtools.intpreview.json b/eng/scripts/vs.18.buildtools.intpreview.json new file mode 100644 index 000000000000..573c5a846d18 --- /dev/null +++ b/eng/scripts/vs.18.buildtools.intpreview.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/18/intpreview/channel", + "channelId": "VisualStudio.18.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.18.buildtools.json b/eng/scripts/vs.18.buildtools.json new file mode 100644 index 000000000000..6becff52f763 --- /dev/null +++ b/eng/scripts/vs.18.buildtools.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/18/release/channel", + "channelId": "VisualStudio.18.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.18.buildtools.preview.json b/eng/scripts/vs.18.buildtools.preview.json new file mode 100644 index 000000000000..d2337152859a --- /dev/null +++ b/eng/scripts/vs.18.buildtools.preview.json @@ -0,0 +1,31 @@ +{ + "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelId": "VisualStudio.18.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.18.intpreview.json b/eng/scripts/vs.18.intpreview.json new file mode 100644 index 000000000000..ac502656d308 --- /dev/null +++ b/eng/scripts/vs.18.intpreview.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/18/intpreview/channel", + "channelId": "VisualStudio.18.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.18.json b/eng/scripts/vs.18.json new file mode 100644 index 000000000000..3a9a6b1f0196 --- /dev/null +++ b/eng/scripts/vs.18.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/18/release/channel", + "channelId": "VisualStudio.18.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.18.preview.json b/eng/scripts/vs.18.preview.json new file mode 100644 index 000000000000..7d2f4513819b --- /dev/null +++ b/eng/scripts/vs.18.preview.json @@ -0,0 +1,26 @@ +{ + "channelUri": "https://aka.ms/vs/18/pre/channel", + "channelId": "VisualStudio.18.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" + ] +}