Просмотр исходного кода

Remove Visual Studio 2022 support from InstallVisualStudio.ps1 (#65087)

* Initial plan

* Remove Visual Studio 2022 support from InstallVisualStudio.ps1

Co-authored-by: wtgodbe <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: wtgodbe <[email protected]>
Copilot 1 месяц назад
Родитель
Сommit
64e6d567b8

+ 1 - 1
docs/BuildFromSource.md

@@ -35,7 +35,7 @@ To get started, fork this repo and then clone it locally. This workflow assumes
     > To modify an existing Visual Studio installation, [follow the instructions for installing from a configuration file](https://learn.microsoft.com/visualstudio/install/import-export-installation-configurations#import-a-configuration) and use the `.vsconfig` file located in the root of the repository:
 
     ```powershell
-    ./eng/scripts/InstallVisualStudio.ps1 Enterprise Preview
+    ./eng/scripts/InstallVisualStudio.ps1 -Edition Enterprise -Channel Preview
     ```
 
     Replace `Enterprise` with `Professional` or `Community` if that is your preferred Visual Studio edition.

+ 8 - 31
eng/scripts/InstallVisualStudio.ps1

@@ -15,7 +15,6 @@
         Preview/Insiders
 .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
@@ -29,7 +28,7 @@
     https://visualstudio.com
     https://github.com/dotnet/aspnetcore/blob/main/docs/BuildFromSource.md
 .EXAMPLE
-    To install VS 2022 Community, run this command in PowerShell:
+    To install VS 2026 Community, run this command in PowerShell:
 
         .\InstallVisualStudio.ps1
 #>
@@ -38,8 +37,8 @@ param(
     [string]$Edition = 'Community',
     [ValidateSet('Release', 'Stable', 'Preview', 'Insiders', 'IntPreview', 'Dogfood')]
     [string]$Channel = 'Release',
-    [ValidateSet('2022', '2026')]
-    [string]$Version = '2022',
+    [ValidateSet('2026')]
+    [string]$Version = '2026',
     [string]$InstallPath,
     [switch]$Passive,
     [switch]$Quiet
@@ -65,12 +64,7 @@ mkdir $intermedateDir -ErrorAction Ignore | Out-Null
 $bootstrapper = "$intermedateDir\vsinstaller.exe"
 $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
 
-if ("$Version" -eq "2022") {
-    $vsversion = 17;
-}
-elseif ("$Version" -eq "2026") {
-    $vsversion = 18;
-}
+$vsversion = 18;
 
 # Normalize channel names (Stable=Release, Insiders=Preview, Dogfood=IntPreview)
 switch ($Channel) {
@@ -84,26 +78,15 @@ if ("$Edition" -eq "BuildTools") {
     $responseFileName += ".buildtools"
 }
 
-# Channel URIs differ between VS 2022 and VS 2026+
-# VS 2022: release, pre, intpreview
-# VS 2026+: stable, insiders, intpreview (canary)
 if ("$Channel" -eq "Preview") {
     $responseFileName += ".preview"
-    if ($vsversion -ge 18) {
-        $channelUri = "https://aka.ms/vs/$vsversion/insiders"
-    } else {
-        $channelUri = "https://aka.ms/vs/$vsversion/pre"
-    }
+    $channelUri = "https://aka.ms/vs/$vsversion/insiders"
 } 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"
-    }
+    $channelUri = "https://aka.ms/vs/$vsversion/stable"
 }
 
 $responseFile = "$PSScriptRoot\$responseFileName.json"
@@ -130,15 +113,9 @@ if (-not $InstallPath) {
 }
 
 if (-not $InstallPath) {
-    if (($vsversion -eq 17) -or ($vsversion -eq 18)) {
-        $pathPrefix = "${env:ProgramFiles}";
-    }
+    $pathPrefix = "${env:ProgramFiles}";
     if ("$Channel" -eq "Preview") {
-        if ($vsversion -ge 18) {
-            $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Insiders"
-        } else {
-            $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Pre"
-        }
+        $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_Insiders"
     } elseif ("$Channel" -eq "IntPreview") {
         $InstallPath = "$pathPrefix\Microsoft Visual Studio\$Version\${Edition}_IntPre"
     } else {

+ 0 - 31
eng/scripts/vs.17.buildtools.intpreview.json

@@ -1,31 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/intpreview/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
-        "Microsoft.VisualStudio.Workload.MSBuildTools",
-        "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
-        "Microsoft.VisualStudio.Workload.VCTools",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools",
-        "Microsoft.VisualStudio.Workload.WebBuildTools"
-    ]
-}

+ 0 - 31
eng/scripts/vs.17.buildtools.json

@@ -1,31 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/release/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
-        "Microsoft.VisualStudio.Workload.MSBuildTools",
-        "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
-        "Microsoft.VisualStudio.Workload.VCTools",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools",
-        "Microsoft.VisualStudio.Workload.WebBuildTools"
-    ]
-}

+ 0 - 31
eng/scripts/vs.17.buildtools.preview.json

@@ -1,31 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/pre/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
-        "Microsoft.VisualStudio.Workload.MSBuildTools",
-        "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
-        "Microsoft.VisualStudio.Workload.VCTools",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools",
-        "Microsoft.VisualStudio.Workload.WebBuildTools"
-    ]
-}

+ 0 - 26
eng/scripts/vs.17.intpreview.json

@@ -1,26 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/intpreview/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktop",
-        "Microsoft.VisualStudio.Workload.NativeDesktop",
-        "Microsoft.VisualStudio.Workload.NetWeb",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtension"
-    ]
-}

+ 0 - 26
eng/scripts/vs.17.json

@@ -1,26 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/release/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktop",
-        "Microsoft.VisualStudio.Workload.NativeDesktop",
-        "Microsoft.VisualStudio.Workload.NetWeb",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtension"
-    ]
-}

+ 0 - 26
eng/scripts/vs.17.preview.json

@@ -1,26 +0,0 @@
-{
-    "channelUri": "https://aka.ms/vs/17/pre/channel",
-    "channelId": "VisualStudio.17.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.Windows11SDK.22621",
-        "Microsoft.VisualStudio.Workload.ManagedDesktop",
-        "Microsoft.VisualStudio.Workload.NativeDesktop",
-        "Microsoft.VisualStudio.Workload.NetWeb",
-        "Microsoft.VisualStudio.Workload.VisualStudioExtension"
-    ]
-}