Merge branch 'main' into FileOrganizer-early-proof-of-concept

.github/actions/spell-check/allow/code.txt

@@ -263,6 +263,10 @@ onefuzz
 
 # NameInCode
 leilzh
+mengyuanchen
+
+# DllName
+testhost
 
 #Tools
-OIP
+OIP

.github/actions/spell-check/expect.txt

@@ -734,6 +734,7 @@ KEYBDINPUT
 keyboardeventhandlers
 keyboardmanagercommon
 KEYBOARDMANAGEREDITOR
+KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 KEYEVENTF
@@ -1282,7 +1283,7 @@ rectp
 RECTSOURCE
 recyclebin
 Redist
-reencode
+Reencode
 reencoded
 REFCLSID
 REFGUID

.pipelines/ESRPSigning_core.json

@@ -128,6 +128,7 @@
                 "PowerToys.KeyboardManager.dll",
                 "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
                 "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+                "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
 
                 "PowerToys.Launcher.dll",
                 "PowerToys.PowerLauncher.dll",

.pipelines/v2/templates/job-build-project.yml

@@ -456,12 +456,6 @@ jobs:
       Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
     displayName: Stage GPO files
 
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(JobOutputDirectory)
-      artifact: $(JobOutputArtifactName)
-      displayName: Publish all outputs
-      condition: always()
-
   # Running the tests may result in future jobs consuming artifacts out of this build
   - ${{ if eq(parameters.runTests, true) }}:
     - task: CopyFiles@2
@@ -471,17 +465,8 @@ jobs:
         contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
         targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
 
-    - task: CopyFiles@2
-      displayName: Stage entire build output
-      inputs:
-        sourceFolder: $(JobOutputDirectory)
-        contents: |-
-          **
-          !**\*.pdb
-          !**\*.lib
-        targetFolder: '$(JobOutputDirectory)\TestArtifacts'
-
-    - publish: $(JobOutputDirectory)\TestArtifacts
-      artifact: $(JobOutputArtifactName)-TestArtifacts
-      displayName: Publish all outputs for testing
+  - ${{ if eq(parameters.publishArtifacts, true) }}:
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)
+      displayName: Publish all outputs
       condition: always()

.pipelines/v2/templates/job-test-project.yml

@@ -19,7 +19,7 @@ jobs:
     BuildPlatform: ${{ parameters.platform }}
     BuildConfiguration: ${{ parameters.configuration }}
     SrcPath: $(Build.Repository.LocalPath)
-    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}-TestArtifacts
+    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
   pool:
     ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
       ${{ if ne(parameters.platform, 'ARM64') }}:
@@ -61,13 +61,18 @@ jobs:
         reg add "HKLM\Software\Policies\Microsoft\Edge\WebView2\ReleaseChannels" /v PowerToys.exe /t REG_SZ /d "3"
       displayName: "Enable WebView2 Canary Channel"
 
-  - download: current
-    displayName: Download artifacts
-    artifact: $(TestArtifactsName)
-    patterns: |-
-      **
-      !**\*.pdb
-      !**\*.lib
+  - ${{ if ne(parameters.platform, 'arm64') }}:
+      - download: current
+        displayName: Download artifacts
+        artifact: $(TestArtifactsName)
+        patterns: |-
+          **
+          !**\*.pdb
+          !**\*.lib
+  - ${{ else }}:
+      - template: steps-download-artifacts-with-azure-cli.yml
+        parameters:
+          artifactName: $(TestArtifactsName)
 
   - template: steps-ensure-dotnet-version.yml
     parameters:

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -72,7 +72,7 @@ stages:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
 
-    - ${{ if eq(parameters.runTests, true) }}:
+    - ${{ if and(eq(parameters.runTests, true), not(and(eq(platform, 'arm64'), eq(variables['System.PullRequest.IsFork'], true)))) }}:
       - stage: Test_${{ platform }}
         displayName: Test ${{ platform }}
         dependsOn:

.pipelines/v2/templates/steps-download-artifacts-with-azure-cli.yml

@@ -0,0 +1,33 @@
+parameters:
+- name: artifactName
+  type: string
+  default: ""
+
+# Why use az cli to download? → The ARM agent may run into OutOfMemory issues.  
+# Why use the Azure CLI ZIP version? → It comes with its own Python and works fine under emulation on ARM64.
+# Why not use AzureCLI@2 task? → It requires azureSubscription, which is unnecessary for downloading artifacts.
+
+steps:
+- powershell: |
+    Write-Host "Downloading Azure CLI ZIP..."
+    $azCliUrl = "https://aka.ms/installazurecliwindowszipx64"
+    $azCliZip = "$(Build.ArtifactStagingDirectory)\azure-cli.zip"
+
+    Invoke-WebRequest -Uri $azCliUrl -OutFile $azCliZip
+  displayName: 'Install Azure CLI from ZIP'
+
+- task: ExtractFiles@1
+  inputs:
+    archiveFilePatterns: '$(Build.ArtifactStagingDirectory)\azure-cli.zip'
+    destinationFolder: '$(Build.ArtifactStagingDirectory)\AzureCLI'
+
+- pwsh: |
+    $azureCliPath = "$(Build.ArtifactStagingDirectory)\AzureCLI\bin"
+    $env:Path = "$azureCliPath;" + $env:Path
+    Write-Host "Configuring Azure DevOps defaults..."
+    az devops configure --defaults organization='$(System.TeamFoundationCollectionUri)' project='$(System.TeamProject)' --use-git-aliases true
+    Write-Host "Downloading artifacts..."
+    az pipelines runs artifact download --artifact-name ${{parameters.artifactName}} --path "$(Pipeline.Workspace)/${{parameters.artifactName}}" --run-id $(Build.BuildId) --debug
+  displayName: 'Download artifacts with Azure CLI'
+  env:
+    AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)

.pipelines/verifyDepsJsonLibraryVersions.ps1

@@ -15,8 +15,8 @@ Param(
 $referencedFileVersionsPerDll = @{}
 $totalFailures = 0
 
-Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZones*,MouseJump.Common.UnitTests*,AdvancedPaste.FuzzTests* | ForEach-Object {
-    # Temporarily exclude FancyZones UI tests because of Appium.WebDriver dependencies
+Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude *UITest*,MouseJump.Common.UnitTests*,*.FuzzTests* | ForEach-Object {
+    # Temporarily exclude All UI-Test, Fuzzer-Test projects because of Appium.WebDriver dependencies
     $depsJsonFullFileName = $_.FullName
     $depsJsonFileName = $_.Name
     $depsJson = Get-Content $depsJsonFullFileName | ConvertFrom-Json

NOTICE.md

@@ -1322,6 +1322,7 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
 - Microsoft.Data.Sqlite 9.0.2
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
+- Microsoft.DotNet.ILCompiler (A)
 - Microsoft.Extensions.DependencyInjection 9.0.2
 - Microsoft.Extensions.Hosting 9.0.2
 - Microsoft.Extensions.Hosting.WindowsServices 9.0.2