Skip to content

Commit

Permalink
Cherry pick PR #2122: Fix comments in Visual Studio 2022 install file…
Browse files Browse the repository at this point in the history
…s (#2335)

Refer to the original PR: youtube/cobalt#2122

This CL ensures that the two files that are used to manage visual studio
2022 installation on developer workstations and build CI images are in
sync with each other.

b/316212112

Change-Id: I6bd8f4d7d97565e3ec982f586a24939709f3e643

Co-authored-by: Arjun Menon <[email protected]>
  • Loading branch information
cobalt-github-releaser-bot and arjungm authored Jan 31, 2024
1 parent 71b2183 commit 63cf5d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion docker/windows/base/visualstudio2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ FROM ${FROM_IMAGE}
SHELL ["powershell", "-ExecutionPolicy", "Unrestricted", "-Command", `
"$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

# Corresponds to VS version 17.4.6 which ships Clang 15.05
# Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1).
# This should be kept in sync with the VS installer used in the dev workstation
# setup script in: `tools/install_visual_studio_22.ps1`
ARG MSVS_INSTALLER_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/38b09fc09ae9e590b73ae6752a0ebfd62579798969041bd341689273b842bc10/vs_BuildTools.exe"
RUN mkdir C:\TEMP;`
Write-Host ('Downloading vs_buildtools.exe');`
Expand Down
3 changes: 3 additions & 0 deletions tools/install_visual_studio_22.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

New-Item -Path "C:\" -Name "src" -ItemType "directory" -Force

# Pins Visual Studio 2022 release version to 17.4.6 (includes Clang 15.0.1).
# This should be kept in sync with the VS installer used in Build CI containers
# defined in `docker/windows/base/visualstudio2022/Dockerfile`
$VS_INSTALL_URL="https://download.visualstudio.microsoft.com/download/pr/d1ed8638-9e88-461e-92b7-4e29cc6172c3/30be9c2a5e40d5666eeae683e319b472c8bcc8231c7b346fe798f0ad0f7e498b/vs_Professional.exe"

Invoke-WebRequest -Uri $VS_INSTALL_URL -OutFile C:\src\vs_professional.exe
Expand Down

0 comments on commit 63cf5d4

Please sign in to comment.