Add -restore to msbuild invocations for WiX v4 compatibility (#487)

* Add -restore to msbuild invocations for WiX v4 compatibility
* Also add -restore to build script
* Switch to "restoreNugetPackages: true"

Author: tristanlabelle

.azure/vs2022.yml

@@ -1572,7 +1572,7 @@ stages:
               platform: $(platform)
               configuration: Release
               maximumCpuCount: true
-              restoreNugetPackages: false
+              restoreNugetPackages: true
               createLogFile: true
               msbuildArguments:
                 -p:RunWixToolsOutOfProc=true
@@ -1639,6 +1639,7 @@ stages:
               platform: $(platform)
               configuration: Release
               maximumCpuCount: true
+              restoreNugetPackages: true
               msbuildArguments:
                 -p:RunWixToolsOutOfProc=true
                 -p:ProductArchitecture=$(arch)
@@ -1655,6 +1656,7 @@ stages:
               platform: $(platform)
               configuration: Release
               maximumCpuCount: true
+              restoreNugetPackages: true
               msbuildArguments:
                 -p:RunWixToolsOutOfProc=true
                 -p:ProductArchitecture=$(arch)
@@ -1714,7 +1716,7 @@ stages:
               platform: $(platform)
               configuration: Release
               maximumCpuCount: true
-              restoreNugetPackages: false
+              restoreNugetPackages: true
               createLogFile: true
               msbuildArguments:
                 -p:RunWixToolsOutOfProc=true
@@ -1786,7 +1788,7 @@ stages:
               platform: $(platform)
               configuration: Release
               maximumCpuCount: true
-              restoreNugetPackages: false
+              restoreNugetPackages: true
               createLogFile: true
               msbuildArguments:
                 -p:RunWixToolsOutOfProc=true

.github/workflows/swift-toolchain.yml

@@ -1633,7 +1633,7 @@ jobs:
 
       - name: Package
         run: |
-          msbuild -nologo `
+          msbuild -nologo -restore `
               -p:Configuration=Release `
               -p:RunWixToolsOutOfProc=true `
               -p:OutputPath=${{ github.workspace }}\BinaryCache\toolchain\ `
@@ -1700,7 +1700,7 @@ jobs:
 
       - name: Package Runtime
         run: |
-          msbuild -nologo `
+          msbuild -nologo -restore `
               -p:Configuration=Release `
               -p:RunWixToolsOutOfProc=true `
               -p:OutputPath=${{ github.workspace }}\BinaryCache\runtime\ `
@@ -1757,7 +1757,7 @@ jobs:
 
       - name: Package
         run: |
-          msbuild -nologo `
+          msbuild -nologo -restore `
               -p:Configuration=Release `
               -p:RunWixToolsOutOfProc=true `
               -p:OutputPath=${{ github.workspace }}\BinaryCache\devtools\ `
@@ -1821,7 +1821,7 @@ jobs:
 
       - name: Package
         run: |
-          msbuild -nologo `
+          msbuild -nologo -restore `
               -p:Configuration=Release `
               -p:RunWixToolsOutOfProc=true `
               -p:OutputPath=${{ github.workspace }}\BinaryCache\installer\ `

build.ps1

@@ -377,6 +377,7 @@ function Build-WiXProject()
 
   $MSBuildArgs = @("$SourceCache\swift-installer-scripts\platforms\Windows\$FileName")
   $MSBuildArgs += "-noLogo"
+  $MSBuildArgs += "-restore"
   foreach ($Property in $Properties.GetEnumerator()) {
     $MSBuildArgs += "-p:$($Property.Key)=$($Property.Value)"
   }