Merge branch 'main' into dependabot/npm_and_yarn/semver-7.7.1

Author: chiaramooney

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

@@ -22,6 +22,7 @@ parameters:
             platform: x64
             additionalRunArguments: --no-autolink
             useNuGet: true
+            publishNuGet: true
           - Name: FabricX86Debug
             template: cpp-app
             configuration: Debug
@@ -72,16 +73,6 @@ parameters:
             configuration: Debug
             platform: x86
             additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: PaperLibX86DebugCpp
-            template: old/uwp-cpp-lib
-            configuration: Debug
-            platform: x86
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: PaperLibX86DebugCs
-            template: old/uwp-cpp-lib
-            configuration: Debug
-            platform: x86
-            additionalRunArguments: --no-autolink --no-deploy
           - Name: PaperX86DebugCppChakra
             template: old/uwp-cpp-app
             configuration: Debug
@@ -118,11 +109,14 @@ parameters:
             platform: x64
             additionalRunArguments: --no-autolink
             useNuGet: true
+            publishNuGet: true
+            useExperimentalWinUI3: true
           - Name: PaperX64ReleaseCpp
             template: old/uwp-cpp-app
             configuration: Release
             platform: x64
             runWack: true
+            useExperimentalWinUI3: true
       - BuildEnvironment: Continuous
         Matrix:
           - Name: FabricX64Debug
@@ -137,6 +131,7 @@ parameters:
             platform: x64
             additionalRunArguments: --no-autolink
             useNuGet: true
+            publishNuGet: true
           - Name: FabricX86Debug
             template: cpp-app
             configuration: Debug
@@ -148,6 +143,7 @@ parameters:
             configuration: Release
             platform: x86
             useNuGet: true
+            publishNuGet: true
           - Name: FabricArm64Debug
             template: cpp-app
             configuration: Debug
@@ -160,6 +156,7 @@ parameters:
             platform: ARM64
             additionalRunArguments: --no-autolink --no-deploy
             useNuGet: true
+            publishNuGet: true
           - Name: FabricLibX64Debug
             template: cpp-lib
             configuration: Debug
@@ -216,16 +213,6 @@ parameters:
             configuration: Debug
             platform: x86
             additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: PaperLibX86DebugCpp
-            template: old/uwp-cpp-lib
-            configuration: Debug
-            platform: x86
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: PaperLibX86DebugCs
-            template: old/uwp-cs-lib
-            configuration: Debug
-            platform: x86
-            additionalRunArguments: --no-autolink --no-deploy
           - Name: PaperX86DebugCppChakra
             template: old/uwp-cpp-app
             configuration: Debug
@@ -343,3 +330,5 @@ jobs:
                   buildEnvironment: ${{ parameters.buildEnvironment }}
                   useChakra: ${{ coalesce(matrix.useChakra, false) }}
                   useNuGet: ${{ coalesce(matrix.useNuGet, false) }}
+                  useExperimentalWinUI3: ${{ coalesce(matrix.useExperimentalWinUI3, false) }}
+                  publishNuGet:  ${{ coalesce(matrix.publishNuGet, false) }}

.ado/jobs/desktop.yml

@@ -35,6 +35,7 @@ parameters:
           - Name: X64Debug
             BuildConfiguration: Debug
             BuildPlatform: x64
+            UseExperimentalWinUI3: true
       - BuildEnvironment: Continuous
         Matrix:
           - Name: X64Debug
@@ -75,18 +76,34 @@ jobs:
             #12714 -  Disable for first deployment of test website.
             #         RNTesterIntegrationTests::WebSocket
             #         RNTesterIntegrationTests::WebSocketBlob
+            #         RNTesterIntegrationTests::WebSocketMultipleSend
             #14217 - Reneable RNTesterIntegrationTests
             #         RNTesterIntegrationTests::Dummy
             #         RNTesterIntegrationTests::Fetch
             #         RNTesterIntegrationTests::XHRSample
             #         RNTesterIntegrationTests::Blob
             #         RNTesterIntegrationTests::Logging
+            #      - CI agents show the following server-side errors (local runs succeed):
+            #         - [0x801901f4] Internal server error (500).
+            #         - [0x800710dd] The operation identifier is not valid.
+            #         WebSocketIntegrationTest::ConnectClose)&
+            #         WebSocketIntegrationTest::ConnectNoClose)&
+            #         WebSocketIntegrationTest::SendReceiveClose)&
+            #         WebSocketIntegrationTest::SendConsecutive)&
+            #         WebSocketIntegrationTest::SendReceiveLargeMessage)&
+            #         WebSocketIntegrationTest::SendReceiveSsl)&
             - name: Desktop.IntegrationTests.Filter
               value: >
                 (FullyQualifiedName!=RNTesterIntegrationTests::IntegrationTestHarness)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::WebSocketBlob)&
-                (FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)&
+                (FullyQualifiedName!=RNTesterIntegrationTests::WebSocketMultipleSend)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::ConnectClose)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::ConnectNoClose)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveClose)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendConsecutive)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveLargeMessage)&
+                (FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveSsl)&
                 (FullyQualifiedName!=Microsoft::React::Test::HttpOriginPolicyIntegrationTest)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::Dummy)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::Fetch)&
@@ -151,6 +168,11 @@ jobs:
                   Write-Host "##vso[task.setvariable variable=Desktop.IntegrationTests.Filter]$newValue"
                 displayName: Update Desktop.IntegrationTests.Filter to exclude RNTester integration tests
 
+            - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
+              - template:  ../templates/enable-experimental-winui3.yml
+                parameters:
+                  workingDir: vnext
+
             - template: ../templates/msbuild-sln.yml
               parameters:
                 solutionDir: vnext

.ado/jobs/e2e-test.yml

@@ -70,7 +70,7 @@ jobs:
 
             - template: ../templates/set-experimental-feature.yml
               parameters:
-                package: packages/e2e-test-app
+                workingDir: packages/e2e-test-app/windows
                 feature: UseHermes
                 ${{ if eq(matrix.UseChakra, true) }}:
                   value: false

.ado/jobs/integration-test.yml

@@ -84,7 +84,7 @@ jobs:
 
             - template: ../templates/set-experimental-feature.yml
               parameters:
-                package: packages/integration-test-app
+                workingDir: packages/integration-test-app/windows
                 feature: UseHermes
                 ${{ if eq(matrix.UseChakra, true) }}:
                   value: false

.ado/jobs/playground.yml

@@ -142,22 +142,9 @@ jobs:
                   certificatePassword: ${{ parameters.certificatePassword }}
 
             - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
-              - template:  ../templates/set-experimental-feature.yml
+              - template:  ../templates/enable-experimental-winui3.yml
                 parameters:
-                  package: packages\playground
-                  feature: UseExperimentalWinUI3
-                  value: true
-
-              - task: PowerShell@2
-                displayName: Enable the internal WinAppSDK Feed
-                inputs:
-                  targetType: filePath # filePath | inline
-                  filePath: $(Build.SourcesDirectory)\vnext\Scripts\EnableInternalWinAppSDKFeed.ps1
-
-              - task: NuGetAuthenticate@1
-                displayName: 'NuGet Authenticate Internal WinAppSDK Feed'
-                inputs:
-                  nuGetServiceConnections: 'WinAppSDK Experimental NuGet for RNW'
+                  workingDir: packages\playground\windows
 
             # NuGet ignores packages.config if it detects <PackageReference>.
             # Use restore packages.config directly to keep compabitility with ReactNativePicker.

.ado/jobs/universal.yml

@@ -56,14 +56,17 @@
               BuildConfiguration: Release
               BuildPlatform: x64
               UseFabric: false
+              UseExperimentalWinUI3: true
             - Name: X64ReleaseFabric
               BuildConfiguration: Release
               BuildPlatform: x64
               UseFabric: true
+              UseExperimentalWinUI3: true
             - Name: X86ReleaseFabric # Specifically built so binskim / tests get run on fabric
               BuildConfiguration: Release
               BuildPlatform: x86
               UseFabric: true
+              UseExperimentalWinUI3: true
         - BuildEnvironment: Continuous
           Matrix:
             - Name: X64Debug
@@ -145,14 +148,16 @@
 
                 - template: ../templates/apply-published-version-vars.yml
 
-                - ${{ if eq(matrix.UseFabric, true) }}:
-                  - template: ../templates/enable-fabric-experimental-feature.yml
+                - ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
+                  - template:  ../templates/enable-experimental-winui3.yml
+                    parameters:
+                      workingDir: vnext
 
                 - template: ../templates/msbuild-sln.yml
                   parameters:
                     solutionDir: vnext
                     ${{ if eq(matrix.UseFabric, true) }}:
-                      solutionName: Microsoft.ReactNative.CppOnly.slnf
+                      solutionName: Microsoft.ReactNative.NewArch.sln
                     ${{ else }}:
                       solutionName: Microsoft.ReactNative.sln
                     buildPlatform: ${{ matrix.BuildPlatform }}
@@ -193,6 +198,7 @@
                       Microsoft.ReactNative.Cxx.UnitTests\**
                       Microsoft.ReactNative.IntegrationTests\**
                       Microsoft.ReactNative.ComponentTests\**
+                      Microsoft.ReactNative.CsWinRT\**
                       Microsoft.ReactNative.Managed\**
                       Microsoft.ReactNative.Managed.CodeGen\**
                       Microsoft.ReactNative.Managed.CodeGen.UnitTests\**

.ado/publish.yml

@@ -195,13 +195,13 @@ extends:
 
           - template: .ado/templates/configure-git.yml@self
 
-          - script: |
-              echo "##vso[task.setvariable variable=SkipNpmPublishArgs]--no-publish"
+          - pwsh: |
+              Write-Host "##vso[task.setvariable variable=SkipNpmPublishArgs]--no-publish"
             displayName: Enable No-Publish (npm)
             condition: ${{ parameters.skipNpmPublish }}
 
-          - script: |
-              echo "##vso[task.setvariable variable=SkipGitPushPublishArgs]--no-push"
+          - pwsh: |
+              Write-Host "##vso[task.setvariable variable=SkipGitPushPublishArgs]--no-push"
             displayName: Enable No-Publish (git)
             condition: ${{ parameters.skipGitPush }}
 
@@ -316,14 +316,11 @@ extends:
 
             - template: .ado/templates/apply-published-version-vars.yml@self
 
-            - ${{ if eq(matrix.UseFabric, true) }}:
-              - template: .ado/templates/enable-fabric-experimental-feature.yml@self
-
             - template: .ado/templates/msbuild-sln.yml@self
               parameters:
                 solutionDir: vnext
                 ${{ if eq(matrix.UseFabric, true) }}:
-                  solutionName: Microsoft.ReactNative.CppOnly.slnf
+                  solutionName: Microsoft.ReactNative.NewArch.sln
                 ${{ else }}:
                   solutionName: Microsoft.ReactNative.sln
                 buildPlatform: ${{ matrix.BuildPlatform }}
@@ -349,6 +346,7 @@ extends:
                   Microsoft.ReactNative\**
                   Microsoft.ReactNative.Managed\**
                   Microsoft.ReactNative.Managed.CodeGen\**
+                  Microsoft.ReactNative.CsWinRT\**
 
             - template: .ado/templates/component-governance.yml@self
 
@@ -433,7 +431,6 @@ extends:
                 - platform: ARM64
                   configuration: Debug
 
-
           - template: .ado/templates/prep-and-pack-nuget.yml@self
             parameters:
               artifactName: Desktop

.ado/release.yml

@@ -40,6 +40,7 @@ extends:
             artifactName: 'ReactWindows-final-nuget'
             targetPath: '$(Pipeline.Workspace)/ReactWindows-final-nuget'
         steps:
+        - checkout: none
         - task: NuGetToolInstaller@1
           displayName: 'Use NuGet '
         - task: NuGetAuthenticate@1
@@ -50,7 +51,7 @@ extends:
           displayName: NuGet push (react-native)
           inputs:
             script: nuget.exe push *.nupkg -ApiKey AzureArtifacts -Source https://pkgs.dev.azure.com/ms/_packaging/react-native/nuget/v3/index.json -NonInteractive -Verbosity Detailed -SkipDuplicate -NoSymbols
-            workingDirectory: $(System.DefaultWorkingDirectory)/Publish/ReactWindows-final-nuget
+            workingDirectory: $(Pipeline.Workspace)/ReactWindows-final-nuget
     - stage: PushToPublicAdoStage
       displayName: ADO - react-native-public
       jobs:
@@ -65,6 +66,7 @@ extends:
             artifactName: 'ReactWindows-final-nuget'
             targetPath: '$(Pipeline.Workspace)/ReactWindows-final-nuget'
         steps:
+        - checkout: none
         - task: NuGetToolInstaller@1
           displayName: 'Use NuGet '
         - task: NuGetAuthenticate@1
@@ -75,15 +77,14 @@ extends:
           displayName: NuGet push (react-native-public)
           inputs:
             script: nuget.exe push *.nupkg -ApiKey AzureArtifacts -Source https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json -NonInteractive -Verbosity Detailed -SkipDuplicate -NoSymbols
-            workingDirectory: $(System.DefaultWorkingDirectory)/Publish/ReactWindows-final-nuget
+            workingDirectory: $(Pipeline.Workspace)/ReactWindows-final-nuget
     - stage: PushToNuGetStage
       displayName: nuget.org - Push nuget packages
       variables:
       - group: RNW Secrets
       jobs:
       - job: PushPackages
         displayName: Push packages
-        condition: and(succeeded(), endsWith(variables['Build.SourceBranchName'],'-stable'))
         timeoutInMinutes: 0
         templateContext:
           inputs:
@@ -92,15 +93,20 @@ extends:
             artifactName: 'ReactWindows-final-nuget'
             targetPath: '$(Pipeline.Workspace)/ReactWindows-final-nuget'
         steps:
+        - checkout: none
         - task: NuGetToolInstaller@1
           displayName: 'Use NuGet '
         - task: CmdLine@2
           displayName: NuGet SetApiKey (nuget.org)
           inputs:
             script: nuget.exe SetApiKey $(nugetorg-apiKey-push)
-            workingDirectory: $(System.DefaultWorkingDirectory)/Publish/ReactWindows-final-nuget
-        - task: CmdLine@2
+            workingDirectory: $(Pipeline.Workspace)/ReactWindows-final-nuget
+        - task: PowerShell@2
           displayName: NuGet push (nuget.org)
           inputs:
-            script: nuget.exe push .\Microsoft.ReactNative.*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbol -NonInteractive -Verbosity Detailed
-            workingDirectory: $(System.DefaultWorkingDirectory)/Publish/ReactWindows-final-nuget
+            targetType: inline
+            errorActionPreference: silentlyContinue
+            script: |
+              if (Get-ChildItem -Path .\ -Filter '*0.0.0-canary*' -ErrorAction SilentlyContinue) { Write-Output "Canary builds found, exiting."; return 0; }
+              nuget.exe push .\Microsoft.ReactNative.*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -NoSymbol -NonInteractive -Verbosity Detailed
+            workingDirectory: $(Pipeline.Workspace)/ReactWindows-final-nuget

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

@@ -0,0 +1,25 @@
+parameters:
+- name: workingDir
+  type: string
+- name: enableInternalFeed
+  type: boolean
+  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
+    parameters:
+      workingDir: ${{ parameters.workingDir }}
+      feature: UseExperimentalWinUI3
+      value: true
+
+  - ${{ if eq(parameters.enableInternalFeed, true) }}:
+    - task: PowerShell@2
+      displayName: Enable the internal WinAppSDK Feed
+      inputs:
+        targetType: filePath # filePath | inline
+        filePath: $(Build.SourcesDirectory)\vnext\Scripts\EnableInternalWinAppSDKFeed.ps1
+
+    - task: NuGetAuthenticate@1
+      displayName: 'NuGet Authenticate Internal WinAppSDK Feed'
+      inputs:
+        nuGetServiceConnections: 'WinAppSDK Experimental NuGet for RNW'