From 963242f0e190ce02e622ce21a68993122048d64f Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Fri, 28 Nov 2025 14:06:48 +0100
Subject: [PATCH 01/18] Add R2R functional test on iOS

---
 src/libraries/tests.proj                      |  4 +--
 src/mono/msbuild/apple/build/AppleBuild.props |  3 ++
 src/mono/sample/iOS/Program.csproj            |  8 ++---
 .../CoreCLR}/Program.cs                       |  0
 ....Simulator.CoreCLR.Interpreter.Test.csproj |  4 ---
 .../CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj  | 29 +++++++++++++++++++
 6 files changed, 36 insertions(+), 12 deletions(-)
 rename src/tests/FunctionalTests/iOS/{Simulator/CoreCLR.Interpreter => Device/CoreCLR}/Program.cs (100%)
 rename src/tests/FunctionalTests/iOS/{Simulator/CoreCLR.Interpreter => Device/CoreCLR}/iOS.Simulator.CoreCLR.Interpreter.Test.csproj (88%)
 create mode 100644 src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 944688f50c6c62..d7424e7caf6f27 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -331,7 +331,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="('$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
-    <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR.Interpreter\*.Test.csproj" />
+    <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\CoreCLR\*.Test.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
@@ -631,7 +631,7 @@
 
   <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst') and '$(RuntimeFlavor)' == 'CoreCLR' and '$(UseNativeAOTRuntime)' != 'true'">
     <SmokeTestProject Remove="@(SmokeTestProject)" />
-    <SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR.Interpreter\*.Test.csproj"/>
+    <SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\CoreCLR\*.Test.csproj"/>
   </ItemGroup>
 
   <!--
diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index ba3ff16ac72337..52fe8ae090096a 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -28,6 +28,9 @@
     <IlcCompileDependsOn>ComputeIlcCompileInputs;SetupOSSpecificProps;PrepareForILLink</IlcCompileDependsOn>
     <_ReadRuntimeComponentsManifestTargetName Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' != 'false'">_MonoReadAvailableComponentsManifest</_ReadRuntimeComponentsManifestTargetName>
 
+    <PublishReadyToRunComposite Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">true</PublishReadyToRunComposite>
+    <PublishReadyToRunContainerFormat Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">macho</PublishReadyToRunContainerFormat>
+
     <AppleBuildAfterThisTarget Condition="'$(AppleBuildAfterThisTarget)' == ''">Publish</AppleBuildAfterThisTarget>
     <AppleBuildDependsOn>
         $(_ReadRuntimeComponentsManifestTargetName);
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index 667fcc709e9010..905c5b0721b1a5 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -26,16 +26,12 @@
     <BuildAppBundleDependsOnTargets Condition="'$(ArchiveTests)' == 'true'">Publish</BuildAppBundleDependsOnTargets>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
-    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-    <PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
-  </PropertyGroup>
-
   <ItemGroup>
     <RuntimeComponents Condition="'$(DiagnosticPorts)' != ''" Include="diagnostics_tracing" />
   </ItemGroup>
 
-  <!-- Use the repo's CrossGen props/targets.
+  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+       Use the repo's CrossGen props/targets.
        This can be removed once we upstream Mach-O support in the targets to the SDK -->
   <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
   <Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
diff --git a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/Program.cs b/src/tests/FunctionalTests/iOS/Device/CoreCLR/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/Program.cs
rename to src/tests/FunctionalTests/iOS/Device/CoreCLR/Program.cs
diff --git a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
similarity index 88%
rename from src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
rename to src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
index 23315975066cd6..b206728d9afe97 100644
--- a/src/tests/FunctionalTests/iOS/Simulator/CoreCLR.Interpreter/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
@@ -12,10 +12,6 @@
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <EnvironmentVariables Include="DOTNET_InterpMode=3" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj
new file mode 100644
index 00000000000000..55a262e3c6da26
--- /dev/null
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <UseMonoRuntime>false</UseMonoRuntime>
+    <MonoForceInterpreter>false</MonoForceInterpreter>
+    <RunAOTCompilation>false</RunAOTCompilation>
+    <TestRuntime>true</TestRuntime>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetOS Condition="'$(TargetOS)' == ''">iossimulator</TargetOS>
+    <MainLibraryFileName>iOS.Simulator.CoreCLR.R2R.Test.dll</MainLibraryFileName>
+    <IncludesTestRunner>false</IncludesTestRunner>
+    <ExpectedExitCode>42</ExpectedExitCode>
+    <PublishReadyToRun>true</PublishReadyToRun>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+
+  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+      Use the repo's CrossGen props/targets.
+       This can be removed once we upstream Mach-O support in the targets to the SDK -->
+  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
+  <PropertyGroup>
+    <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
+    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
+    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
+  </PropertyGroup>
+</Project>

From 007a6d3ac34f7e1c66a979ea38c2f4d57c34c30c Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Fri, 28 Nov 2025 14:10:36 +0100
Subject: [PATCH 02/18] Rename project files

---
 ...nterpreter.Test.csproj => iOS.CoreCLR.Interpreter.Test.csproj} | 0
 .../{iOS.Simulator.CoreCLR.R2R.csproj => iOS.CoreCLR.R2R.csproj}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/tests/FunctionalTests/iOS/Device/CoreCLR/{iOS.Simulator.CoreCLR.Interpreter.Test.csproj => iOS.CoreCLR.Interpreter.Test.csproj} (100%)
 rename src/tests/FunctionalTests/iOS/Device/CoreCLR/{iOS.Simulator.CoreCLR.R2R.csproj => iOS.CoreCLR.R2R.csproj} (100%)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.Interpreter.Test.csproj
rename to src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.Simulator.CoreCLR.R2R.csproj
rename to src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj

From c687585fc83645aa26c6c2499e7618a7097afba4 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Fri, 28 Nov 2025 16:19:10 +0100
Subject: [PATCH 03/18] Update MainLibraryFileName in iOS test projects

---
 .../iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj      | 2 +-
 .../FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
index b206728d9afe97..072f8102f157b8 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
@@ -7,7 +7,7 @@
     <TestRuntime>true</TestRuntime>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TargetOS Condition="'$(TargetOS)' == ''">iossimulator</TargetOS>
-    <MainLibraryFileName>iOS.Simulator.CoreCLR.Interpreter.Test.dll</MainLibraryFileName>
+    <MainLibraryFileName>iOS.CoreCLR.Interpreter.Test.dll</MainLibraryFileName>
     <IncludesTestRunner>false</IncludesTestRunner>
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj
index 55a262e3c6da26..4ab5ebe0ed8c2f 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj
@@ -7,7 +7,7 @@
     <TestRuntime>true</TestRuntime>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TargetOS Condition="'$(TargetOS)' == ''">iossimulator</TargetOS>
-    <MainLibraryFileName>iOS.Simulator.CoreCLR.R2R.Test.dll</MainLibraryFileName>
+    <MainLibraryFileName>iOS.CoreCLR.R2R.Test.dll</MainLibraryFileName>
     <IncludesTestRunner>false</IncludesTestRunner>
     <ExpectedExitCode>42</ExpectedExitCode>
     <PublishReadyToRun>true</PublishReadyToRun>

From 3e58c2b129284dcc716cb9fb02c6310d4f09a450 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 1 Dec 2025 11:58:14 +0100
Subject: [PATCH 04/18] Rename project file

---
 .../{iOS.CoreCLR.R2R.csproj => iOS.CoreCLR.R2R.Test.csproj}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/tests/FunctionalTests/iOS/Device/CoreCLR/{iOS.CoreCLR.R2R.csproj => iOS.CoreCLR.R2R.Test.csproj} (100%)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.csproj
rename to src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj

From 520dd15f636d1ff02699126e0f90311c0ef237c2 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 1 Dec 2025 12:05:09 +0100
Subject: [PATCH 05/18] Disable R2R in interp-only test

---
 .../Interpreter/iOS.Simulator.Interpreter.Test.csproj         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
index 8a39086e1e11ed..28ed3b718ca80a 100644
--- a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
@@ -11,6 +11,10 @@
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
 
+   <ItemGroup>
+    <EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>

From 34feb56012b4dab109a8675370fd6ab45673ea61 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 1 Dec 2025 16:03:49 +0100
Subject: [PATCH 06/18] Refactor import condition for AppleBuild.InTree.targets
 in iOS R2R test project

---
 .../iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
index 4ab5ebe0ed8c2f..aacb993293beea 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
@@ -24,6 +24,7 @@
   <PropertyGroup>
     <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
     <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
+    <!-- AppleBuild.InTree.targets is already imported by tests.ioslike.targets when BuildTestsOn == 'local', so only import when building on Helix -->
+    <AfterMicrosoftNETSdkTargets Condition="'$(BuildTestsOn)' != 'local'">$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
   </PropertyGroup>
 </Project>

From 5ce0f1e435484ccc21822e9ef95cea698b0776aa Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 1 Dec 2025 16:43:10 +0100
Subject: [PATCH 07/18] Remove conditional import of AppleBuild.InTree.targets
 for iOS R2R test project

---
 .../iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
index aacb993293beea..d03686c73fef1c 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
@@ -24,7 +24,5 @@
   <PropertyGroup>
     <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
     <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <!-- AppleBuild.InTree.targets is already imported by tests.ioslike.targets when BuildTestsOn == 'local', so only import when building on Helix -->
-    <AfterMicrosoftNETSdkTargets Condition="'$(BuildTestsOn)' != 'local'">$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
   </PropertyGroup>
 </Project>

From 2addc57f4c030e5e03f682d1521c64100984afbe Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 12:36:01 +0100
Subject: [PATCH 08/18] Refactor iOS build configuration to use CrossGen
 props/targets

---
 src/mono/msbuild/apple/build/AppleBuild.props       | 13 +++++++++++++
 src/mono/sample/iOS/Program.csproj                  |  9 ---------
 .../iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj  |  9 ---------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index 52fe8ae090096a..a33a1dd9d1b5d8 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -32,6 +32,14 @@
     <PublishReadyToRunContainerFormat Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">macho</PublishReadyToRunContainerFormat>
 
     <AppleBuildAfterThisTarget Condition="'$(AppleBuildAfterThisTarget)' == ''">Publish</AppleBuildAfterThisTarget>
+  </PropertyGroup>
+
+  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+       Use the repo's CrossGen props/targets.
+       This can be removed once we upstream Mach-O support in the targets to the SDK -->
+  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
+
+  <PropertyGroup>
     <AppleBuildDependsOn>
         $(_ReadRuntimeComponentsManifestTargetName);
         _InitializeCommonProperties;
@@ -45,6 +53,11 @@
         _AfterAppleBuild
     </AppleBuildDependsOn>
 
+    <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+    Import after SDK targets in order to override R2R-related targets in the SDK -->
+    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
+    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
+
     <!-- When building on Helix $(_CommonTargetsDir) will be properly set, otherwise we have to set it to a in-tree location -->
     <_CommonTargetsDir Condition="'$(_CommonTargetsDir)' == ''">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', '..', 'common'))</_CommonTargetsDir>
   </PropertyGroup>
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index 905c5b0721b1a5..bc6143fe28ea18 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -30,16 +30,7 @@
     <RuntimeComponents Condition="'$(DiagnosticPorts)' != ''" Include="diagnostics_tracing" />
   </ItemGroup>
 
-  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
-       Use the repo's CrossGen props/targets.
-       This can be removed once we upstream Mach-O support in the targets to the SDK -->
-  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
   <Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
-  <PropertyGroup>
-    <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
-    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
-  </PropertyGroup>
 
   <Target Name="BuildAppBundle" AfterTargets="$(BuildAppBundleAfterTargets)" DependsOnTargets="$(BuildAppBundleDependsOnTargets)"/>
   <Target Name="_SetAppleGenerateAppBundleProps" Condition="'$(TargetOS)' != 'ios' and '$(ArchiveTests)' != 'true'" BeforeTargets="_AppleGenerateAppBundle">
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
index d03686c73fef1c..7afa3b15947766 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
@@ -16,13 +16,4 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>
-
-  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
-      Use the repo's CrossGen props/targets.
-       This can be removed once we upstream Mach-O support in the targets to the SDK -->
-  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
-  <PropertyGroup>
-    <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
-    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-  </PropertyGroup>
 </Project>

From e33f99ddc902e3d80f69f1716d8a15385bdb4c60 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 16:08:05 +0100
Subject: [PATCH 09/18] Override R2R-related targets in the SDK

---
 src/libraries/tests.proj                      | 2 +-
 src/mono/msbuild/apple/build/AppleBuild.props | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index d7424e7caf6f27..d00e25e80c9313 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -330,7 +330,7 @@
     <ProjectExclusions Include="$(RepoRoot)/src/tests/FunctionalTests/iOS/Simulator/LibraryMode/iOS.Simulator.LibraryMode.Test.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="('$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
+  <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
     <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\CoreCLR\*.Test.csproj" />
   </ItemGroup>
 
diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index a33a1dd9d1b5d8..e900e5caccd63b 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -56,7 +56,8 @@
     <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
     Import after SDK targets in order to override R2R-related targets in the SDK -->
     <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
+    <!-- Only append AppleBuild.InTree.targets if it's not already in AfterMicrosoftNETSdkTargets to avoid duplicate imports -->
+    <AfterMicrosoftNETSdkTargets Condition="!$(AfterMicrosoftNETSdkTargets.Contains('AppleBuild.InTree.targets'))">$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
 
     <!-- When building on Helix $(_CommonTargetsDir) will be properly set, otherwise we have to set it to a in-tree location -->
     <_CommonTargetsDir Condition="'$(_CommonTargetsDir)' == ''">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', '..', 'common'))</_CommonTargetsDir>

From f474dfbf1bc01f7a696dd287931572e34976d8b7 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 17:32:50 +0100
Subject: [PATCH 10/18] Revert changes

---
 src/mono/msbuild/apple/build/AppleBuild.props | 17 -----------------
 src/mono/sample/iOS/Program.csproj            | 13 +++++++++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index e900e5caccd63b..ba3ff16ac72337 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -28,18 +28,7 @@
     <IlcCompileDependsOn>ComputeIlcCompileInputs;SetupOSSpecificProps;PrepareForILLink</IlcCompileDependsOn>
     <_ReadRuntimeComponentsManifestTargetName Condition="'$(UseNativeAOTRuntime)' != 'true' and '$(UseMonoRuntime)' != 'false'">_MonoReadAvailableComponentsManifest</_ReadRuntimeComponentsManifestTargetName>
 
-    <PublishReadyToRunComposite Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">true</PublishReadyToRunComposite>
-    <PublishReadyToRunContainerFormat Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">macho</PublishReadyToRunContainerFormat>
-
     <AppleBuildAfterThisTarget Condition="'$(AppleBuildAfterThisTarget)' == ''">Publish</AppleBuildAfterThisTarget>
-  </PropertyGroup>
-
-  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
-       Use the repo's CrossGen props/targets.
-       This can be removed once we upstream Mach-O support in the targets to the SDK -->
-  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
-
-  <PropertyGroup>
     <AppleBuildDependsOn>
         $(_ReadRuntimeComponentsManifestTargetName);
         _InitializeCommonProperties;
@@ -53,12 +42,6 @@
         _AfterAppleBuild
     </AppleBuildDependsOn>
 
-    <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
-    Import after SDK targets in order to override R2R-related targets in the SDK -->
-    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <!-- Only append AppleBuild.InTree.targets if it's not already in AfterMicrosoftNETSdkTargets to avoid duplicate imports -->
-    <AfterMicrosoftNETSdkTargets Condition="!$(AfterMicrosoftNETSdkTargets.Contains('AppleBuild.InTree.targets'))">$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
-
     <!-- When building on Helix $(_CommonTargetsDir) will be properly set, otherwise we have to set it to a in-tree location -->
     <_CommonTargetsDir Condition="'$(_CommonTargetsDir)' == ''">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', '..', 'common'))</_CommonTargetsDir>
   </PropertyGroup>
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index bc6143fe28ea18..667fcc709e9010 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -26,11 +26,24 @@
     <BuildAppBundleDependsOnTargets Condition="'$(ArchiveTests)' == 'true'">Publish</BuildAppBundleDependsOnTargets>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
+    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
+    <PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
+  </PropertyGroup>
+
   <ItemGroup>
     <RuntimeComponents Condition="'$(DiagnosticPorts)' != ''" Include="diagnostics_tracing" />
   </ItemGroup>
 
+  <!-- Use the repo's CrossGen props/targets.
+       This can be removed once we upstream Mach-O support in the targets to the SDK -->
+  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
   <Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
+  <PropertyGroup>
+    <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
+    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
+    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
+  </PropertyGroup>
 
   <Target Name="BuildAppBundle" AfterTargets="$(BuildAppBundleAfterTargets)" DependsOnTargets="$(BuildAppBundleDependsOnTargets)"/>
   <Target Name="_SetAppleGenerateAppBundleProps" Condition="'$(TargetOS)' != 'ios' and '$(ArchiveTests)' != 'true'" BeforeTargets="_AppleGenerateAppBundle">

From d9d1c9813e1250b788ee53330f75921b372b54f0 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 17:33:25 +0100
Subject: [PATCH 11/18] Remove unnecessary environment variable for ReadyToRun

---
 .../Interpreter/iOS.Simulator.Interpreter.Test.csproj         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
index 28ed3b718ca80a..8a39086e1e11ed 100644
--- a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj
@@ -11,10 +11,6 @@
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
 
-   <ItemGroup>
-    <EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>

From 9c61b720ff90a985bcb22f5bb7e8f12ff5129de7 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 17:54:53 +0100
Subject: [PATCH 12/18] Add AppleBuild.ReadyToRun.targets

---
 .../apple/build/AppleBuild.InTree.targets       | 15 ---------------
 .../apple/build/AppleBuild.ReadyToRun.targets   | 17 +++++++++++++++++
 src/mono/msbuild/apple/build/AppleBuild.props   | 14 ++++++++++++++
 src/mono/sample/iOS/Program.csproj              | 13 -------------
 4 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets

diff --git a/src/mono/msbuild/apple/build/AppleBuild.InTree.targets b/src/mono/msbuild/apple/build/AppleBuild.InTree.targets
index 653c84a59739ae..37bc5fed8830e3 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.InTree.targets
+++ b/src/mono/msbuild/apple/build/AppleBuild.InTree.targets
@@ -33,19 +33,4 @@
     </ItemGroup>
     <Message Text="Used runtime pack: %(ResolvedRuntimePack.PackageDirectory)" Importance="high" />
   </Target>
-
-  <!-- Override the ResolveReadyToRunCompilers target to use the in-build crossgen2.
-       This needs to be imported after SDK targets, so any project requiring this should set AfterMicrosoftNETSdkTargets -->
-  <Target Name="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == true" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
-    <PropertyGroup>
-      <Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Crossgen2Tool Include="$(Crossgen2Path)"
-                     TargetArch="$(TargetArchitecture)"
-                     TargetOS="$(TargetOS)"
-                     PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets b/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets
new file mode 100644
index 00000000000000..1bfe6b140f2ca5
--- /dev/null
+++ b/src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets
@@ -0,0 +1,17 @@
+<Project>
+  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+       Override the ResolveReadyToRunCompilers target to use the in-build crossgen2.
+       This needs to be imported after SDK targets, so any project requiring this should set AfterMicrosoftNETSdkTargets -->
+  <Target Name="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == true" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
+    <PropertyGroup>
+      <Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Crossgen2Tool Include="$(Crossgen2Path)"
+                     TargetArch="$(TargetArchitecture)"
+                     TargetOS="$(TargetOS)"
+                     PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index ba3ff16ac72337..f1cf2ace6176a0 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -9,6 +9,20 @@
     <MonoForceInterpreter Condition="'$(MonoForceInterpreter)' == ''">true</MonoForceInterpreter>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
+    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
+    <PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
+  </PropertyGroup>
+
+  <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
+       ReadyToRun settings for CoreCLR on Apple platforms.
+       This can be removed once we upstream Mach-O support in the targets to the SDK -->
+  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
+  <PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
+    <AfterMicrosoftNETSdkTargets Condition="'$(Crossgen2SdkOverrideTargetsPath)' != ''">$(AfterMicrosoftNETSdkTargets);$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
+    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.ReadyToRun.targets</AfterMicrosoftNETSdkTargets>
+  </PropertyGroup>
+
   <PropertyGroup>
     <iOSLikeDedup Condition="'$(iOSLikeDedup)' == '' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'">true</iOSLikeDedup>
     <RuntimeIdentifier>$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())</RuntimeIdentifier>
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index 667fcc709e9010..bc6143fe28ea18 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -26,24 +26,11 @@
     <BuildAppBundleDependsOnTargets Condition="'$(ArchiveTests)' == 'true'">Publish</BuildAppBundleDependsOnTargets>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
-    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-    <PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
-  </PropertyGroup>
-
   <ItemGroup>
     <RuntimeComponents Condition="'$(DiagnosticPorts)' != ''" Include="diagnostics_tracing" />
   </ItemGroup>
 
-  <!-- Use the repo's CrossGen props/targets.
-       This can be removed once we upstream Mach-O support in the targets to the SDK -->
-  <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
   <Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
-  <PropertyGroup>
-    <!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
-    <AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
-    <AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
-  </PropertyGroup>
 
   <Target Name="BuildAppBundle" AfterTargets="$(BuildAppBundleAfterTargets)" DependsOnTargets="$(BuildAppBundleDependsOnTargets)"/>
   <Target Name="_SetAppleGenerateAppBundleProps" Condition="'$(TargetOS)' != 'ios' and '$(ArchiveTests)' != 'true'" BeforeTargets="_AppleGenerateAppBundle">

From 47558ebbdc295c001e54d6a904cdc73bba622300 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 2 Dec 2025 23:00:51 +0100
Subject: [PATCH 13/18] Add environment variable to disable ReadyToRun for iOS
 interpreter test

---
 .../iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
index 072f8102f157b8..283cf8625eae39 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
@@ -12,6 +12,10 @@
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
 
+  <ItemGroup>
+    <EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>

From a4b4e75876df44dbee4995b65b652524ef37a652 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 3 Dec 2025 09:24:43 +0100
Subject: [PATCH 14/18] Add environment variable to control ReadyToRun behavior
 for iOS tests

---
 src/mono/msbuild/apple/build/AppleBuild.props                 | 4 ++++
 .../iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj    | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mono/msbuild/apple/build/AppleBuild.props b/src/mono/msbuild/apple/build/AppleBuild.props
index f1cf2ace6176a0..f798429007f348 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.props
+++ b/src/mono/msbuild/apple/build/AppleBuild.props
@@ -14,6 +14,10 @@
     <PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(PublishReadyToRun)' != 'true' and '$(UseMonoRuntime)' != 'true'">
+    <EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
+  </ItemGroup>
+
   <!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
        ReadyToRun settings for CoreCLR on Apple platforms.
        This can be removed once we upstream Mach-O support in the targets to the SDK -->
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
index 283cf8625eae39..072f8102f157b8 100644
--- a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
+++ b/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
@@ -12,10 +12,6 @@
     <ExpectedExitCode>42</ExpectedExitCode>
   </PropertyGroup>
 
-  <ItemGroup>
-    <EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="Program.cs" />
   </ItemGroup>

From 64a05992cb86914840c733016202f605fdad50bf Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 3 Dec 2025 11:13:57 +0100
Subject: [PATCH 15/18] Add IsFunctionalTest property to iOS Device build
 configuration

---
 src/tests/FunctionalTests/iOS/Device/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
index d9788f8f84ee4f..ddbec01d8f5525 100644
--- a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
+++ b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
@@ -4,6 +4,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTestProject Condition="'$(IsTestProject)' == ''">true</IsTestProject>
+    <IsFunctionalTest>true</IsFunctionalTest>
   </PropertyGroup>
 
   <Import Project="..\..\..\..\libraries\Directory.Build.props" />

From 0bbc29c0e950f2022a48ef4712666a576d83e251 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 3 Dec 2025 12:31:51 +0100
Subject: [PATCH 16/18] Revert changes

---
 src/libraries/tests.proj                                       | 2 +-
 src/tests/FunctionalTests/iOS/Device/Directory.Build.props     | 3 +--
 .../iOS/{Device => Simulator}/CoreCLR/Program.cs               | 0
 .../CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj                | 0
 .../{Device => Simulator}/CoreCLR/iOS.CoreCLR.R2R.Test.csproj  | 0
 5 files changed, 2 insertions(+), 3 deletions(-)
 rename src/tests/FunctionalTests/iOS/{Device => Simulator}/CoreCLR/Program.cs (100%)
 rename src/tests/FunctionalTests/iOS/{Device => Simulator}/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj (100%)
 rename src/tests/FunctionalTests/iOS/{Device => Simulator}/CoreCLR/iOS.CoreCLR.R2R.Test.csproj (100%)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index d00e25e80c9313..ca30d8d869aee5 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -631,7 +631,7 @@
 
   <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst') and '$(RuntimeFlavor)' == 'CoreCLR' and '$(UseNativeAOTRuntime)' != 'true'">
     <SmokeTestProject Remove="@(SmokeTestProject)" />
-    <SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\CoreCLR\*.Test.csproj"/>
+    <SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj"/>
   </ItemGroup>
 
   <!--
diff --git a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
index ddbec01d8f5525..9e6be416d13598 100644
--- a/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
+++ b/src/tests/FunctionalTests/iOS/Device/Directory.Build.props
@@ -4,8 +4,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTestProject Condition="'$(IsTestProject)' == ''">true</IsTestProject>
-    <IsFunctionalTest>true</IsFunctionalTest>
   </PropertyGroup>
 
   <Import Project="..\..\..\..\libraries\Directory.Build.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/Program.cs b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/Program.cs
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/Program.cs
rename to src/tests/FunctionalTests/iOS/Simulator/CoreCLR/Program.cs
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
rename to src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.Interpreter.Test.csproj
diff --git a/src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
similarity index 100%
rename from src/tests/FunctionalTests/iOS/Device/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
rename to src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj

From 344780eb58536fbd92165609a1e1dac757dd1e2b Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 3 Dec 2025 12:33:15 +0100
Subject: [PATCH 17/18] Fix path

---
 src/libraries/tests.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index ca30d8d869aee5..297216ec4a9fb7 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -331,7 +331,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
-    <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Device\CoreCLR\*.Test.csproj" />
+    <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">

From 4e7496cb6a319ee97cd284204d2e30d45371eb50 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Thu, 4 Dec 2025 12:24:41 +0100
Subject: [PATCH 18/18] Use TargetsAppleMobile

---
 src/libraries/tests.proj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 297216ec4a9fb7..be21dbbb891514 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -296,7 +296,7 @@
     <ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst') and '$(RunDisablediOSTests)' != 'true'">
+  <ItemGroup Condition="'$(TargetsAppleMobile)' == 'true' and '$(RunDisablediOSTests)' != 'true'">
     <!-- PNSE -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj" />
     <!-- https://github.com/dotnet/runtime/issues/51414 -->
@@ -330,7 +330,7 @@
     <ProjectExclusions Include="$(RepoRoot)/src/tests/FunctionalTests/iOS/Simulator/LibraryMode/iOS.Simulator.LibraryMode.Test.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
+  <ItemGroup Condition="'$(TargetsAppleMobile)' == 'true' and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
     <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj" />
   </ItemGroup>
 
@@ -629,7 +629,7 @@
     <ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\NativeAOT\*.Test.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst') and '$(RuntimeFlavor)' == 'CoreCLR' and '$(UseNativeAOTRuntime)' != 'true'">
+  <ItemGroup Condition="'$(TargetsAppleMobile)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(UseNativeAOTRuntime)' != 'true'">
     <SmokeTestProject Remove="@(SmokeTestProject)" />
     <SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj"/>
   </ItemGroup>