Merge branch 'microsoft:main' into main

Author: samuelfreiberg

.ado/azure-pipelines.publish.yml

@@ -73,7 +73,7 @@ extends:
               - script: |
                   git config user.name "UI-Fabric-RN-Bot"
                   git config user.email "uifrnbot@microsoft.com"
-                  git remote set-url origin https://$(githubUser):$(githubPAT)@github.com/microsoft/ui-fabric-react-native.git
+                  git remote set-url origin https://$(githubUser):$(githubPAT)@github.com/microsoft/fluentui-react-native.git
                 displayName: Git Authentication
 
               - script: |

.ado/azure-pipelines.yml

@@ -58,11 +58,9 @@ jobs:
         workingDirectory: apps/fluent-tester
         displayName: 'yarn bundle $(platform)'
 
-      # sets-up specifics for android dependency like NDK & emulator
-      - template: templates/android-dep-setup.yml
-
       # builds a debug apk and runs E2E tests on it
-      - template: templates/e2e-testing-android.yml
+      # Disable as Android E2E tests are failing
+      # - template: templates/e2e-testing-android.yml
 
   - job: macOSPR
     displayName: macOS PR

.ado/templates/android-dep-setup.yml

@@ -1,51 +1,31 @@
 steps:
+  - task: JavaToolInstaller@0
+    inputs:
+      versionSpec: '17'
+      jdkArchitectureOption: 'x64'
+      jdkSourceOption: 'PreInstalled'
   - task: Bash@3
     displayName: 'Android Emulator Setup'
     inputs:
       targetType: 'inline'
       script: |
         #!/usr/bin/env bash
-        set -ex
+        set -eox pipefail
 
         # Install AVD files
-        echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
+        echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install 'system-images;android-30;google_apis;x86'
 
         # Create emulator
-        echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -d 34 --package 'system-images;android-27;default;x86_64'
+        echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k 'system-images;android-30;google_apis;x86' --force
 
-         # list emulator
-        echo "Available emulator"
         $ANDROID_HOME/emulator/emulator -list-avds
 
-        if false; then
-        emulator_config=~/.android/avd/android_emulator.avd/config.ini
-          # The following is to support empty OR populated config.ini files,
-          # the state of which is dependant on the version of the emulator used (which we don't control),
-          # Replace existing config (NOTE we're on macOS so sed works differently!)
-        sed -i .bak 's/hw.lcd.density=.*/hw.lcd.density=420/' "$emulator_config"
-        sed -i .bak 's/hw.lcd.height=.*/hw.lcd.height=1920/' "$emulator_config"
-        sed -i .bak 's/hw.lcd.width=.*/hw.lcd.width=1080/' "$emulator_config"
-          # Or, add new config
-        if ! grep -q "hw.lcd.density" "$emulator_config"; then
-          echo "hw.lcd.density=420" >> "$emulator_config"
-        fi
-        if ! grep -q "hw.lcd.height" "$emulator_config"; then
-          echo "hw.lcd.height=1920" >> "$emulator_config"
-        fi
-        if ! grep -q "hw.lcd.width" "$emulator_config"; then
-          echo "hw.lcd.width=1080" >> "$emulator_config"
-        fi
-        echo "Emulator settings ($emulator_config)"
-        cat "$emulator_config"
-        fi
-
         echo "Starting emulator"
 
         # Start emulator in background
-        nohup $ANDROID_HOME/emulator/emulator -avd android_emulator -no-snapshot -no-audio -gpu host -no-boot-anim -qemu -m 2048 > /dev/null 2>&1 &
+        nohup $ANDROID_HOME/emulator/emulator -avd android_emulator -no-snapshot -no-window -no-audio -no-boot-anim -accel off > /dev/null 2>&1 &
         $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
 
-        #list online device/emulator
         $ANDROID_HOME/platform-tools/adb devices
 
         echo "Emulator started"

.ado/templates/apple-tools-setup.yml

@@ -1,14 +1,13 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '18.x'
+      versionSpec: '22.x'
 
   - task: CmdLine@2
     displayName: 'brew bundle'
     inputs:
       script: |
         brew bundle --file .ado/Brewfile
-        cat .ado/Brewfile.lock.json
 
   # Cocoapods 1.15.0 doesn't work with React Native
   - task: CmdLine@2

.ado/templates/e2e-testing-android.yml

@@ -1,6 +1,9 @@
 steps:
+  # sets-up specifics for android dependency like NDK & emulator
+  - template: templates/android-dep-setup.yml
+
   # Building APK also requires bundling, this is currently already being done as part of main Android PR task.
-  - task: Gradle@2
+  - task: Gradle@3
     displayName: 'gradlew build apk'
     inputs:
       gradleWrapperFile: 'apps/fluent-tester/android/gradlew'
@@ -10,6 +13,14 @@ steps:
       jdkVersionOption: '1.17'
       workingDirectory: apps/fluent-tester/android
 
+  - task: Gradle@3
+    inputs:
+      workingDirectory: apps/fluent-tester/android
+      gradleWrapperFile: 'apps/fluent-tester/android/gradlew'
+      gradleOptions: '-Xmx3072m'
+      publishJUnitResults: false
+      tasks: 'assembleDebug'
+
   - script: |
       adb install app-debug.apk
     workingDirectory: apps/fluent-tester/android/app/build/outputs/apk/debug

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,25 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  18514:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-09-20
+        eslint:
+          lastModifiedDate: 2024-09-20
+        bandit:
+          lastModifiedDate: 2024-09-20
+        psscriptanalyzer:
+          lastModifiedDate: 2024-09-20
+        armory:
+          lastModifiedDate: 2024-09-20
+      binary:
+        credscan:
+          lastModifiedDate: 2024-09-20
+        binskim:
+          lastModifiedDate: 2024-09-20
+        prefast:
+          lastModifiedDate: 2024-09-20
+        roslyn:
+          lastModifiedDate: 2024-09-20

.node-version

@@ -1 +1 @@
-18
+22

.yarn/releases/yarn-4.1.1.cjs

@@ -2,4 +2,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs