Skip to content

Commit 1cd432c

Browse files
Update CI builds to pass VCRedistDir
* Update installer build to pass VCRedistDir * Remove code from bad merge * Remove misc files
1 parent 485f855 commit 1cd432c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,6 +2197,7 @@ jobs:
21972197
-p:CERTIFICATE=${env:CERTIFICATE} `
21982198
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
21992199
-p:BundleFlavor=offline `
2200+
-p:VCRedistDir="${env:VCToolsRedistDir}\${env:VSCMD_ARG_TGT_ARCH}\Microsoft.VC143.CRT\" `
22002201
-p:INCLUDE_AMD64_SDK=true `
22012202
-p:INCLUDE_X86_SDK=true `
22022203
-p:INCLUDE_ARM64_SDK=true `

0 commit comments

Comments
 (0)