Skip to content

Commit d4b2e6a

Browse files
authored
Reapply "Support clang in MSVC and removal of Visual Studio 2019" (#6995)
I believe we should be good to do another Windows AMI deployment. Hence proposing this PR
1 parent e9bc36e commit d4b2e6a

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

aws/ami/windows/scripts/Installers/Install-VS.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ $VS_INSTALL_ARGS = @("--nocache","--quiet","--wait", "--add Microsoft.VisualStud
2222
"--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
2323
"--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
2424
"--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
25-
"--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81")
25+
"--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81",
26+
"--add Microsoft.VisualStudio.Component.VC.Llvm.Clang",
27+
"--add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset")
2628

2729
if (${env:INSTALL_WINDOWS_SDK} -eq "1") {
2830
$VS_INSTALL_ARGS += "--add Microsoft.VisualStudio.Component.Windows10SDK.19041"

aws/ami/windows/windows.pkr.hcl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,6 @@ build {
6868
]
6969
}
7070

71-
# Install the Visual Studio 2019
72-
provisioner "powershell" {
73-
environment_vars = ["INSTALL_WINDOWS_SDK=1", "VS_YEAR=2019", "VS_VERSION=16.11.21", "VS_UNINSTALL_PREVIOUS=1"]
74-
execution_policy = "unrestricted"
75-
scripts = [
76-
"${path.root}/scripts/Installers/Install-VS.ps1",
77-
]
78-
}
79-
8071
# Install the Visual Studio 2022
8172
provisioner "powershell" {
8273
environment_vars = ["INSTALL_WINDOWS_SDK=1", "VS_YEAR=2022", "VS_VERSION=17.4.1", "VS_UNINSTALL_PREVIOUS=0"]

0 commit comments

Comments
 (0)