diff --git a/.azure/vs2022.yml b/.azure/vs2022.yml index 8985d4d3f..1ff1764c7 100644 --- a/.azure/vs2022.yml +++ b/.azure/vs2022.yml @@ -1555,7 +1555,7 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: -p:RunWixToolsOutOfProc=true @@ -1622,6 +1622,7 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true + restoreNugetPackages: true msbuildArguments: -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) @@ -1638,6 +1639,7 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true + restoreNugetPackages: true msbuildArguments: -p:RunWixToolsOutOfProc=true -p:ProductArchitecture=$(arch) @@ -1697,7 +1699,7 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: -p:RunWixToolsOutOfProc=true @@ -1769,7 +1771,7 @@ stages: platform: $(platform) configuration: Release maximumCpuCount: true - restoreNugetPackages: false + restoreNugetPackages: true createLogFile: true msbuildArguments: -p:RunWixToolsOutOfProc=true 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\ ` 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)" }