Merge branch 'main' into windows-cli-test

Author: jthysell

.ado/jobs/cli-init-windows.yml

@@ -331,4 +331,4 @@ jobs:
                   useChakra: ${{ coalesce(matrix.useChakra, false) }}
                   useNuGet: ${{ coalesce(matrix.useNuGet, false) }}
                   useExperimentalWinUI3: ${{ coalesce(matrix.useExperimentalWinUI3, false) }}
-                  publishNuGet:  ${{ coalesce(matrix.publishNuGet, false) }}
+                  publishNuGet: ${{ coalesce(matrix.publishNuGet, false) }}

.ado/jobs/desktop.yml

@@ -169,7 +169,7 @@ jobs:
                 displayName: Update Desktop.IntegrationTests.Filter to exclude RNTester integration tests
 
             - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
-              - template:  ../templates/enable-experimental-winui3.yml
+              - template: ../templates/enable-experimental-winui3.yml
                 parameters:
                   workingDir: vnext
 

.ado/jobs/integration-test.yml

@@ -101,7 +101,7 @@ jobs:
                   buildPlatform: ${{ matrix.BuildPlatform }}
                   buildLogDirectory: $(BuildLogDirectory)
                   workingDirectory: packages/integration-test-app
-                  moreMSBuildProps: --no-packager --no-deploy --no-autolink
+                  moreRunWindowsArgs: --no-packager --no-deploy --no-autolink
                   errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
 
               - powershell: Start-Process npm.cmd -ArgumentList "run","start"
@@ -145,7 +145,7 @@ jobs:
                   buildPlatform: ${{ matrix.BuildPlatform }}
                   buildLogDirectory: $(BuildLogDirectory)
                   workingDirectory: packages/integration-test-app
-                  moreMSBuildProps: ${{ matrix.DeployOptions }} --no-packager --no-autolink
+                  moreRunWindowsArgs: ${{ matrix.DeployOptions }} --no-packager --no-autolink
                   errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
 
               - script: yarn windows --release --no-build ${{ matrix.DeployOptions }} --no-packager --no-autolink --arch ${{ matrix.BuildPlatform }} --logging

.ado/jobs/playground.yml

@@ -126,7 +126,7 @@ jobs:
                   certificatePassword: ${{ parameters.certificatePassword }}
 
             - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
-              - template:  ../templates/enable-experimental-winui3.yml
+              - template: ../templates/enable-experimental-winui3.yml
                 parameters:
                   workingDir: packages\playground\windows
 

.ado/jobs/sample-apps.yml

@@ -80,7 +80,7 @@ jobs:
                 buildEnvironment: ${{ parameters.BuildEnvironment }}
                 buildConfiguration: ${{ matrix.BuildConfiguration }}
                 buildPlatform: ${{ matrix.BuildPlatform }}
-                deployOption:  ${{ matrix.DeployOption }}
+                moreRunWindowsArgs: ${{ matrix.DeployOption }}
                 buildLogDirectory: ${{ variables['BuildLogDirectory'] }}
                 workingDirectory: packages/sample-apps
                 errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
@@ -123,7 +123,7 @@ jobs:
                 buildEnvironment: ${{ parameters.BuildEnvironment }}
                 buildConfiguration: ${{ matrix.BuildConfiguration }}
                 buildPlatform: ${{ matrix.BuildPlatform }}
-                deployOption:  ${{ matrix.DeployOption }}
+                moreRunWindowsArgs: ${{ matrix.DeployOption }}
                 buildLogDirectory: ${{ variables['BuildLogDirectory'] }}
                 workingDirectory: packages/sample-app-fabric
 

.ado/jobs/universal.yml

@@ -151,7 +151,7 @@
                 - template: ../templates/apply-published-version-vars.yml
 
                 - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
-                  - template:  ../templates/enable-experimental-winui3.yml
+                  - template: ../templates/enable-experimental-winui3.yml
                     parameters:
                       workingDir: vnext
 

.ado/templates/enable-experimental-winui3.yml

@@ -6,7 +6,7 @@ parameters:
   default: false # If WinUI3ExperimentalVersion in WinUI.props is only available on the ProjectReuinion feed, set to true, else if is on nuget.org, set to false
 
 steps:
-  - template:  ../templates/set-experimental-feature.yml
+  - template: ../templates/set-experimental-feature.yml
     parameters:
       workingDir: ${{ parameters.workingDir }}
       feature: UseExperimentalWinUI3

.ado/templates/enable-fabric-experimental-feature.yml

@@ -1,15 +1,15 @@
 steps:
-  - template:  ../templates/set-experimental-feature.yml
+  - template: ../templates/set-experimental-feature.yml
     parameters:
       workingDir: vnext
       feature: RnwNewArch
       value: true
-  - template:  ../templates/set-experimental-feature.yml
+  - template: ../templates/set-experimental-feature.yml
     parameters:
       workingDir: vnext
       feature: UseFabric
       value: true
-  - template:  ../templates/set-experimental-feature.yml
+  - template: ../templates/set-experimental-feature.yml
     parameters:
       workingDir: vnext
       feature: UseWinUI3

.ado/templates/react-native-init-windows.yml

@@ -88,7 +88,7 @@ steps:
         YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
   - ${{ if eq(parameters.UseChakra, true) }}:
-    - template:  set-experimental-feature.yml
+    - template: set-experimental-feature.yml
       parameters:
         ${{ if endsWith(parameters.template, '-lib') }}:
           workingDir: $(Agent.BuildDirectory)\testcli\example\windows
@@ -98,7 +98,7 @@ steps:
         value: false
 
   - ${{ if eq(parameters.useExperimentalWinUI3, true) }}:
-    - template:  ../templates/enable-experimental-winui3.yml
+    - template: ../templates/enable-experimental-winui3.yml
       parameters:
         ${{ if endsWith(parameters.template, '-lib') }}:
           workingDir: $(Agent.BuildDirectory)\testcli\example\windows
@@ -146,7 +146,7 @@ steps:
       buildEnvironment: ${{ parameters.BuildEnvironment }}
       buildConfiguration: ${{ parameters.configuration }}
       buildPlatform: ${{ parameters.platform }}
-      deployOption: ${{ parameters.additionalRunArguments }}
+      moreRunWindowsArgs: ${{ parameters.additionalRunArguments }}
       buildLogDirectory: $(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs
       ${{ if endsWith(parameters.template, '-lib') }}:
         workingDirectory: $(Agent.BuildDirectory)\testcli\example

.ado/templates/run-windows-with-certificates.yml

@@ -13,7 +13,7 @@ parameters:
       - Release
   - name: buildPlatform
     type: string
-  - name: deployOption
+  - name: moreRunWindowsArgs
     type: string
     default: ''
   - name: buildLogDirectory
@@ -45,7 +45,7 @@ steps:
         --logging
         --buildLogDirectory ${{ parameters.buildLogDirectory }}
         --msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}${{ parameters.moreMSBuildProps }}
-        ${{ parameters.deployOption }}
+        ${{ parameters.moreRunWindowsArgs }}
       displayName: run-windows (Debug)
       workingDirectory: ${{ parameters.workingDirectory }}
 
@@ -58,7 +58,7 @@ steps:
         --logging
         --buildLogDirectory ${{ parameters.buildLogDirectory }}
         --msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}${{ parameters.moreMSBuildProps }}
-        ${{ parameters.deployOption }}
+        ${{ parameters.moreRunWindowsArgs }}
       displayName: run-windows (Release) - PR
       workingDirectory: ${{ parameters.workingDirectory }}
 
@@ -75,7 +75,7 @@ steps:
         --logging
         --buildLogDirectory ${{ parameters.buildLogDirectory }}
         --msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }},PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx,PackageCertificatePassword=${{ parameters.certificatePassword }}${{ parameters.moreMSBuildProps }}
-        ${{ parameters.deployOption }}
+        ${{ parameters.moreRunWindowsArgs }}
       displayName: run-windows (Release) - CI
       workingDirectory: ${{ parameters.workingDirectory }}