CmdPal: hotfix loading packaged apps

Regressed in #39678

This block of code just moved up too far. It needs to be after the first
attempt to load the resource.

closes: did we even file it yet

.pipelines/v2/ci-test-with-canary-webview2.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -36,8 +36,7 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWebView2: ${{ parameters.useLatestWebView2 }}

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -42,8 +42,7 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -46,7 +46,6 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}

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

@@ -3,6 +3,9 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
 
 parameters:
   - name: buildPlatforms

.pipelines/v2/templates/pipeline-ui-tests-automation.yml

@@ -3,6 +3,9 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
 
 parameters:
   - name: buildPlatforms

packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.318-preview" />
-  <package id="Microsoft.MSBuildCache.Local" version="0.1.318-preview" />
-  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.318-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.283-preview" />
 </packages>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs

@@ -6,8 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Xml;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Commands;
@@ -15,7 +13,6 @@ using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Win32;
-using Windows.Win32.Foundation;
 using Windows.Win32.Storage.Packaging.Appx;
 using PackageVersion = Microsoft.CmdPal.Ext.Apps.Programs.UWP.PackageVersion;
 using Theme = Microsoft.CmdPal.Ext.Apps.Utils.Theme;
@@ -74,7 +71,7 @@ public class UWPApplication : IProgram
 
     public List<CommandContextItem> GetCommands()
     {
-        List<CommandContextItem> commands = new List<CommandContextItem>();
+        List<CommandContextItem> commands = [];
 
         if (CanRunElevated)
         {
@@ -226,6 +223,16 @@ public class UWPApplication : IProgram
                 parsedFallback = prefix + "///" + key;
             }
 
+            Span<char> outBuffer = stackalloc char[1024];
+            var source = $"@{{{packageFullName}? {parsed}}}";
+
+            var loaded = TryLoadIndirectString(source, outBuffer, resourceReference);
+
+            if (!string.IsNullOrEmpty(loaded))
+            {
+                return loaded;
+            }
+
             if (string.IsNullOrEmpty(parsedFallback))
             {
                 // https://github.com/Wox-launcher/Wox/issues/964
@@ -237,16 +244,6 @@ public class UWPApplication : IProgram
                 return string.Empty;
             }
 
-            Span<char> outBuffer = stackalloc char[1024];
-            var source = $"@{{{packageFullName}? {parsed}}}";
-
-            var loaded = TryLoadIndirectString(source, outBuffer, resourceReference);
-
-            if (!string.IsNullOrEmpty(loaded))
-            {
-                return loaded;
-            }
-
             var sourceFallback = $"@{{{packageFullName}?{parsedFallback}}}";
             return TryLoadIndirectString(sourceFallback, outBuffer, $"{resourceReference} (fallback)");
         }