Skip to content

Commit d9de61f

Browse files
dougbupavelsavara
andauthored
[release/6.0] VS 17 installation (#45381)
- backport of #38592 Co-authored-by: Pavel Savara <[email protected]>
1 parent be94d27 commit d9de61f

File tree

4 files changed

+52
-8
lines changed

4 files changed

+52
-8
lines changed

docs/BuildFromSource.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ Visual Studio 2019 (16.10 Preview 3) is required to build the repo locally. If y
8888
> You can do so by running the `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser` command
8989
> in PowerShell. For more information on execution policies, you can read the [execution policy docs](https://docs.microsoft.com/powershell/module/microsoft.powershell.security/set-executionpolicy).
9090
91-
The [global.json](/global.json) file specifies the minimum requirements needed to build using `msbuild`. The [eng/scripts/vs.json](/eng/scripts/vs.json) file provides a description of the components needed to build within VS. If you plan on developing in Visual Studio, you will need to have these components installed.
91+
The [global.json](/global.json) file specifies the minimum requirements needed to build using `msbuild`. The [eng/scripts/vs.16.json](/eng/scripts/vs.16.json) file provides a description of the components needed to build within VS. If you plan on developing in Visual Studio, you will need to have these components installed.
9292

93-
> :bulb: The `InstallVisualStudio.ps1` script mentioned above reads from the `vs.json` file to determine what components to install.
93+
> :bulb: The `InstallVisualStudio.ps1` script mentioned above reads from the `vs.16.json` file to determine what components to install.
9494
9595
#### [Git](https://git-scm.org) on Windows
9696

@@ -284,7 +284,7 @@ To build a code change associated with a modification, run the build script in t
284284
On Windows, you can run the command script:
285285

286286
```powershell
287-
.\build.cmd
287+
.\eng\build.cmd
288288
```
289289

290290
On macOS/Linux, you can run the shell script:
@@ -293,7 +293,7 @@ On macOS/Linux, you can run the shell script:
293293
./build.sh
294294
```
295295

296-
> :bulb: Before using the `build.cmd` or `build.sh` at the top-level or in a subfolder, you will need to make sure that [the dependencies documented above](#step-2-install-pre-requisites) have been installed.
296+
> :bulb: Before using the `.\eng\build.cmd` or `.\eng\build.sh` at the top-level or in a subfolder, you will need to make sure that [the dependencies documented above](#step-2-install-pre-requisites) have been installed.
297297
298298
By default, all of the C# projects are built. Some C# projects require NodeJS to be installed to compile JavaScript assets which are then checked in as source. If NodeJS is detected on the path, the NodeJS projects will be compiled as part of building C# projects. If NodeJS is not detected on the path, the JavaScript assets checked in previously will be used instead. To disable building NodeJS projects, specify `-noBuildNodeJS` or `--no-build-nodejs` on the command line.
299299

@@ -369,9 +369,9 @@ See ["Artifacts"](./Artifacts.md) for more explanation of the different folders
369369
Building installers does not run as part of `build.cmd` run without parameters, so you should opt-in for building them:
370370

371371
```powershell
372-
.\build.cmd -all -pack -arch x64
373-
.\build.cmd -all -pack -arch x86 -noBuildJava
374-
.\build.cmd -buildInstallers
372+
.\eng\build.cmd -all -pack -arch x64
373+
.\eng\build.cmd -all -pack -arch x86 -noBuildJava
374+
.\eng\build.cmd -buildInstallers
375375
```
376376

377377
_Note_: Additional build steps listed above aren't necessary on Linux or macOS.

eng/scripts/InstallVisualStudio.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ if ("$Version" -eq "2019") {
7070
}
7171
if ("$Version" -eq "2022") {
7272
$vsversion = 17;
73-
$Channel = "Preview";
7473
}
7574
$channelUri = "https://aka.ms/vs/$vsversion/release"
7675
$responseFileName = "vs.$vsversion"

eng/scripts/vs.17.buildtools.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"channelUri": "https://aka.ms/vs/17/release/channel",
3+
"channelId": "VisualStudio.17.Release",
4+
"includeRecommended": false,
5+
"addProductLang": [
6+
"en-US"
7+
],
8+
"add": [
9+
"Microsoft.Net.Component.4.6.2.TargetingPack",
10+
"Microsoft.Net.Component.4.7.2.SDK",
11+
"Microsoft.Net.Component.4.7.2.TargetingPack",
12+
"Microsoft.VisualStudio.Component.FSharp.MSBuild",
13+
"Microsoft.VisualStudio.Component.NuGet",
14+
"Microsoft.VisualStudio.Component.NuGet.BuildTools",
15+
"Microsoft.VisualStudio.Component.VC.ATL",
16+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
17+
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
18+
"Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
19+
"Microsoft.VisualStudio.Workload.MSBuildTools",
20+
"Microsoft.VisualStudio.Workload.NetCoreBuildTools",
21+
"Microsoft.VisualStudio.Workload.VCTools",
22+
"Microsoft.VisualStudio.Workload.VisualStudioExtensionBuildTools",
23+
"Microsoft.VisualStudio.Workload.WebBuildTools"
24+
]
25+
}

eng/scripts/vs.17.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"channelUri": "https://aka.ms/vs/17/release/channel",
3+
"channelId": "VisualStudio.17.Release",
4+
"includeRecommended": false,
5+
"addProductLang": [
6+
"en-US"
7+
],
8+
"add": [
9+
"Microsoft.Net.Component.4.6.2.TargetingPack",
10+
"Microsoft.Net.Component.4.7.2.SDK",
11+
"Microsoft.Net.Component.4.7.2.TargetingPack",
12+
"Microsoft.VisualStudio.Component.VC.ATL",
13+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
14+
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
15+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
16+
"Microsoft.VisualStudio.Workload.NativeDesktop",
17+
"Microsoft.VisualStudio.Workload.NetWeb",
18+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
19+
]
20+
}

0 commit comments

Comments
 (0)