From 80b6aabb5dca8f06046932408deef78fbaa87200 Mon Sep 17 00:00:00 2001
From: Saad Najmi <sanajmi@microsoft.com>
Date: Wed, 10 Sep 2025 13:53:31 -0700
Subject: [PATCH 1/3] ci: only create .rnm-publish sentinel file if versioning
 happened

---
 packages/nx-release-version/index.js | 29 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/nx-release-version/index.js b/packages/nx-release-version/index.js
index 58076bf054c522..a701ca74b1a1f2 100644
--- a/packages/nx-release-version/index.js
+++ b/packages/nx-release-version/index.js
@@ -76,22 +76,25 @@ const afterAllProjectsVersioned = async (cwd, opts) => {
   const changedFiles = [...baseResult.changedFiles];
   const deletedFiles = [...baseResult.deletedFiles];
 
-  try {
-    // Create the .rnm-publish file to indicate versioning has occurred
-    fs.writeFileSync(path.join(REPO_ROOT, '.rnm-publish'), '');
+  // Only update React Native artifacts if versioning actually happened
+  if (changedFiles.length > 0) {
+    try {
+      // Create the .rnm-publish file to indicate versioning has occurred
+      fs.writeFileSync(path.join(REPO_ROOT, '.rnm-publish'), '');
 
-    // Update React Native artifacts
-    const versionedFiles = await runSetVersion();
+      // Update React Native artifacts
+      const versionedFiles = await runSetVersion();
 
-    // Add the versioned files to changed files
-    changedFiles.push(...versionedFiles);
+      // Add the versioned files to changed files
+      changedFiles.push(...versionedFiles);
 
-    console.log('✅ Updated React Native artifacts');
-    console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file)));
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`);
-    throw error;
+      console.log('✅ Updated React Native artifacts');
+      console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file)));
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`);
+      throw error;
+    }
   }
 
   return {

From e53d8aeaa3246690fecd674d87a9ab84dc8728eb Mon Sep 17 00:00:00 2001
From: Saad Najmi <sanajmi@microsoft.com>
Date: Sat, 11 Jan 2025 08:44:39 -0800
Subject: [PATCH 2/3] ci: Various fixes (#2331)

---
 .ado/scripts/xcodebuild.sh           | 2 ++
 .ado/templates/apple-tools-setup.yml | 2 +-
 .ado/variables/vars.yml              | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.ado/scripts/xcodebuild.sh b/.ado/scripts/xcodebuild.sh
index 243cd0fd8e38e2..fdcb6833dec3bc 100755
--- a/.ado/scripts/xcodebuild.sh
+++ b/.ado/scripts/xcodebuild.sh
@@ -70,6 +70,8 @@ if ! command -v xcbeautify 1> /dev/null; then
   brew install xcbeautify
 fi
 
+xcodebuild -downloadAllPlatforms
+
 eval "$build_cmd" | xcbeautify --report junit
 
 if [[ "$CCACHE_DISABLE" != "1" ]]; then
diff --git a/.ado/templates/apple-tools-setup.yml b/.ado/templates/apple-tools-setup.yml
index 5ceec73192883f..dedb7d1c2325fa 100644
--- a/.ado/templates/apple-tools-setup.yml
+++ b/.ado/templates/apple-tools-setup.yml
@@ -1,7 +1,7 @@
 steps:
   - task: UseNode@1
     inputs:
-      version: '23.x'
+      versionSpec: '23.x'
 
   - script: |
       brew bundle --file .ado/Brewfile
diff --git a/.ado/variables/vars.yml b/.ado/variables/vars.yml
index e976033d97f3a4..2b2001707a9f64 100644
--- a/.ado/variables/vars.yml
+++ b/.ado/variables/vars.yml
@@ -1,6 +1,6 @@
 variables:
   VmImageApple: macos-latest-internal
-  xcode_friendly_name: 'Xcode 15.2'
-  xcode_version: '/Applications/Xcode_15.2.app'
-  ios_version: '17.2'
-  ios_simulator: 'iPhone 15'
+  xcode_friendly_name: 'Xcode 16.2'
+  xcode_version: '/Applications/Xcode_16.2.app'
+  ios_version: '18.0'
+  ios_simulator: 'iPhone 16'

From 808b29dd4740071d1934b0e73326289733742290 Mon Sep 17 00:00:00 2001
From: Saad Najmi <sanajmi@microsoft.com>
Date: Wed, 10 Sep 2025 15:24:19 -0700
Subject: [PATCH 3/3] Use node 22

---
 .ado/templates/apple-tools-setup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ado/templates/apple-tools-setup.yml b/.ado/templates/apple-tools-setup.yml
index dedb7d1c2325fa..55c0024b55070f 100644
--- a/.ado/templates/apple-tools-setup.yml
+++ b/.ado/templates/apple-tools-setup.yml
@@ -1,7 +1,7 @@
 steps:
   - task: UseNode@1
     inputs:
-      versionSpec: '23.x'
+      versionSpec: '22.x'
 
   - script: |
       brew bundle --file .ado/Brewfile