Skip to content

Commit ad1b666

Browse files
authored
Merge pull request #64152 from compnerd/noca
build: update build rules for CustomAction removal
2 parents 8bb85cb + 0ba2fa0 commit ad1b666

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -935,15 +935,13 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj
935935
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\toolchain\toolchain.msi
936936

937937
:: Package sdk.msi
938-
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\CustomActions\SwiftInstaller\SwiftInstaller.vcxproj -t:restore
939938
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
940939
-p:RunWixToolsOutOfProc=true ^
941940
-p:OutputPath=%PackageRoot%\sdk\ ^
942941
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
943942
-p:PLATFORM_ROOT=%PlatformRoot%\ ^
944943
-p:SDK_ROOT=%SDKInstallRoot%\ ^
945-
-p:SWIFT_SOURCE_DIR=%SourceRoot%\swift\ ^
946-
-p:PlatformToolset=v142
944+
-p:SWIFT_SOURCE_DIR=%SourceRoot%\swift\
947945
:: TODO(compnerd) actually perform the code-signing
948946
:: signtool sign /f Apple_CodeSign.pfx /p Apple_CodeSign_Password /tr http://timestamp.digicert.com /fd sha256 %PackageRoot%\sdk\sdk.msi
949947

0 commit comments

Comments
 (0)