Merge branch 'main' into user/sharath2727/syntaxtoken

.ado/config/CredScanSuppressions.json

@@ -5,9 +5,13 @@
             "file": "\\node_modules\\react-native\\template\\android\\app\\debug.keystore",
             "_justification": "Debug secret created and consumed by third-party library"
         },
+        {
+            "file": "\\node_modules\\@react-native-community\\template\\template\\android\\app\\debug.keystore",
+            "_justification": "Debug secret created and consumed by third-party library"
+        },
         {
             "file": "\\node_modules\\resolve\\test\\resolver\\malformed_package_json\\package.json",
             "_justification": "Explicitly malformed test file"
         }
     ]
-}
+}

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

@@ -43,6 +43,64 @@ parameters:
             configuration: Release
             platform: ARM64
             additionalRunArguments: --no-deploy
+          - Name: PaperX64ReleaseCpp
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x64
+            runWack: true
+          - Name: PaperX64ReleaseCs
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: x64
+            runWack: true
+          - Name: PaperX86DebugCpp
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: x86
+            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
+          - Name: PaperX86DebugCs
+            template: old/uwp-cs-app
+            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
+            platform: x86
+            useChakra: true
+          - Name: PaperX64ReleaseCsChakra
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: x64
+            useChakra: true
+            runWack: true
+          - Name: PaperArm64ReleaseCsChakra
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: ARM64
+            useChakra: true
+            additionalRunArguments: --no-deploy
+          - Name: PaperX64ReleaseCppChakra
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x64
+            useChakra: true
+            runWack: true
+          - Name: PaperX64DebugCppLowResource
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: x64
+            lowResource: true
       - BuildEnvironment: SecurePullRequest
         Matrix:
           - Name: FabricX64Release
@@ -111,6 +169,107 @@ parameters:
             configuration: Release
             platform: ARM64
             additionalRunArguments: --no-deploy
+          - Name: PaperX64ReleaseCpp
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x64
+            runWack: true
+          - Name: PaperX64ReleaseCs
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: x64
+            runWack: true
+          - Name: PaperX86DebugCpp
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: x86
+            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
+          - Name: PaperX86DebugCs
+            template: old/uwp-cs-app
+            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
+            platform: x86
+            useChakra: true
+          - Name: PaperX64ReleaseCsChakra
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: x64
+            useChakra: true
+            runWack: true
+          - Name: PaperArm64ReleaseCsChakra
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: ARM64
+            useChakra: true
+            additionalRunArguments: --no-deploy
+          - Name: PaperX64ReleaseCppChakra
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x64
+            useChakra: true
+            runWack: true
+          - Name: PaperArm64DebugCpp
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: ARM64
+            additionalRunArguments: --no-deploy # We don't have Arm agents
+          - Name: PaperArm64DebugCs
+            template: old/uwp-cs-app
+            configuration: Debug
+            platform: ARM64
+            additionalRunArguments: --no-deploy # We don't have Arm agents
+          - Name: PaperArm64ReleaseCpp
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: ARM64
+            additionalRunArguments: --no-deploy # We don't have Arm agents
+          - Name: PaperArm64ReleaseCs
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: ARM64
+            additionalRunArguments: --no-deploy # We don't have Arm agents
+          - Name: PaperX86ReleaseCpp
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x86
+            runWack: true
+          - Name: PaperX86ReleaseCs
+            template: old/uwp-cs-app
+            configuration: Release
+            platform: x86
+            runWack: true
+          - Name: PaperX64DebugCpp
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: x64
+          - Name: PaperX64DebugCs
+            template: old/uwp-cs-app
+            configuration: Debug
+            platform: x64
+          - Name: PaperX64DebugCppLowResource
+            template: old/uwp-cpp-app
+            configuration: Debug
+            platform: x64
+            lowResource: true
+          - Name: PaperX64ReleaseCppLowResource
+            template: old/uwp-cpp-app
+            configuration: Release
+            platform: x64
+            lowResource: true
 jobs:
   - ${{ each config in parameters.buildMatrix }}:
     - ${{ if eq(config.BuildEnvironment, parameters.buildEnvironment) }}:
@@ -155,3 +314,4 @@ jobs:
                   additionalRunArguments: ${{ matrix.additionalRunArguments }}
                   runWack: ${{ coalesce(matrix.runWack, false) }}
                   buildEnvironment: ${{ parameters.buildEnvironment }}
+                  useChakra: ${{ coalesce(matrix.useChakra, false) }}

.ado/jobs/cli-init.yml

@@ -1,325 +0,0 @@
-parameters:
-  - name: buildEnvironment
-    type: string
-    default: PullRequest
-    values:
-      - PullRequest
-      - SecurePullRequest
-      - Continuous
-  - name: AgentPool
-    type: object
-  - name: buildNuGetOnly
-    type: boolean
-    default: false
-  - name: buildMatrix
-    type: object
-    default:
-      - BuildEnvironment: PullRequest
-        Matrix:
-          - Name: X64ReleaseCpp
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            runWack: true
-          - Name: X64ReleaseCs
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            runWack: true
-          - Name: X86DebugCpp
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: app
-            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: X86DebugCs
-            language: cs
-            configuration: Debug
-            platform: x86
-            projectType: app
-            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: X86DebugCppLib
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: lib
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: X86DebugCsLib
-            language: cs
-            configuration: Debug
-            platform: x86
-            projectType: lib
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: X86DebugCppChakra
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: app
-            useChakra: true
-          - Name: X64ReleaseCsChakra
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            useChakra: true
-            runWack: true
-          - Name: Arm64ReleaseCsChakra
-            language: cs
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            useChakra: true
-            additionalRunArguments: --no-deploy
-          - Name: X64ReleaseCppChakra
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            useChakra: true
-            runWack: true
-          - Name: X64DebugCppNuget
-            language: cpp
-            configuration: Debug
-            platform: x64
-            projectType: app
-            useNuGet: true
-          - Name: X64ReleaseCsNuget
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            useNuGet: true
-          - Name: X64DebugCppLowResource
-            language: cpp
-            configuration: Debug
-            platform: x64
-            projectType: app
-            lowResource: true
-      - BuildEnvironment: Continuous
-        Matrix:
-          - Name: X64ReleaseCpp
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            runWack: true
-          - Name: X64ReleaseCs
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            runWack: true
-          - Name: X86DebugCpp
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: app
-            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: X86DebugCs
-            language: cs
-            configuration: Debug
-            platform: x86
-            projectType: app
-            additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
-          - Name: X86DebugCppLib
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: lib
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: X86DebugCsLib
-            language: cs
-            configuration: Debug
-            platform: x86
-            projectType: lib
-            additionalRunArguments: --no-autolink --no-deploy
-          - Name: X86DebugCppChakra
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: app
-            useChakra: true
-          - Name: X64ReleaseCsChakra
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            useChakra: true
-            runWack: true
-          - Name: Arm64ReleaseCsChakra
-            language: cs
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            useChakra: true
-            additionalRunArguments: --no-deploy
-          - Name: X64ReleaseCppChakra
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            useChakra: true
-            runWack: true
-          - Name: X86DebugCppNuget
-            language: cpp
-            configuration: Debug
-            platform: x86
-            projectType: app
-            useNuGet: true
-          - Name: X86DebugCsNuget
-            language: cs
-            configuration: Debug
-            platform: x86
-            projectType: app
-            useNuGet: true
-          - Name: X86ReleaseCppNuget
-            language: cpp
-            configuration: Release
-            platform: x86
-            projectType: app
-            useNuGet: true
-          - Name: X86ReleaseCsNuget
-            language: cs
-            configuration: Release
-            platform: x86
-            projectType: app
-            useNuGet: true
-          - Name: X64ReleaseCppNuget
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            useNuGet: true
-          - Name: X64ReleaseCsNuget
-            language: cs
-            configuration: Release
-            platform: x64
-            projectType: app
-            useNuGet: true
-          - Name: Arm64ReleaseCppNuget
-            language: cpp
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy
-            useNuGet: true
-          - Name: Arm64ReleaseCsNuget
-            language: cs
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy
-            useNuGet: true
-          - Name: Arm64DebugCpp
-            language: cpp
-            configuration: Debug
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy # We don't have Arm agents
-          - Name: Arm64DebugCs
-            language: cs
-            configuration: Debug
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy # We don't have Arm agents
-          - Name: Arm64ReleaseCpp
-            language: cpp
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy # We don't have Arm agents
-          - Name: Arm64ReleaseCs
-            language: cs
-            configuration: Release
-            platform: ARM64
-            projectType: app
-            additionalRunArguments: --no-deploy # We don't have Arm agents
-          - Name: X86ReleaseCpp
-            language: cpp
-            configuration: Release
-            platform: x86
-            projectType: app
-            runWack: true
-          - Name: X86ReleaseCs
-            language: cs
-            configuration: Release
-            platform: x86
-            projectType: app
-            runWack: true
-          - Name: X64DebugCpp
-            language: cpp
-            configuration: Debug
-            platform: x64
-            projectType: app
-          - Name: X64DebugCs
-            language: cs
-            configuration: Debug
-            platform: x64
-            projectType: app
-          - Name: X64DebugCppLowResource
-            language: cpp
-            configuration: Debug
-            platform: x64
-            projectType: app
-            lowResource: true
-          - Name: X64ReleaseCppLowResource
-            language: cpp
-            configuration: Release
-            platform: x64
-            projectType: app
-            lowResource: true
-
-jobs:
-  - ${{ each config in parameters.buildMatrix }}:
-    - ${{ if eq(config.BuildEnvironment, parameters.buildEnvironment) }}:
-      - ${{ each matrix in config.Matrix }}:
-        - ${{ if eq(coalesce(matrix.useNuGet, false), parameters.buildNuGetOnly) }}:
-          - job: CliInit${{ matrix.Name }}
-            displayName: Verify Cli ${{ matrix.Name }}
-
-            ${{ if eq(matrix.useNuGet, true) }}:
-              dependsOn:
-                - UniversalBuild${{ matrix.platform }}Release
-
-            variables: [template: ../variables/windows.yml]
-
-            ${{ if eq(matrix.lowResource, true) }}:
-              pool: ${{ parameters.AgentPool.Small }}
-            ${{ else }}:
-              pool: ${{ parameters.AgentPool.Medium }}
-            timeoutInMinutes: 60
-            cancelTimeoutInMinutes: 5
-
-            steps:
-              - template: ../templates/checkout-full.yml
-                parameters:
-                  persistCredentials: false # We don't need git creds in this job
-
-              - template: ../templates/prepare-js-env.yml
-
-              - template: ../templates/prepare-build-env.yml
-                parameters:
-                  platform: ${{ parameters.platform }}
-                  configuration: ${{ parameters.configuration }}
-                  buildEnvironment: ${{ parameters.buildEnvironment }}
-
-              - task: CmdLine@2
-                displayName: Create npm directory
-                name: createNpmDirectory
-                inputs:
-                  script: mkdir %APPDATA%\npm
-                  
-              - template: ../templates/react-native-init.yml
-                parameters:
-                  language: ${{ matrix.language }}
-                  configuration: ${{ matrix.configuration }}
-                  platform: ${{ matrix.platform }}
-                  projectType: ${{ matrix.projectType }}
-                  additionalInitArguments: ${{ matrix.additionalInitArguments }}
-                  additionalRunArguments: ${{ matrix.additionalRunArguments }}
-                  runWack: ${{ coalesce(matrix.runWack, false) }}
-                  buildEnvironment: ${{ parameters.buildEnvironment }}
-                  useChakra: ${{ coalesce(matrix.useChakra, false) }} 
-                  useNuGet: ${{ coalesce(matrix.useNuGet, false) }}

.ado/stages.yml

@@ -35,13 +35,6 @@ stages:
           buildEnvironment: ${{ parameters.buildEnvironment }}
           AgentPool: ${{ parameters.AgentPool }}
 
-      # NuGet using tests rely on "UniversalBuild" which is done in the build stage
-      - template: jobs/cli-init.yml
-        parameters:
-          buildEnvironment: ${{ parameters.buildEnvironment }}
-          AgentPool: ${{ parameters.AgentPool }}
-          buildNuGetOnly: true
-
   - stage: IntegrationTests
     displayName: Tests 🧪
     dependsOn: Setup
@@ -82,12 +75,6 @@ stages:
     displayName: Cli 🖥
     dependsOn: Setup
     jobs:
-      - template: jobs/cli-init.yml
-        parameters:
-          buildEnvironment: ${{ parameters.buildEnvironment }}
-          AgentPool: ${{ parameters.AgentPool }}
-          buildNuGetOnly: false
-      
       - template: jobs/cli-init-windows.yml
         parameters:
           buildEnvironment: ${{ parameters.buildEnvironment }}

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

@@ -19,6 +19,9 @@ parameters:
   - name: additionalInitArguments
     type: string
     default: ''
+  - name: useChakra
+    type: boolean
+    default: false
   - name: runWack
     type: boolean
     default: false
@@ -39,22 +42,38 @@ steps:
       buildEnvironment: ${{ parameters.buildEnvironment }}
 
   - ${{ if endsWith(parameters.template, '-app') }}:
-    - script: |
-        # Change version of @react-native-community/template from 'next' to 'reactNativeDevDependency' - Windows #13446
-        npx --yes react-native@$(reactNativeDevDependency) init testcli --template @react-native-community/template@next
-      displayName: Init new app project with react-native init
+    - script: | # Change version of @react-native-community/template from 'next' to '$(reactNativeDevDependency)' and remove upgrade command - Windows #13446
+        npx --yes @react-native-community/cli@next init testcli --template @react-native-community/template@next
+        cd testcli && call yarn upgrade react-native@$(reactNativeDevDependency)
+      displayName: Init new app project with @react-native-community/cli init
       workingDirectory: $(Agent.BuildDirectory)
 
-  - ${{ if endsWith(parameters.template, '-lib') }}:
-    - script: |
-        # Change version of react-native from 'next' to 'reactNativeDevDependency' - Windows #13446
+  - ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
+    - script: | # Change version of react-native from 'next' to '$(reactNativeDevDependency)' and remove upgrade commands - Windows #13446
         npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages java-objc --type module-new --react-native-version next --example vanilla testcli
+        cd testcli && call yarn upgrade react-native@$(reactNativeDevDependency) --dev
+        cd example && call yarn upgrade react-native@$(reactNativeDevDependency)
       displayName: Init new lib project with create-react-native-library
       workingDirectory: $(Agent.BuildDirectory)
+  - ${{ elseif and(endsWith(parameters.template, '-lib'), startsWith(parameters.template, 'old')) }}:
+    - script: |
+        npx --yes create-react-native-module@0.20.2 --package-name "testcli" testcli
+      displayName: Init new lib project with create-react-native-module
+      workingDirectory: $(Agent.BuildDirectory)
+
+    - script: |
+        rmdir /s /q android
+      displayName: Remove broken android folder # See issue https://github.com/microsoft/react-native-windows/issues/12209
+      workingDirectory: $(Agent.BuildDirectory)\testcli
+    
+    - script: |
+        call yarn install
+        call yarn upgrade react@$(reactDevDependency) --dev
+        call yarn upgrade react-native@$(reactNativeDevDependency) --dev
+      displayName: Update lib project react and react-native dev versions
+      workingDirectory: $(Agent.BuildDirectory)\testcli
 
   - script: |
-      # Once version of react-native is reverted from 'next' to 'reactNativeDevDependency', remove 'yarn upgrade' command - Windows #13446
-      call yarn upgrade react-native@$(reactNativeDevDependency)
       call yarn install
     displayName: pre-windows yarn install
     workingDirectory: $(Agent.BuildDirectory)\testcli
@@ -80,7 +99,6 @@ steps:
   - ${{ if endsWith(parameters.template, '-lib') }}:
     - script: |
         call yarn add react-native-windows@$(npmVersion) --dev
-        call yarn add react-native-windows@* --peer
       displayName: yarn add react-native-windows dev/peer
       workingDirectory: $(Agent.BuildDirectory)\testcli
       env:
@@ -99,17 +117,25 @@ steps:
     workingDirectory: $(Agent.BuildDirectory)\testcli
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
-  
-  - powershell: |
-      $path = (Get-ChildItem -Filter "Package.appxmanifest" -File -Recurse).FullName;
-      [xml] $manifest = Get-Content $path
-      $manifest.Package.Identity.Name = 'ReactNative.InitTest'
-      $manifest.Save("$path")
-    displayName: Set AppX package name to "ReactNative.InitTest"
-    ${{ if endsWith(parameters.template, '-app') }}:
-      workingDirectory: $(Agent.BuildDirectory)\testcli\windows
-    ${{ if endsWith(parameters.template, '-lib') }}:
-      workingDirectory: $(Agent.BuildDirectory)\testcli\example\windows
+
+  - ${{ if eq(parameters.UseChakra, true) }}:
+    - template:  set-experimental-feature.yml
+      parameters:
+        package: ..\testcli
+        feature: UseHermes
+        value: ${{ not(parameters.UseChakra) }}
+
+  - ${{ if or(endsWith(parameters.template, '-app'), and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old')))) }}:
+    - powershell: |
+        $path = (Get-ChildItem -Filter "Package.appxmanifest" -File -Recurse).FullName;
+        [xml] $manifest = Get-Content $path
+        $manifest.Package.Identity.Name = 'ReactNative.InitTest'
+        $manifest.Save("$path")
+      displayName: Set AppX package name to "ReactNative.InitTest"
+      ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
+        workingDirectory: $(Agent.BuildDirectory)\testcli\example\windows
+      ${{ else }}:
+        workingDirectory: $(Agent.BuildDirectory)\testcli\windows
 
   # End npm test server
   - template: verdaccio-stop.yml
@@ -122,10 +148,10 @@ steps:
 
   - template: react-native-debug-info.yml
     parameters:
-      ${{ if endsWith(parameters.template, '-app') }}:
-        workingDirectory: $(Agent.BuildDirectory)\testcli
-      ${{ if endsWith(parameters.template, '-lib') }}:
+      ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
         workingDirectory: $(Agent.BuildDirectory)\testcli\example
+      ${{ else }}:
+        workingDirectory: $(Agent.BuildDirectory)\testcli
 
   - template: ../templates/run-windows-with-certificates.yml
     parameters:
@@ -135,18 +161,18 @@ steps:
       buildPlatform: ${{ parameters.platform }}
       deployOption: ${{ parameters.additionalRunArguments }}
       buildLogDirectory: $(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs
-      ${{ if endsWith(parameters.template, '-app') }}:
-        workingDirectory: $(Agent.BuildDirectory)\testcli
-      ${{ if endsWith(parameters.template, '-lib') }}:
+      ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
         workingDirectory: $(Agent.BuildDirectory)\testcli\example
+      ${{ else }}:
+        workingDirectory: $(Agent.BuildDirectory)\testcli
       restoreLockedMode: false # Allow new lockfile to be created
 
   - template: upload-build-logs.yml
     parameters:
       buildLogDirectory: '$(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs'
 
-  # Only run the following on apps
-  - ${{ if endsWith(parameters.template, '-app') }}:
+  # Only run the following on fabric apps
+  - ${{ if and(endsWith(parameters.template, '-app'), not(startsWith(parameters.template, 'old'))) }}:
     - script: call yarn test:windows
       displayName: Run jest tests with react-test-renderer
       workingDirectory: $(Agent.BuildDirectory)\testcli

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

@@ -1,202 +0,0 @@
-#
-parameters:
-  - name: language
-    type: string
-    values:
-      - cpp
-      - cs
-  - name: platform
-    type: string
-    values:
-      - x86
-      - x64
-      - ARM64
-  - name: configuration
-    type: string
-    values:
-      - Debug
-      - Release
-  - name: projectType
-    type: string
-    values:
-      - app
-      - lib
-  - name: additionalRunArguments
-    type: string
-    default: ''
-  - name: useChakra
-    type: boolean
-    default: false
-  - name: useNuGet
-    type: boolean
-    default: false
-  - name: runWack
-    type: boolean
-    default: false
-  - name: additionalInitArguments
-    type: string
-    default: ''
-  - name: buildEnvironment
-    type: string
-    default: PullRequest
-    values: 
-     - PullRequest
-     - SecurePullRequest
-     - Continuous
-
-steps:
-  # Start npm test server
-  - template: verdaccio-start.yml
-
-  - template: set-version-vars.yml
-    parameters:
-      buildEnvironment: ${{ parameters.buildEnvironment }}
-
-  - ${{ if eq(parameters.useNuGet, true) }}:
-    - template: prep-and-pack-nuget.yml
-      parameters:
-        artifactName: ReactWindows
-        npmVersion: $(npmVersion)
-        packMicrosoftReactNative: true
-        ${{ if eq(parameters.language, 'cpp') }}:
-          packMicrosoftReactNativeCxx: true
-        ${{ if eq(parameters.language, 'cs') }}:
-          packMicrosoftReactNativeManaged: true
-          packMicrosoftReactNativeManagedCodeGen: true
-        slices:
-          - platform: ${{ parameters.platform }}
-            configuration: Release
-
-  - ${{ if eq(parameters.projectType, 'app') }}:
-    - script: |
-        # Change version of @react-native-community/template from next to reactNativeDevDependency - Windows #13446
-        npx --yes react-native@$(reactNativeDevDependency) init testcli --template @react-native-community/template@next
-      displayName: Init new app project
-      workingDirectory: $(Agent.BuildDirectory)
-
-    - script: |
-        call yarn install
-      displayName: pre-windows yarn install
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-      env:
-        YARN_ENABLE_IMMUTABLE_INSTALLS: false
-
-    - script: |
-        call yarn config set npmRegistryServer http://localhost:4873
-        call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
-      displayName: yarn config verdaccio
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-      env:
-        YARN_ENABLE_IMMUTABLE_INSTALLS: false
-
-  - ${{ if eq(parameters.projectType, 'lib') }}:
-    - script: |
-        npx --yes create-react-native-module@0.20.2 --package-name "testcli" testcli
-      displayName: Init new lib project
-      workingDirectory: $(Agent.BuildDirectory)
-
-    - script: |
-        rmdir /s /q android
-      displayName: Remove broken android folder # See issue https://github.com/microsoft/react-native-windows/issues/12209
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-
-    - script: |
-        call yarn install
-        call yarn upgrade react@$(reactDevDependency) --dev
-        call yarn upgrade react-native@$(reactNativeDevDependency) --dev
-      displayName: Update lib project react and react-native dev versions
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-
-  - ${{ if eq(parameters.useNuget, true) }}:
-    - script: |
-        npx --yes react-native-windows-init@latest --verbose --version $(npmVersion) --overwrite --language ${{ parameters.language }} --projectType ${{ parameters.projectType }} ${{ parameters.additionalInitArguments }} --experimentalNuGetDependency true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed
-      displayName: Apply windows template (with nuget)
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-      env:
-        npm_config_registry: http://localhost:4873
-        YARN_ENABLE_IMMUTABLE_INSTALLS: false
-
-  - ${{ if eq(parameters.useNuget, false) }}:
-    - script: |
-        npx --yes react-native-windows-init@latest --verbose --version $(npmVersion) --overwrite --language ${{ parameters.language }} --projectType ${{ parameters.projectType }} ${{ parameters.additionalInitArguments }}
-      displayName: Apply windows template (without nuget)
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-      env:
-        npm_config_registry: http://localhost:4873
-        YARN_ENABLE_IMMUTABLE_INSTALLS: false
-  
-  - script: |
-      call yarn install
-    displayName: post-windows yarn install
-    workingDirectory: $(Agent.BuildDirectory)\testcli
-    env:
-      YARN_ENABLE_IMMUTABLE_INSTALLS: false
-  
-  - template:  set-experimental-feature.yml
-    parameters:
-      package: ..\testcli
-      feature: UseHermes
-      value: ${{ not(parameters.UseChakra) }}
-
-  - ${{ if eq(parameters.projectType, 'app') }}:
-    - powershell: |
-        [xml] $manifest = Get-Content .\Package.appxmanifest
-        $manifest.Package.Identity.Name = 'ReactNative.InitTest'
-        $manifest.Save("$pwd\Package.appxmanifest")
-      displayName: Set AppX package name to "ReactNative.InitTest"
-      workingDirectory: $(Agent.BuildDirectory)\testcli\windows\testcli
-
-  # End npm test server
-  - template: verdaccio-stop.yml
-
-  - task: PowerShell@2
-    displayName: Start tracing
-    inputs:
-      targetType: filePath # filePath | inline
-      filePath: $(Build.SourcesDirectory)\vnext\Scripts\Tracing\Start-Tracing.ps1
-
-  - template: react-native-debug-info.yml
-    parameters:
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-
-  - template: ../templates/run-windows-with-certificates.yml
-    parameters:
-      buildEnvironment: ${{ parameters.BuildEnvironment }}
-      certificateName: RNWEncodedKey
-      buildConfiguration: ${{ parameters.configuration }}
-      buildPlatform: ${{ parameters.platform }}
-      deployOption: ${{ parameters.additionalRunArguments }}
-      buildLogDirectory: $(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-      restoreLockedMode: false # Allow new lockfile to be created
-
-  - template: upload-build-logs.yml
-    parameters:
-      buildLogDirectory: '$(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs'
-
-  # Only test bundling in debug since we already bundle as part of release builds
-  - ${{ if and(eq(parameters.projectType, 'app'), eq(parameters.configuration, 'Debug')) }}:
-    - script: npx react-native bundle --entry-file index.js --platform windows --bundle-output test.bundle
-      displayName: Create bundle testcli
-      workingDirectory: $(Agent.BuildDirectory)\testcli
-
-  - ${{ if eq(parameters.runWack, true) }}:
-    - template: ../templates/run-wack.yml
-      parameters:
-        packageName: ReactNative.InitTest
-        reportArtifact: 'Template App WACK Report ${{ parameters.platform }} ${{ parameters.configuration }} ($(System.JobAttempt))'
-
-  - task: PowerShell@2
-    displayName: Stop tracing
-    inputs:
-      targetType: filePath # filePath | inline
-      filePath: $(Build.SourcesDirectory)\vnext\Scripts\Tracing\Stop-Tracing.ps1
-      arguments: -NoAnalysis -outputFolder $(Build.StagingDirectory)/Tracing
-    condition: succeededOrFailed()
-
-  - task: PublishBuildArtifacts@1
-    displayName: Upload traces
-    inputs:
-      pathtoPublish: '$(Build.StagingDirectory)/Tracing'
-      artifactName: 'Traces - $(Agent.JobName)-$(System.JobAttempt)'
-    condition: succeededOrFailed()

change/react-native-windows-54bbdf30-e8d1-4b83-9d3b-3212aa156dff.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix flyout",
+  "packageName": "react-native-windows",
+  "email": "tatianakapos@microsoft.com",
+  "dependentChangeType": "patch"
+}

vnext/src-win/Libraries/Components/Flyout/Flyout.js

@@ -8,8 +8,7 @@ import type {ViewProps} from 'react-native';
 
 import FlyoutNativeComponent from './FlyoutNativeComponent';
 import * as React from 'react';
-import StyleSheet from 'react-native';
-import {findNodeHandle} from 'react-native';
+import {findNodeHandle, StyleSheet} from 'react-native';
 
 type Placement =
   | 'top'