Merge branch 'main' into cinnamon/advanced-settings

Author: alvinashcraft

hub/apps/develop/actions/action-json.md

@@ -35,23 +35,21 @@ This article describes the format of the action definition JSON file format for
       "inputCombinations": [ 
         { 
           "inputs": ["UserFriendlyName"], 
-          "description": "Greet ${UserFriendlyName.Text}" 
+          "description": "Greet ${UserFriendlyName.Text}",
+          "where": [ 
+            "${UserFriendlyName.Length} > 3" 
+          ] 
         }, 
         { 
           "inputs": ["UserFriendlyName", "PetName"], 
-          "description": "Greet ${UserFriendlyName.Text} and their pet ${PetName.Text}" 
+          "description": "Greet ${UserFriendlyName.Text} and their pet ${PetName.Text}"
         } 
       ], 
       "contentAgeRating": "child",  
       "invocation": 
       {
-        { 
           "type": "Uri", 
           "uri": "contoso://greetUser?userName=${UserFriendlyName.Text}&petName=${PetName.Text}", 
-        }, 
-        "where": [ 
-          "${UserFriendlyName.Length > 3}" 
-        ] 
       } 
     }, 
     { 

hub/docfx.json

@@ -42,16 +42,6 @@
         }        	  
       },
     "fileMetadata": {
-      "uhfHeaderId": {
-        "android/**": "MSDocsHeader-Windows-DevTools",
-        "dev-drive/**": "MSDocsHeader-Windows-DevTools",
-        "dev-environment/**": "MSDocsHeader-Windows-DevTools",
-        "dev-home/**": "MSDocsHeader-Windows-DevTools",
-        "package-manager/**": "MSDocsHeader-Windows-DevTools",
-        "powertoys/**": "MSDocsHeader-Windows-DevTools",
-        "python/**": "MSDocsHeader-Windows-DevTools",
-        "sudo/**": "MSDocsHeader-Windows-DevTools"
-      },
       "ms.subservice": {
         "apps/design/**": "design",
         "apps/**": "apps",
@@ -139,6 +129,16 @@
         "sudo/**": "https://github.com/microsoft/sudo",
         "web/**": "https://github.com/microsoft/Windows-Dev-Performance/issues"
       },
+      "uhfHeaderId": {
+        "android/**": "MSDocsHeader-Windows-DevTools",
+        "dev-drive/**": "MSDocsHeader-Windows-DevTools",
+        "dev-environment/**": "MSDocsHeader-Windows-DevTools",
+        "dev-home/**": "MSDocsHeader-Windows-DevTools",
+        "package-manager/**": "MSDocsHeader-Windows-DevTools",
+        "powertoys/**": "MSDocsHeader-Windows-DevTools",
+        "python/**": "MSDocsHeader-Windows-DevTools",
+        "sudo/**": "MSDocsHeader-Windows-DevTools"
+      },
       "author":
       {
         "android/**": "mattwojo",