Skip to content

Commit f0e69ad

Browse files
Update installer build to pass VCRedistDir
1 parent e8f5bb8 commit f0e69ad

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.azure/vs2022.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,8 +2172,7 @@ stages:
21722172
-p:ProductVersion=${{ parameters.ProductVersion }}${{ parameters.BuildTag }}
21732173
-p:CERTIFICATE=$(certificate.secureFilePath)
21742174
-p:PASSPHRASE=$(CERTIFICATE_PASSWORD)
2175-
-p:VCRedistInstaller="$(env.VCToolsRedistDir)\vc_redist.$(env.VSCMD_ARG_TGT_ARCH).exe"
2176-
-p:VSVersion=$(env.VSCMD_VER)
2175+
-p:VCRedistDir="${env:VCToolsRedistDir}\${env:VSCMD_ARG_TGT_ARCH}\Microsoft.VC143.CRT\"
21772176
-p:INCLUDE_AMD64_SDK=true
21782177
-p:INCLUDE_X86_SDK=true
21792178
-p:INCLUDE_ARM64_SDK=true

.github/workflows/swift-toolchain.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,8 +2076,7 @@ jobs:
20762076
-p:CERTIFICATE=${env:CERTIFICATE} `
20772077
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
20782078
-p:BundleFlavor=offline `
2079-
-p:VCRedistInstaller="${env:VCToolsRedistDir}\vc_redist.${env:VSCMD_ARG_TGT_ARCH}.exe" `
2080-
-p:VSVersion=${env:VSCMD_VER} `
2079+
-p:VCRedistDir="${env:VCToolsRedistDir}\${env:VSCMD_ARG_TGT_ARCH}\Microsoft.VC143.CRT\" `
20812080
-p:INCLUDE_AMD64_SDK=true `
20822081
-p:INCLUDE_X86_SDK=true `
20832082
-p:INCLUDE_ARM64_SDK=true `

0 commit comments

Comments
 (0)