Merge pull request swiftlang#69969 from tristanlabelle/build.ps1-build-installer-as-bundle

compnerd · web-flow · commit 10aa58f3cd89 · 2023-11-27T08:10:11.000-08:00
build.ps1: Build installer wixproj as bundle
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1594,7 +1594,7 @@ function Build-Installer($Arch) {
     $Properties["SDK_ROOT_$($SDK.VSName.ToUpperInvariant())"] = "$($SDK.SDKInstallRoot)\"
   }
 
-  Build-WiXProject bundle\installer.wixproj -Arch $Arch -Properties $Properties
+  Build-WiXProject bundle\installer.wixproj -Arch $Arch -Bundle -Properties $Properties
 }
 
 function Stage-BuildArtifacts($Arch) {

Original file line number	Diff line number	Diff line change
`@@ -1594,7 +1594,7 @@ function Build-Installer($Arch) {`
`1594`	`1594`	`$Properties["SDK_ROOT_$($SDK.VSName.ToUpperInvariant())"] = "$($SDK.SDKInstallRoot)\"`
`1595`	`1595`	`}`
`1596`	`1596`
`1597`		`- Build-WiXProject bundle\installer.wixproj -Arch $Arch -Properties $Properties`
	`1597`	`+ Build-WiXProject bundle\installer.wixproj -Arch $Arch -Bundle -Properties $Properties`
`1598`	`1598`	`}`
`1599`	`1599`
`1600`	`1600`	`function Stage-BuildArtifacts($Arch) {`