Merge branch 'main' into dev/seraphima/tests/29246-fancyzones-tests-initial-step

.pipelines/ci/caching.yml

@@ -0,0 +1,41 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - doc/*
+      - temp/*
+      - tools/*
+      - '**.md'
+
+pr:
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - '**.md'
+      - doc
+       
+#     0.0.yyMM.dd##
+#     0.0.1904.0900
+name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
+
+variables:
+  EnablePipelineCache: true
+
+jobs:
+  - template: ./templates/build-powertoys-precheck.yml
+  - template: ./templates/build-powertoys-ci.yml
+    parameters:
+      platform: x64
+      enableCaching: true
+  - template: ./templates/build-powertoys-ci.yml
+    parameters:
+      platform: arm64
+      enableCaching: true

.pipelines/ci/templates/build-powertoys-ci.yml

@@ -1,7 +1,16 @@
 parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: '/p:RestorePackagesConfig=true -m'
+  - name: configuration
+    type: string
+    default: 'Release'
+  - name: platform
+    type: string
+    default: '/p:RestorePackagesConfig=true -m'
+  - name: additionalBuildArguments
+    type: string
+    default: '/p:RestorePackagesConfig=true -m'
+  - name: enableCaching
+    type: boolean
+    default: false
 
 jobs:
 - job: Build${{ parameters.platform }}${{ parameters.configuration }}
@@ -26,6 +35,7 @@ jobs:
   - template: build-powertoys-steps.yml
     parameters:
       additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
+      enableCaching: ${{ parameters.enableCaching }}
 
   # It appears that the Component Governance build task that gets automatically injected stopped working
   # when we renamed our main branch.

.pipelines/ci/templates/build-powertoys-steps.yml

@@ -1,5 +1,10 @@
 parameters:
-  additionalBuildArguments: ''
+  - name: additionalBuildArguments
+    type: string
+    default: ''
+  - name: enableCaching
+    type: boolean
+    default: false
 
 steps:
 - checkout: self
@@ -78,6 +83,13 @@ steps:
 - task: VisualStudioTestPlatformInstaller@1
   displayName: Ensure VSTest Platform
 
+- ${{ if eq(parameters.enableCaching, true) }}:
+  - task: NuGetToolInstaller@1
+    displayName: Install NuGet
+
+  - script: nuget restore packages.config -SolutionDirectory .
+    displayName: 'nuget restore packages.config'
+
 - task: VSBuild@1
   displayName: 'Build PowerToys.sln'
   inputs:
@@ -85,8 +97,15 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
+    ${{ if eq(parameters.enableCaching, true) }}:
+      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -reportfileaccesses -p:MSBuildCacheEnabled=true -p:MSBuildCacheLogDirectory=$(Build.ArtifactStagingDirectory)\logs\MSBuildCache -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
+    ${{ else }}:
+      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
+  ${{ if eq(parameters.enableCaching, true) }}:
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)        
 
 - task: VSBuild@1
   displayName: 'Build BugReportTool.sln'
@@ -95,7 +114,8 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\BugReportTool.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -105,7 +125,8 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\WebcamReportTool.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -115,7 +136,8 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\StylesReportTool.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: PowerShell@2
@@ -131,7 +153,8 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -141,8 +164,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }}
+    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper.binlog -ds:false
     clean: false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: PowerShell@2
@@ -159,7 +183,8 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true
+    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller-PerUser.binlog -ds:false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 - task: VSBuild@1
@@ -169,8 +194,9 @@ steps:
     vsVersion: 17.0
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true
+    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper-PerUser.binlog -ds:false
     clean: false
+    msbuildArchitecture: x64
     maximumCpuCount: true
 
 # Check if deps.json files don't reference different dll versions.
@@ -268,3 +294,8 @@ steps:
     filePath: '$(build.sourcesdirectory)\.pipelines\verifyNoticeMdAgainstNugetPackages.ps1'
     arguments: -path '$(build.sourcesdirectory)\'
     pwsh: true
+
+- publish: $(Build.ArtifactStagingDirectory)\logs
+  displayName: Publish Logs
+  artifact: '$(System.JobDisplayName) logs'
+  condition: always()