Skip to content

Commit 1411639

Browse files
authored
Merge pull request #64568 from tristanlabelle/msbuild-installer-dash-restore
Add -restore to msbuild invocations for Windows installer
2 parents a3b195b + 532c4e6 commit 1411639

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

utils/build-windows-toolchain.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,7 @@ setlocal enableextensions enabledelayedexpansion
924924

925925
:: Package toolchain.msi
926926
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj ^
927+
-restore ^
927928
-p:RunWixToolsOutOfProc=true ^
928929
-p:OutputPath=%PackageRoot%\toolchain\ ^
929930
-p:IntermediateOutputPath=%PackageRoot%\toolchain\ ^
@@ -934,6 +935,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\toolchain.wixproj
934935

935936
:: Package sdk.msi
936937
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
938+
-restore ^
937939
-p:RunWixToolsOutOfProc=true ^
938940
-p:OutputPath=%PackageRoot%\sdk\ ^
939941
-p:IntermediateOutputPath=%PackageRoot%\sdk\ ^
@@ -944,6 +946,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\sdk.wixproj ^
944946

945947
:: Package runtime.msi
946948
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtime.wixproj ^
949+
-restore ^
947950
-p:RunWixToolsOutOfProc=true ^
948951
-p:OutputPath=%PackageRoot%\runtime\ ^
949952
-p:IntermediateOutputPath=%PackageRoot%\runtime\ ^
@@ -953,6 +956,7 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\runtime.wixproj ^
953956

954957
:: Package devtools.msi
955958
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\devtools.wixproj ^
959+
-restore ^
956960
-p:RunWixToolsOutOfProc=true ^
957961
-p:OutputPath=%PackageRoot%\devtools\ ^
958962
-p:IntermediateOutputPath=%PackageRoot%\devtools\ ^
@@ -968,6 +972,7 @@ move %PackageRoot%\devtools\devtools.msi %PackageRoot% || (exit /b)
968972

969973
:: Build Installer
970974
msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\installer.wixproj ^
975+
-restore ^
971976
-p:RunWixToolsOutOfProc=true ^
972977
-p:OutputPath=%PackageRoot%\installer\ ^
973978
-p:IntermediateOutputPath=%PackageRoot%\installer\ ^

0 commit comments

Comments
 (0)