[CI] Refactor Apple CI (#3118)

* [CI] Update to macOS 13 / Xcode 15 * Dont pre boot simulator * yarn dedupe * (test) Determine iOS SDK version * Degrade to iOS 16.4 * Test * no boot * macos too * Back to iOS 17.0 * Update to react-native 0.71.14 * Downgrade to Xcode 14.2 * Undo yarn lock and package json changes * more downgrade * Switch back to internal * more slight changes * No android update.. again
2023-10-19 23:37:11 -07:00 · 2023-10-19 23:37:11 -07:00 · a55dd40020
--- a/.ado/azure-pipelines.publish.yml
+++ b/.ado/azure-pipelines.publish.yml
@ -28,6 +28,7 @@ variables:
  - group: InfoSec-SecurityResults
  - name: tags
    value: production,externalfacing
+  - template: variables/vars.yml

 jobs:
  - job: NPMPublish
@ -88,8 +89,7 @@ jobs:
  - job: NuGetPublish
    displayName: NuGet Publish
    pool:
-      vmImage: 'internal-macos12'
-      demands: ['xcode', 'sh', 'npm']
+      vmImage: $(VmImageApple)
    variables:
      - name: BUILDSECMON_OPT_IN
        value: true
--- a/.ado/azure-pipelines.yml
+++ b/.ado/azure-pipelines.yml
@ -2,7 +2,7 @@ pr:
  - main

 variables:
-  CI: true
+  - template: variables/vars.yml

 jobs:
  # Dedicated task to build JS code, including jest tests, snapshot testing, and linting, because these things can be super
@ -67,8 +67,7 @@ jobs:
  - job: macOSPR
    displayName: macOS PR
    pool:
-      vmImage: 'internal-macos12'
-      demands: ['xcode', 'sh', 'npm']
+      vmImage: $(VmImageApple)
    variables:
      platform: 'macos'
    timeoutInMinutes: 60 # how long to run the job before automatically cancelling
@ -78,14 +77,6 @@ jobs:
      - checkout: self
        persistCredentials: true

-      # Clean Derived Data
-      - script: |
-          rm -rf $(Build.Repository.LocalPath)/DerivedData
-        displayName: 'Clean DerivedData'
-
-      - script: |
-          sudo gem install cocoapods
-        displayName: 'Install Cocoapods Environment'
      - template: templates/setup-repo-min-build.yml

      - script: |
@ -95,6 +86,9 @@ jobs:

      # Select proper Xcode version
      - template: templates/apple-xcode-select.yml
+        parameters:
+          xcode_version: $(xcode_version)
+          xcode_path: $(xcode_path)

      - bash: |
          echo "pod install $(platform)"
@ -102,6 +96,10 @@ jobs:
        workingDirectory: apps/fluent-tester/$(platform)
        displayName: 'pod install $(platform)'

+      - script: |
+          brew install xcbeautify
+        displayName: 'Install xcbeautify'
+
      - bash: |
          echo "yarn $(platform)"
          yarn $(platform)
@ -113,8 +111,7 @@ jobs:
  - job: iOSPR
    displayName: iOS PR
    pool:
-      vmImage: 'internal-macos12'
-      demands: ['xcode', 'sh', 'npm']
+      vmImage: $(VmImageApple)
    variables:
      platform: 'ios'
    timeoutInMinutes: 60 # how long to run the job before automatically cancelling
@ -124,14 +121,6 @@ jobs:
      - checkout: self
        persistCredentials: true

-      # Clean Derived Data
-      - script: |
-          rm -rf $(Build.Repository.LocalPath)/DerivedData
-        displayName: 'Clean DerivedData'
-
-      - script: |
-          sudo gem install cocoapods
-        displayName: 'Install Cocoapods Environment'
      - template: templates/setup-repo-min-build.yml

      - script: |
@ -141,6 +130,9 @@ jobs:

      # Select proper Xcode version
      - template: templates/apple-xcode-select.yml
+        parameters:
+          xcode_version: $(xcode_version)
+          xcode_path: $(xcode_path)

      - bash: |
          echo "pod install $(platform)"
@ -148,18 +140,29 @@ jobs:
        workingDirectory: apps/fluent-tester/$(platform)
        displayName: 'pod install $(platform)'

-      - bash: |
-          echo "Pre boot simulator"
-          UDID=$(xcrun simctl create test-iphone com.apple.CoreSimulator.SimDeviceType.iPhone-14 com.apple.CoreSimulator.SimRuntime.iOS-16-2)
-          xcrun simctl boot $UDID
-        workingDirectory: apps/fluent-tester
-        displayName: 'Boot simulator'
+      - script: |
+          brew install xcbeautify
+        displayName: 'Install xcbeautify'
+
+      - script: |
+          xcrun simctl list
+        displayName: 'List Simulators'
+
+      - script: |
+          xcrun --sdk iphonesimulator --show-sdk-version
+        displayName: 'Determine iOS SDK version'
+
+      # - script: |
+      #     NEW_DEVICE=$(xcrun simctl create "Test Phone" "$(ios_simulator)" iOS$(ios_version))
+      #     echo "🤖 Created ${NEW_DEVICE}"
+      #     xcrun simctl boot ${NEW_DEVICE}
+      #   displayName: 'Boot Simulator'

      - bash: |
          echo "yarn $(platform)"
-          yarn $(platform) --simulator "iPhone 14"
+          yarn $(platform) --simulator "$(ios_simulator)"
        workingDirectory: apps/fluent-tester
-        displayName: 'yarn $(platform)x'
+        displayName: 'yarn $(platform)'

      - template: templates/e2e-testing-ios.yml

--- a/.ado/scripts/xcode_select_current_version.sh
+++ b/.ado/scripts/xcode_select_current_version.sh
@ -1,10 +0,0 @@
-# Select the current officially supported version of Xcode with the naming convention used by GitHub Actions/Azure DevOps Build Pipelines
-
-if [ -n "$XCODE_PATH_OVERRIDE" ]; then # If someone calls this with the XCODE_PATH_OVERRIDE variable set to a path to a developer dir, use it instead
-    XCODE_PATH="$XCODE_PATH_OVERRIDE"
-else
-    XCODE_PATH='/Applications/Xcode_14.2.app/Contents/Developer'
-fi
-
-echo "Running command: sudo xcode-select --switch $XCODE_PATH"
-/usr/bin/sudo /usr/bin/xcode-select --switch "$XCODE_PATH"
--- a/.ado/templates/android-dep-setup.yml
+++ b/.ado/templates/android-dep-setup.yml
@ -5,6 +5,7 @@ steps:
      targetType: 'inline'
      script: |
        #!/usr/bin/env bash
+        set -ex

        # Install AVD files
        echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
@ -20,7 +21,7 @@ steps:
        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!)
+          # 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"
--- a/.ado/templates/apple-nuget-publish.yml
+++ b/.ado/templates/apple-nuget-publish.yml
@ -4,6 +4,9 @@ parameters:
    type: boolean
    default: false

+variables:
+  - template: variables/vars.yml
+
 steps:
  - checkout: self
    persistCredentials: true
@ -21,6 +24,9 @@ steps:

  # Select proper Xcode version
  - template: apple-xcode-select.yml
+      parameters:
+        xcode_version: $(xcode_version)
+        xcode_path: $(xcode_path)

  # Pod Install iOS
  - bash: |
--- a/.ado/templates/apple-xcode-select.yml
+++ b/.ado/templates/apple-xcode-select.yml
@ -1,12 +1,13 @@
 #
 # Task Group: Xcode select proper version
 #
+
 parameters:
-  xcode_path_override: '' # Leaving this blank results in the repo default being applied
+  xcode_version: ''
+  xcode_path: ''

 steps:
-  - bash: .ado/scripts/xcode_select_current_version.sh
-    displayName: 'Switch to current version of Xcode'
+  - bash: |
+      sudo xcode-select --switch '${{ parameters.xcode_path }}'
+    displayName: Switch Xcode version ${{ parameters.xcode_version }}
    failOnStderr: true
-    env:
-      XCODE_PATH_OVERRIDE: ${{ parameters.xcode_path_override }}
--- a/.ado/variables/vars.yml
+++ b/.ado/variables/vars.yml
@ -0,0 +1,6 @@
+variables:
+  VmImageApple: internal-macos12
+  xcode_version: 'Xcode 14.2'
+  xcode_path: '/Applications/Xcode_14.2.app'
+  ios_version: '16.2.0'
+  ios_simulator: 'iPhone 14'
--- a/apps/E2E/wdio.conf.ios.js
+++ b/apps/E2E/wdio.conf.ios.js
@ -14,7 +14,7 @@ exports.config = {
    {
      maxInstances: 1, // Maximum number of total parallel running workers.
      platformName: 'iOS',
-      // Keep this in sync with the simulator we run in Azure Pipelines
+      // Keep this in sync with the simulator we run in Azure Pipelines, defined in `.ado/variables/vars.yml`
      'appium:platformVersion': '16.2',
      'appium:deviceName': 'iPhone 14',
      'appium:automationName': 'XCUITest',
@ -140,7 +140,7 @@ exports.config = {
   */
  afterTest: (test, context, results) => {
    const resultString = results.passed ? 'Passed' : 'Failed';
-    console.log(`\nTest Case: "${test.description}".\nResult: "${resultString}".\nDuration: "${(results.duration/600).toFixed(2)}s". \n`);
+    console.log(`\nTest Case: "${test.description}".\nResult: "${resultString}".\nDuration: "${(results.duration / 600).toFixed(2)}s". \n`);

    // if test passed, ignore, else take and save screenshot. Unless it's the first test that boots the app,
    // it may be useful to have a screenshot of the app on load.
--- a/apps/fluent-tester/ios/Podfile.lock
+++ b/apps/fluent-tester/ios/Podfile.lock
@ -15,7 +15,7 @@ PODS:
  - FRNAvatar (0.19.7):
    - MicrosoftFluentUI (= 0.13.1)
    - React
-  - FRNDatePicker (0.8.0):
+  - FRNDatePicker (0.9.1):
    - MicrosoftFluentUI (= 0.13.1)
    - React
  - FRNFontMetrics (0.4.1):
@ -493,13 +493,13 @@ PODS:
    - React-Core
    - React-cxxreact
    - ReactCommon/turbomodule/core
-  - ReactTestApp-DevSupport (2.5.16):
+  - ReactTestApp-DevSupport (2.5.26):
    - React-Core
    - React-jsi
  - ReactTestApp-Resources (1.0.0-dev)
-  - RNCPicker (2.5.0):
+  - RNCPicker (2.5.1):
    - React-Core
-  - RNSVG (13.13.0):
+  - RNSVG (13.14.0):
    - React-Core
  - Yoga (1.14.0)

@ -653,7 +653,7 @@ SPEC CHECKSUMS:
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
  FRNAppearanceAdditions: ae112fef1bf92d0282c66b53eac14c1de22c97d2
  FRNAvatar: 1db3235b5e4320685b7bc5e69f507632189b0f82
-  FRNDatePicker: 78b02a5ba9d7559d553b358271b1ec18ebecb1ec
+  FRNDatePicker: 9101a588417cf7351a619480f9eb7da8bfc10559
  FRNFontMetrics: 41579c8c7cef1f816a894b6d3968461ef599f5c1
  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
  MicrosoftFluentUI: dde98d8ed3fc306d9ddd0a6f0bc0c1f24fe5275e
@ -687,12 +687,12 @@ SPEC CHECKSUMS:
  React-runtimeexecutor: 35cec6420c9d4144b0d06f9fdb093cf8f02bd52c
  ReactCommon: 56296d2632e8eb53e94a2b7c0d05db694e164ca7
  ReactNativeHost: 5caf8c9381f26c453fabbe8c3b87f6a013a3c459
-  ReactTestApp-DevSupport: 444613e05eef80e5d2ecb5302e44b9a7abc597fa
+  ReactTestApp-DevSupport: 092f0caf9902efaaba73b4a20f153e64bcee6daf
  ReactTestApp-Resources: 3a5202e2bbbd3fb589d54d15f296a52a5659855f
-  RNCPicker: 32ca102146bc7d34a8b93a998d9938d9f9ec7898
-  RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82
+  RNCPicker: 529d564911e93598cc399b56cc0769ce3675f8c8
+  RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
  Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555

 PODFILE CHECKSUM: b9fd154312c68d8d92a9ba6e8a2cac9fcf88b104

-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0
--- a/apps/fluent-tester/macos/Podfile.lock
+++ b/apps/fluent-tester/macos/Podfile.lock
@ -1,27 +1,27 @@
 PODS:
  - boost (1.76.0)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.71.33)
-  - FBReactNativeSpec (0.71.33):
+  - FBLazyVector (0.71.34)
+  - FBReactNativeSpec (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.71.33)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Core (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
+    - RCTRequired (= 0.71.34)
+    - RCTTypeSafety (= 0.71.34)
+    - React-Core (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
  - fmt (6.2.1)
-  - FRNAvatar (0.19.6):
+  - FRNAvatar (0.19.7):
    - MicrosoftFluentUI (= 0.13.1)
    - React
-  - FRNCallout (0.24.13):
+  - FRNCallout (0.24.15):
    - React
-  - FRNCheckbox (0.15.9):
+  - FRNCheckbox (0.15.13):
    - React
-  - FRNMenuButton (0.11.17):
+  - FRNMenuButton (0.11.24):
    - React
-  - FRNRadioButton (0.18.9):
+  - FRNRadioButton (0.19.3):
    - React
-  - FRNVibrancyView (0.0.1):
+  - FRNVibrancyView (0.0.3):
    - React
  - glog (0.3.5)
  - MicrosoftFluentUI (0.13.1):
@ -104,28 +104,28 @@ PODS:
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
-  - RCTFocusZone (0.12.9):
+  - RCTFocusZone (0.12.10):
    - React
-  - RCTRequired (0.71.33)
-  - RCTTypeSafety (0.71.33):
-    - FBLazyVector (= 0.71.33)
-    - RCTRequired (= 0.71.33)
-    - React-Core (= 0.71.33)
-  - React (0.71.33):
-    - React-Core (= 0.71.33)
-    - React-Core/DevSupport (= 0.71.33)
-    - React-Core/RCTWebSocket (= 0.71.33)
-    - React-RCTActionSheet (= 0.71.33)
-    - React-RCTAnimation (= 0.71.33)
-    - React-RCTBlob (= 0.71.33)
-    - React-RCTImage (= 0.71.33)
-    - React-RCTLinking (= 0.71.33)
-    - React-RCTNetwork (= 0.71.33)
-    - React-RCTSettings (= 0.71.33)
-    - React-RCTText (= 0.71.33)
-    - React-RCTVibration (= 0.71.33)
-  - React-callinvoker (0.71.33)
-  - React-Codegen (0.71.33):
+  - RCTRequired (0.71.34)
+  - RCTTypeSafety (0.71.34):
+    - FBLazyVector (= 0.71.34)
+    - RCTRequired (= 0.71.34)
+    - React-Core (= 0.71.34)
+  - React (0.71.34):
+    - React-Core (= 0.71.34)
+    - React-Core/DevSupport (= 0.71.34)
+    - React-Core/RCTWebSocket (= 0.71.34)
+    - React-RCTActionSheet (= 0.71.34)
+    - React-RCTAnimation (= 0.71.34)
+    - React-RCTBlob (= 0.71.34)
+    - React-RCTImage (= 0.71.34)
+    - React-RCTLinking (= 0.71.34)
+    - React-RCTNetwork (= 0.71.34)
+    - React-RCTSettings (= 0.71.34)
+    - React-RCTText (= 0.71.34)
+    - React-RCTVibration (= 0.71.34)
+  - React-callinvoker (0.71.34)
+  - React-Codegen (0.71.34):
    - FBReactNativeSpec
    - RCT-Folly
    - RCTRequired
@ -136,294 +136,294 @@ PODS:
    - React-jsiexecutor
    - ReactCommon/turbomodule/bridging
    - ReactCommon/turbomodule/core
-  - React-Core (0.71.33):
+  - React-Core (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.33)
-    - React-cxxreact (= 0.71.33)
+    - React-Core/Default (= 0.71.34)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.71.33):
+  - React-Core/CoreModulesHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/Default (0.71.33):
+  - React-Core/Default (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/DevSupport (0.71.33):
+  - React-Core/DevSupport (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.33)
-    - React-Core/RCTWebSocket (= 0.71.33)
-    - React-cxxreact (= 0.71.33)
+    - React-Core/Default (= 0.71.34)
+    - React-Core/RCTWebSocket (= 0.71.34)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-jsinspector (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-jsinspector (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.71.33):
+  - React-Core/RCTActionSheetHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.71.33):
+  - React-Core/RCTAnimationHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.71.33):
+  - React-Core/RCTBlobHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTImageHeaders (0.71.33):
+  - React-Core/RCTImageHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.71.33):
+  - React-Core/RCTLinkingHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.71.33):
+  - React-Core/RCTNetworkHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.71.33):
+  - React-Core/RCTSettingsHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTTextHeaders (0.71.33):
+  - React-Core/RCTTextHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.71.33):
+  - React-Core/RCTVibrationHeaders (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.33)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-Core/RCTWebSocket (0.71.33):
+  - React-Core/RCTWebSocket (0.71.34):
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.33)
-    - React-cxxreact (= 0.71.33)
+    - React-Core/Default (= 0.71.34)
+    - React-cxxreact (= 0.71.34)
    - React-jsc
-    - React-jsi (= 0.71.33)
-    - React-jsiexecutor (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-jsi (= 0.71.34)
+    - React-jsiexecutor (= 0.71.34)
+    - React-perflogger (= 0.71.34)
    - SocketRocket (= 0.7.0)
    - Yoga
-  - React-CoreModules (0.71.33):
+  - React-CoreModules (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Codegen (= 0.71.33)
-    - React-Core/CoreModulesHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
+    - RCTTypeSafety (= 0.71.34)
+    - React-Codegen (= 0.71.34)
+    - React-Core/CoreModulesHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
    - React-RCTBlob
-    - React-RCTImage (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
+    - React-RCTImage (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
    - SocketRocket (= 0.7.0)
-  - React-cxxreact (0.71.33):
+  - React-cxxreact (0.71.34):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-jsinspector (= 0.71.33)
-    - React-logger (= 0.71.33)
-    - React-perflogger (= 0.71.33)
-    - React-runtimeexecutor (= 0.71.33)
-  - React-jsc (0.71.33):
-    - React-jsc/Fabric (= 0.71.33)
-    - React-jsi (= 0.71.33)
-  - React-jsc/Fabric (0.71.33):
-    - React-jsi (= 0.71.33)
-  - React-jsi (0.71.33):
+    - React-callinvoker (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-jsinspector (= 0.71.34)
+    - React-logger (= 0.71.34)
+    - React-perflogger (= 0.71.34)
+    - React-runtimeexecutor (= 0.71.34)
+  - React-jsc (0.71.34):
+    - React-jsc/Fabric (= 0.71.34)
+    - React-jsi (= 0.71.34)
+  - React-jsc/Fabric (0.71.34):
+    - React-jsi (= 0.71.34)
+  - React-jsi (0.71.34):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.71.33):
+  - React-jsiexecutor (0.71.34):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-perflogger (= 0.71.33)
-  - React-jsinspector (0.71.33)
-  - React-logger (0.71.33):
+    - React-cxxreact (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-perflogger (= 0.71.34)
+  - React-jsinspector (0.71.34)
+  - React-logger (0.71.34):
    - glog
-  - React-perflogger (0.71.33)
-  - React-RCTActionSheet (0.71.33):
-    - React-Core/RCTActionSheetHeaders (= 0.71.33)
-  - React-RCTAnimation (0.71.33):
+  - React-perflogger (0.71.34)
+  - React-RCTActionSheet (0.71.34):
+    - React-Core/RCTActionSheetHeaders (= 0.71.34)
+  - React-RCTAnimation (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTAnimationHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTAppDelegate (0.71.33):
+    - RCTTypeSafety (= 0.71.34)
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTAnimationHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTAppDelegate (0.71.34):
    - RCT-Folly
    - RCTRequired
    - RCTTypeSafety
    - React-Core
    - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.71.33):
+  - React-RCTBlob (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTBlobHeaders (= 0.71.33)
-    - React-Core/RCTWebSocket (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-RCTNetwork (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTImage (0.71.33):
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTBlobHeaders (= 0.71.34)
+    - React-Core/RCTWebSocket (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-RCTNetwork (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTImage (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTImageHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-RCTNetwork (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTLinking (0.71.33):
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTLinkingHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTNetwork (0.71.33):
+    - RCTTypeSafety (= 0.71.34)
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTImageHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-RCTNetwork (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTLinking (0.71.34):
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTLinkingHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTNetwork (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTNetworkHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTSettings (0.71.33):
+    - RCTTypeSafety (= 0.71.34)
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTNetworkHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTSettings (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.33)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTSettingsHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-RCTText (0.71.33):
-    - React-Core/RCTTextHeaders (= 0.71.33)
-  - React-RCTVibration (0.71.33):
+    - RCTTypeSafety (= 0.71.34)
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTSettingsHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-RCTText (0.71.34):
+    - React-Core/RCTTextHeaders (= 0.71.34)
+  - React-RCTVibration (0.71.34):
    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.33)
-    - React-Core/RCTVibrationHeaders (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - ReactCommon/turbomodule/core (= 0.71.33)
-  - React-runtimeexecutor (0.71.33):
-    - React-jsi (= 0.71.33)
-  - ReactCommon/turbomodule/bridging (0.71.33):
+    - React-Codegen (= 0.71.34)
+    - React-Core/RCTVibrationHeaders (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - ReactCommon/turbomodule/core (= 0.71.34)
+  - React-runtimeexecutor (0.71.34):
+    - React-jsi (= 0.71.34)
+  - ReactCommon/turbomodule/bridging (0.71.34):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.33)
-    - React-Core (= 0.71.33)
-    - React-cxxreact (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-logger (= 0.71.33)
-    - React-perflogger (= 0.71.33)
-  - ReactCommon/turbomodule/core (0.71.33):
+    - React-callinvoker (= 0.71.34)
+    - React-Core (= 0.71.34)
+    - React-cxxreact (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-logger (= 0.71.34)
+    - React-perflogger (= 0.71.34)
+  - ReactCommon/turbomodule/core (0.71.34):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.33)
-    - React-Core (= 0.71.33)
-    - React-cxxreact (= 0.71.33)
-    - React-jsi (= 0.71.33)
-    - React-logger (= 0.71.33)
-    - React-perflogger (= 0.71.33)
+    - React-callinvoker (= 0.71.34)
+    - React-Core (= 0.71.34)
+    - React-cxxreact (= 0.71.34)
+    - React-jsi (= 0.71.34)
+    - React-logger (= 0.71.34)
+    - React-perflogger (= 0.71.34)
  - ReactNativeHost (0.2.8):
    - React-Core
    - React-cxxreact
    - ReactCommon/turbomodule/core
-  - ReactTestApp-DevSupport (2.5.15):
+  - ReactTestApp-DevSupport (2.5.26):
    - React-Core
    - React-jsi
  - ReactTestApp-Resources (1.0.0-dev)
-  - RNCPicker (2.5.0):
+  - RNCPicker (2.5.1):
    - React-Core
-  - RNSVG (13.11.0):
+  - RNSVG (13.14.0):
    - React-Core
  - SocketRocket (0.7.0)
  - Yoga (1.14.0)
@ -577,53 +577,53 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  boost: 8fa3cd00fa17ef6c3221e5fd283fa93e81d23017
  DoubleConversion: acaf5db79676d2e9119015819153f0f99191de12
-  FBLazyVector: 732e9894455ba874b5a579460b785a698471abc3
-  FBReactNativeSpec: 99131518318ce16e3172f8887786c3ccbd4b13d5
+  FBLazyVector: 1aab4d2d80c4224c7ce523ab9f8f84d3388b22e7
+  FBReactNativeSpec: d0413890b5a16d7f5612e03cbd7410c9568d46a5
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  FRNAvatar: b8a62785e9cd3a4b7dacc75b4a101d9cc65a10a7
-  FRNCallout: 4f1ef0df2f8ffbf51e2219150b6e7529f1a28327
-  FRNCheckbox: 22e51df1ee84b27b715c75cbe1475308b3c09987
-  FRNMenuButton: a3131bdcb31d38e1d50cf795a1b6b651a53d6ab5
-  FRNRadioButton: 407a31b63068c963d5321ca02d10c16442ddc2c6
-  FRNVibrancyView: 1bc1b22a87cc64bb9efcf80001aabd6e4bbfec4e
+  FRNAvatar: 1db3235b5e4320685b7bc5e69f507632189b0f82
+  FRNCallout: 9997da1ea9afd92868f29a04a1f38ad9c2f40809
+  FRNCheckbox: 7f841ae3961f02eb53e5cca9c257f11b9b90511c
+  FRNMenuButton: 3b87b0a798aa552ba8af7b92310d1af716f0851a
+  FRNRadioButton: 20e2ec0bcc8751a13f8f9fe7fff71ff48c863f4a
+  FRNVibrancyView: 7313da1c1ce38e5e66ca5b69f72582eb1ba9e10b
  glog: 6df0a3d6e2750a50609471fd1a01fd2948d405b5
  MicrosoftFluentUI: dde98d8ed3fc306d9ddd0a6f0bc0c1f24fe5275e
  RCT-Folly: bf7b4921a91932051ebf1c5c2d297154b1fa3c8c
-  RCTFocusZone: 99c0fe31a0c97eac9a6306dc89cd45289e102778
-  RCTRequired: b924a3818bef3872776fc35568607e9fd1a7ccef
-  RCTTypeSafety: 34f12e6931e6ecff0d49578c88516574dd75c5fb
-  React: 72acb808d5ea012c54c0d8f3d9e0177a5164ce44
-  React-callinvoker: 7f44c6485e733f907d8adccb8ea7bfd8c661ad73
-  React-Codegen: 0b2114160ce592070f115f5fbff2747d76d0ae8e
-  React-Core: 675a479fdc03725925e1a7f9e5a3bf0548cb24c2
-  React-CoreModules: 87b348ba58c041b57f45f9f5535fd0436479cb28
-  React-cxxreact: 6f1f6ff3172ce0c542b4c32e399773f1643873e8
-  React-jsc: a4b9eebe6ab71197b505b20f17c03b2552cd66b3
-  React-jsi: d2cd70166fa1d42d1854a6fea0759968d4efe262
-  React-jsiexecutor: 9d1f2ab1d5bce258038eb202728210cab73581af
-  React-jsinspector: b482ed08c8233d528c5917e1a916827e2357ab24
-  React-logger: 9cca25c5cbc2bdc03dd79010992d17cbac337139
-  React-perflogger: b2d0d3a34cb21df25dfdef7331c8eace64ebbac4
-  React-RCTActionSheet: e2852db033ff9909d9e31f78a16a8b1a0d72b0b3
-  React-RCTAnimation: af9d4eba93cbb7bf6b2b70ff30f4dde1ae47a4a6
-  React-RCTAppDelegate: 1ed88f20871b6a095159a7f23ee6ba1376bc96e7
-  React-RCTBlob: 00d5f9a111ab8d31c5030975feb9b4cd82dfcf16
-  React-RCTImage: ee42851404992d7a14086ef0daa2a30238d5e175
-  React-RCTLinking: 424dafdd86a0de70210f2bdae72ebe8dcf697493
-  React-RCTNetwork: 9d5462fd172015c6b3fbc9d2dd93a8bc9a2ee5c7
-  React-RCTSettings: f7dc22a18afb78123c2191bedb3200da9f2bb8ca
-  React-RCTText: f820084f73880a29393620119d365761c681aef3
-  React-RCTVibration: dae031977d6a1ce3b89f0fbea95a5dd70024685d
-  React-runtimeexecutor: d475f7a753d3aff4c72c146e064cc174e593910e
-  ReactCommon: 79e0b0a3d0baa6d7512c06c8d88ad3c6d8b64339
+  RCTFocusZone: 0efcb505c579a9b5799f8c7695f90c0448cbf401
+  RCTRequired: 7dd48eece43a5c9f3a4f4f07790604a66f3eec16
+  RCTTypeSafety: c1a9df291b19377f1e0effdb7552561fa72c8089
+  React: 8c6146bfee7462f0758293fec0f273130f69eba1
+  React-callinvoker: ab887f03924c73cde1380df82d10a3fcf5309203
+  React-Codegen: 2b5980e62556bf1ccc37637926c9950ff0558f83
+  React-Core: fd460d03be4afdbbac49b4718081f29b69178cb1
+  React-CoreModules: 2af31bf07b5f9aef2a74ae6f9383483bf7b1b128
+  React-cxxreact: da0f279a623c113e65e1156deec739b532a80c3f
+  React-jsc: 7cb4ed275199fd66b28504d6429ddd73168d7dbd
+  React-jsi: a9b282e603393518c9870a3ae84e1ae0e7c93e90
+  React-jsiexecutor: a56038095018e034629b89bf4bc6111016819af1
+  React-jsinspector: 2467e42b264a2b661e67e238eec6c5103d72be96
+  React-logger: 133cc77ea521b22baf92f1f4b035fdeadba5d115
+  React-perflogger: c07d03caeff878a70ff008bc41c70ca14aa33ab6
+  React-RCTActionSheet: 3b6cd9236dc91e38526a0c2de962aa6030bce2b6
+  React-RCTAnimation: 03050467b33c3e97c521efb365e8777381d006b1
+  React-RCTAppDelegate: a130494ec17de1468da3d26a51c63fb13f508c69
+  React-RCTBlob: 588bf867d14659319ef4c9cfca4a4f13436899d0
+  React-RCTImage: d3bf4420542022e1eb9aef0dd4a77cd1b065fc9b
+  React-RCTLinking: 0f183718bc09b8ca741417a28ac52b57c6458a64
+  React-RCTNetwork: 7b10c43924f7cb5e24bb16d60add7249e22937a0
+  React-RCTSettings: e82b3c1d0151363e37d5559b06ce0054dfeedf01
+  React-RCTText: 4e66857a34993f04dc98e855f99089efaa90f75f
+  React-RCTVibration: 5449e400901d9418731da501d4e52249dd01e0ee
+  React-runtimeexecutor: a324f85f38cdb1660c75367759e9957eff75f917
+  ReactCommon: 7366c11ed11d3fd65c1a7a8280b85d99992b2ebf
  ReactNativeHost: 5caf8c9381f26c453fabbe8c3b87f6a013a3c459
-  ReactTestApp-DevSupport: 9b9eb9bf56d1a2f3ce71875c20597decdc04683c
+  ReactTestApp-DevSupport: 092f0caf9902efaaba73b4a20f153e64bcee6daf
  ReactTestApp-Resources: 8c0164a3cc5052418c92018e2af0e05d564aa307
-  RNCPicker: 32ca102146bc7d34a8b93a998d9938d9f9ec7898
-  RNSVG: 03e4d258ca355d7836a0a5dd4d4dc63c1eb49cbb
+  RNCPicker: 529d564911e93598cc399b56cc0769ce3675f8c8
+  RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
  SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
-  Yoga: 2b1bd30acc9239a612feef50886ca9bd8b313abc
+  Yoga: dbe974971e53d9273cfad741be27682a36f18652

 PODFILE CHECKSUM: d3fe834dea1e24594a8ba545f70b5250bbc25c91

-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0
--- a/change/@fluentui-react-native-e2e-testing-15d39193-7ea0-4159-bfa3-9501ace0c902.json
+++ b/change/@fluentui-react-native-e2e-testing-15d39193-7ea0-4159-bfa3-9501ace0c902.json
@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "[CI] Refactor Apple CI",
+  "packageName": "@fluentui-react-native/e2e-testing",
+  "email": "sanajmi@microsoft.com",
+  "dependentChangeType": "patch"
+}
--- a/change/@fluentui-react-native-tester-87ae2ccd-b141-41a0-af6e-f7671d8d08b3.json
+++ b/change/@fluentui-react-native-tester-87ae2ccd-b141-41a0-af6e-f7671d8d08b3.json
@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "[CI] Refactor Apple CI",
+  "packageName": "@fluentui-react-native/tester",
+  "email": "sanajmi@microsoft.com",
+  "dependentChangeType": "patch"
+}