From 04ba7264033e083aa626842c0086baef3eba7e0e Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Thu, 23 Mar 2023 09:07:30 -0400 Subject: [PATCH 1/3] Add -restore to msbuild invocations for WiX v4 compatibility --- .azure/vs2022.yml | 5 +++++ .github/workflows/swift-toolchain.yml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.azure/vs2022.yml b/.azure/vs2022.yml index 8985d4d3f..9b52f15bd 100644 --- a/.azure/vs2022.yml +++ b/.azure/vs2022.yml @@ -1558,6 +1558,7 @@ stages: restoreNugetPackages: false createLogFile: true msbuildArguments: + -restore -p:RunWixToolsOutOfProc=true -p:CERTIFICATE=$(certificate.secureFilePath) -p:PASSPHRASE=$(CERTIFICATE_PASSWORD) @@ -1623,6 +1624,7 @@ stages: configuration: Release maximumCpuCount: true msbuildArguments: + -restore -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) -p:CERTIFICATE=$(certificate.secureFilePath) @@ -1639,6 +1641,7 @@ stages: configuration: Release maximumCpuCount: true msbuildArguments: + -restore -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) -p:CERTIFICATE=$(certificate.secureFilePath) @@ -1700,6 +1703,7 @@ stages: restoreNugetPackages: false createLogFile: true msbuildArguments: + -restore -p:RunWixToolsOutOfProc=true -p:CERTIFICATE=$(certificate.secureFilePath) -p:PASSPHRASE=$(CERTIFICATE_PASSWORD) @@ -1772,6 +1776,7 @@ stages: restoreNugetPackages: false createLogFile: true msbuildArguments: + -restore -p:RunWixToolsOutOfProc=true -p:RequiredChain=runtime.msi%3Btoolchain.msi%3Bdevtools.msi%3Bsdk.msi -p:CERTIFICATE=$(certificate.secureFilePath) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 1d009c14b..af1a29921 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -1616,7 +1616,7 @@ jobs: - name: Package run: | - msbuild -nologo ` + msbuild -nologo -restore ` -p:Configuration=Release ` -p:RunWixToolsOutOfProc=true ` -p:OutputPath=${{ github.workspace }}\BinaryCache\toolchain\ ` @@ -1689,7 +1689,7 @@ jobs: - name: Package Runtime run: | - msbuild -nologo ` + msbuild -nologo -restore ` -p:Configuration=Release ` -p:RunWixToolsOutOfProc=true ` -p:OutputPath=${{ github.workspace }}\BinaryCache\runtime\ ` @@ -1747,7 +1747,7 @@ jobs: - name: Package run: | - msbuild -nologo ` + msbuild -nologo -restore ` -p:Configuration=Release ` -p:RunWixToolsOutOfProc=true ` -p:OutputPath=${{ github.workspace }}\BinaryCache\devtools\ ` @@ -1811,7 +1811,7 @@ jobs: - name: Package run: | - msbuild -nologo ` + msbuild -nologo -restore ` -p:Configuration=Release ` -p:RunWixToolsOutOfProc=true ` -p:OutputPath=${{ github.workspace }}\BinaryCache\installer\ ` From 2f5a819b6c95612bfe56e1b480c55ba516667494 Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Thu, 23 Mar 2023 09:17:27 -0400 Subject: [PATCH 2/3] Also add -restore to build script --- build.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/build.ps1 b/build.ps1 index 79342ab91..444084e55 100644 --- a/build.ps1 +++ b/build.ps1 @@ -368,6 +368,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)" } From aec0199d7261496d01ec0268b1b74adc1bb6944c Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Thu, 23 Mar 2023 13:17:52 -0400 Subject: [PATCH 3/3] Switch to "restoreNugetPackages: true" --- .azure/vs2022.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.azure/vs2022.yml b/.azure/vs2022.yml index 9b52f15bd..1ff1764c7 100644 --- a/.azure/vs2022.yml +++ b/.azure/vs2022.yml @@ -1555,10 +1555,9 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: - -restore -p:RunWixToolsOutOfProc=true -p:CERTIFICATE=$(certificate.secureFilePath) -p:PASSPHRASE=$(CERTIFICATE_PASSWORD) @@ -1623,8 +1622,8 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true + restoreNugetPackages: true msbuildArguments: - -restore -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) -p:CERTIFICATE=$(certificate.secureFilePath) @@ -1640,8 +1639,8 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true + restoreNugetPackages: true msbuildArguments: - -restore -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) -p:CERTIFICATE=$(certificate.secureFilePath) @@ -1700,10 +1699,9 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: - -restore -p:RunWixToolsOutOfProc=true -p:CERTIFICATE=$(certificate.secureFilePath) -p:PASSPHRASE=$(CERTIFICATE_PASSWORD) @@ -1773,10 +1771,9 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: - -restore -p:RunWixToolsOutOfProc=true -p:RequiredChain=runtime.msi%3Btoolchain.msi%3Bdevtools.msi%3Bsdk.msi -p:CERTIFICATE=$(certificate.secureFilePath)