mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +01:00
build: remove SHINE pool image override (to enable Server 2022) (#43287)
I am changing the default build pool image from Windows Server 2019 to Server 2022, as the 2019 images are deprecated and their use will become a permanent error soon. However, I cannot do that while PowerToys contains build image overrides. These overrides prevent it from choosing the Server 2022 images. As a drive-by, I fixed the following issues: - `NUGET_PACKAGES` was being read from the ambient environment. It was used in the package cache _and_ in the WIX projects directly (!). To make the build more predictable, we now set it during build time. - We _still_ had build step conditions that resulted in extra work being done during build failure. - The release builds now produce numbered failure log artifacts just like the CI builds do. - I have adjusted the default disk configuration to give enough space to `C:\`, so we no longer need the work directory override or custom data disk. The screenshot below is from a test run where I overrode the pool image to be `SHINE-VS17-Latest-2022`. We do not want to do that in the final configuration, so I had to revert that change. <img width="1205" height="452" alt="image" src="https://github.com/user-attachments/assets/fcf03e8c-d2a1-47af-9240-64c183c43644" />
This commit is contained in:
committed by
Kai Tao
parent
34db3b7ea7
commit
740e68e074
@@ -52,8 +52,6 @@ extends:
|
|||||||
name: SHINE-INT-S
|
name: SHINE-INT-S
|
||||||
${{ if eq(parameters.useVSPreview, true) }}:
|
${{ if eq(parameters.useVSPreview, true) }}:
|
||||||
demands: ImageOverride -equals SHINE-VS17-Preview
|
demands: ImageOverride -equals SHINE-VS17-Preview
|
||||||
${{ else }}:
|
|
||||||
image: SHINE-VS17-Latest
|
|
||||||
os: windows
|
os: windows
|
||||||
sdl:
|
sdl:
|
||||||
tsa:
|
tsa:
|
||||||
@@ -75,7 +73,6 @@ extends:
|
|||||||
name: SHINE-INT-L
|
name: SHINE-INT-L
|
||||||
demands:
|
demands:
|
||||||
# Our INT agents have a large disk mounted at P:\
|
# Our INT agents have a large disk mounted at P:\
|
||||||
- WorkFolder -equals P:\_work
|
|
||||||
- ${{ if eq(parameters.useVSPreview, true) }}:
|
- ${{ if eq(parameters.useVSPreview, true) }}:
|
||||||
- ImageOverride -equals SHINE-VS17-Preview
|
- ImageOverride -equals SHINE-VS17-Preview
|
||||||
os: windows
|
os: windows
|
||||||
@@ -126,7 +123,6 @@ extends:
|
|||||||
parameters:
|
parameters:
|
||||||
pool:
|
pool:
|
||||||
name: SHINE-INT-L
|
name: SHINE-INT-L
|
||||||
image: SHINE-VS17-Latest
|
|
||||||
os: windows
|
os: windows
|
||||||
official: true
|
official: true
|
||||||
codeSign: true
|
codeSign: true
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ jobs:
|
|||||||
${{ else }}:
|
${{ else }}:
|
||||||
OutputBuildPlatform: ${{ platform }}
|
OutputBuildPlatform: ${{ platform }}
|
||||||
variables:
|
variables:
|
||||||
|
NUGET_PACKAGES: 'C:\NuGetPackages' # Some of our build steps cache these here... and it was apparently part of the global environment
|
||||||
MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
|
MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
|
||||||
# Azure DevOps abhors a vacuum
|
# Azure DevOps abhors a vacuum
|
||||||
# If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
|
# If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
|
||||||
@@ -139,6 +140,10 @@ jobs:
|
|||||||
- output: pipelineArtifact
|
- output: pipelineArtifact
|
||||||
artifactName: $(JobOutputArtifactName)
|
artifactName: $(JobOutputArtifactName)
|
||||||
targetPath: $(Build.ArtifactStagingDirectory)
|
targetPath: $(Build.ArtifactStagingDirectory)
|
||||||
|
- output: pipelineArtifact
|
||||||
|
artifactName: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
|
||||||
|
targetPath: $(LogOutputDirectory)
|
||||||
|
condition: or(failed(), canceled())
|
||||||
steps:
|
steps:
|
||||||
- checkout: self
|
- checkout: self
|
||||||
clean: true
|
clean: true
|
||||||
@@ -395,7 +400,7 @@ jobs:
|
|||||||
### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
|
### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
|
||||||
- task: CopyFiles@2
|
- task: CopyFiles@2
|
||||||
displayName: HACK Copy core WebView2 ARM64 dll to output directory
|
displayName: HACK Copy core WebView2 ARM64 dll to output directory
|
||||||
condition: eq(variables['BuildPlatform'],'arm64')
|
condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
|
||||||
inputs:
|
inputs:
|
||||||
contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
|
contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
|
||||||
targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
|
targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
|
||||||
@@ -434,11 +439,11 @@ jobs:
|
|||||||
inputs:
|
inputs:
|
||||||
testResultsFormat: VSTest
|
testResultsFormat: VSTest
|
||||||
testResultsFiles: '**/*.trx'
|
testResultsFiles: '**/*.trx'
|
||||||
condition: ne(variables['BuildPlatform'],'arm64')
|
condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
|
||||||
|
|
||||||
# Native dlls
|
# Native dlls
|
||||||
- task: VSTest@2
|
- task: VSTest@2
|
||||||
condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
|
condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64')) # No arm64 agents to run the tests.
|
||||||
displayName: 'Native Tests'
|
displayName: 'Native Tests'
|
||||||
inputs:
|
inputs:
|
||||||
platform: '$(BuildPlatform)'
|
platform: '$(BuildPlatform)'
|
||||||
|
|||||||
Reference in New Issue
Block a user