From 045c69adc7b0cf6fe0e1e3efb4d4788d9c9fdb70 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Mon, 21 Apr 2025 12:58:58 +0100
Subject: [PATCH 01/13] try includes test runner for runtime tests

---
 src/tests/Directory.Build.targets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 328e2bb3b5d141..ab1361538c8044 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -20,8 +20,6 @@
 
     <!-- Merged test runner assemblies might not have any non-generated sources, and that's okay -->
     <NoWarn Condition="'$(IsMergedTestRunnerAssembly)' == 'true'">$(NoWarn);CS2008</NoWarn>
-
-    <IncludesTestRunner Condition="'$(TargetsAppleMobile)' == 'true'">false</IncludesTestRunner>
   </PropertyGroup>
 
   <!-- All CLRTests need to be of a certain "kind". These kinds are enumerated below.

From ec47c95d1411d6ba5ca566e9a3b6db1eb35ff51a Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Mon, 21 Apr 2025 19:05:14 +0100
Subject: [PATCH 02/13] don't write base64 xml runtime test results

---
 src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
index 03e8a6b35fcd6c..90a8cc25dc5946 100644
--- a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
+++ b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
@@ -79,7 +79,7 @@ public AppleEntryPoint(
         protected override bool IsXunit => true;
         protected override TestRunner GetTestRunner(LogWriter logWriter)
         {
-            var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionTable, writeBase64TestResults: true);
+            var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionTable, writeBase64TestResults: false);
             if (_methodNameToRun is not null)
             {
                 runner.SkipMethod(_methodNameToRun, isExcluded: false);

From 3861d0b2a9b747058308a29fc008a64cbeb03ca5 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 22 Apr 2025 13:36:13 +0100
Subject: [PATCH 03/13] disable the failing tests using ActiveIssue atrib.

---
 .../JIT/Directed/coverage/compiler/FilterToHandler.il    | 9 ++++++---
 .../JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs  | 1 +
 src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs         | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
index 0175d39a833c4d..90fac603eadad1 100644
--- a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
+++ b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
@@ -57,9 +57,12 @@ done2:
 
 .class public auto ansi FilterToHandler {
 .method public static int32 Main() {
-.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
-    01 00 00 00
-)
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = {}
+.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
+    string('https://github.com/dotnet/runtime/issues/114902')
+    type([TestLibrary]TestLibrary.PlatformDetection)
+    string[1] ('IsAppleMobile')
+}
 .entrypoint
 .maxstack	20
   .try
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
index 81a234637a5c41..24d43615dd0018 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
@@ -16,6 +16,7 @@ public unsafe struct GitHub_23791
     byte NextElement(int i) => A[1+i];
 
     [Fact]
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/114908", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
     public static int TestEntryPoint() 
     {
         int result = -1;
diff --git a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
index 0d18e7bf535145..46cb5aea267b42 100644
--- a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
+++ b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
@@ -8,6 +8,7 @@
 public unsafe class MemsetMemcpyNullref
 {
     [Fact]
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/98628", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
     public static void MemsetMemcpyThrowNullRefonNull()
     {
         Assert.Throws<NullReferenceException>(() => MemoryInit(null));

From 28856b763257f9d1b3324db2981b61a354394680 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 22 Apr 2025 18:25:20 +0100
Subject: [PATCH 04/13] add XUnitExtensions to il file

---
 src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
index 90fac603eadad1..b7727e7b11d377 100644
--- a/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
+++ b/src/tests/JIT/Directed/coverage/compiler/FilterToHandler.il
@@ -9,6 +9,8 @@
   .ver 4:0:0:0
 }
 .assembly extern xunit.core {}
+.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
+.assembly extern TestLibrary { .ver 0:0:0:0 }
 .assembly extern mscorlib {}
 .assembly extern common {}
 .assembly 'FilterToHandler' {}

From 3da733804dec5099047d745f972e9cc69b2343a4 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 22 Apr 2025 19:18:59 +0100
Subject: [PATCH 05/13] add TestLibrary to MemsetMemcpyNullref.cs

---
 src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
index 46cb5aea267b42..2faafae90705f2 100644
--- a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
+++ b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Xunit;
+using TestLibrary;
 
 public unsafe class MemsetMemcpyNullref
 {

From 795817e71303bc486129a4805bc14a22a44b41b2 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 22 Apr 2025 20:35:54 +0100
Subject: [PATCH 06/13] add CoreCLRTestLibrary

---
 src/tests/JIT/opt/Structs/MemsetMemcpyNullref.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.csproj b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.csproj
index 23d7b90be5361c..8291bcb99a776b 100644
--- a/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.csproj
+++ b/src/tests/JIT/opt/Structs/MemsetMemcpyNullref.csproj
@@ -7,4 +7,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs"/>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
 </Project>

From 0f28ed541e4d82789b49eb2e43b224780100d816 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Wed, 23 Apr 2025 09:30:55 +0100
Subject: [PATCH 07/13] add TestLibrary to GitHub_23791

---
 src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs  | 1 +
 .../JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.csproj    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
index 24d43615dd0018..d012cc00c46c41 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Xunit;
+using TestLibrary;
 
 // The jit should null check 'this' in NextElement
 
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.csproj b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.csproj
index f5f3ecae247d5f..ffbec1f22cc308 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.csproj
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23791/GitHub_23791.csproj
@@ -7,4 +7,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
 </Project>

From f4cc6621c054ffa3de9b6adbbcb81c08bc40e881 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Wed, 23 Apr 2025 14:14:42 +0100
Subject: [PATCH 08/13] disable more Regression_3 tests

---
 .../Regression/JitBlue/GitHub_21990/GitHub_21990.cs   |  2 ++
 .../JitBlue/GitHub_21990/GitHub_21990.csproj          |  3 +++
 .../Regression/JitBlue/GitHub_27678/GitHub_27678.il   | 11 ++++++++---
 .../Regression/JitBlue/GitHub_35384/GitHub_35384.il   | 11 ++++++++---
 .../JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.cs |  2 ++
 .../Regression/JitBlue/GitHub_4044/GitHub_4044.csproj |  3 +++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.cs b/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.cs
index 854d0f0e5882fd..6d107a54cebd25 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.cs
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Xunit;
+using TestLibrary;
 
 // Test to stress FP-relative addressing of generics context slot on ARM64. "str" instruction has a 32760 byte offset limit.
 // And normally, the frame pointer is at the bottom of the frame and the stored generics context at the top. If the locals
@@ -573,6 +574,7 @@ public static int TestGenericContext<T>(int x)
     }
 
     [Fact]
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/46622", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
     public static int TestEntryPoint()
     {
         const int Pass = 100;
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj b/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj
index 501217e4d86892..a4dc1b8fae4df9 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj
@@ -6,4 +6,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_27678/GitHub_27678.il b/src/tests/JIT/Regression/JitBlue/GitHub_27678/GitHub_27678.il
index dd4ddac38e011b..b889a89b2f20e4 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_27678/GitHub_27678.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_27678/GitHub_27678.il
@@ -22,6 +22,8 @@
 .assembly extern System.Diagnostics.Debug {}
 .assembly GitHub_27678 {}
 .assembly extern xunit.core {}
+.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
+.assembly extern TestLibrary { .ver 0:0:0:0 }
 
 .class private sequential ansi sealed beforefieldinit AStruct
        extends [System.Runtime]System.ValueType
@@ -167,9 +169,12 @@
 
   .method public hidebysig static int32  Main() cil managed
   {
-    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
-        01 00 00 00
-    )
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = {}
+    .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
+        string('https://github.com/dotnet/runtime/issues/114908')
+        type([TestLibrary]TestLibrary.PlatformDetection)
+        string[1] ('IsAppleMobile')
+    }
     .entrypoint
     // Code size       62 (0x3e)
     .maxstack  3
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_35384/GitHub_35384.il b/src/tests/JIT/Regression/JitBlue/GitHub_35384/GitHub_35384.il
index 9391210ea07a43..65c7948aea41d9 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_35384/GitHub_35384.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_35384/GitHub_35384.il
@@ -6,6 +6,8 @@
 .assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 .assembly GitHub_35384 {}
 .assembly extern xunit.core {}
+.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
+.assembly extern TestLibrary { .ver 0:0:0:0 }
 
 .class private sequential ansi sealed beforefieldinit Struct
        extends [System.Runtime]System.ValueType
@@ -40,9 +42,12 @@
   
   .method public hidebysig static int32 Main() cil managed
   {
-    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
-        01 00 00 00
-    )
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = {}
+    .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
+        string('https://github.com/dotnet/runtime/issues/114908')
+        type([TestLibrary]TestLibrary.PlatformDetection)
+        string[1] ('IsAppleMobile')
+    }
     .entrypoint
     .maxstack 1
     call       string Program::ValueTypeExplicitThisInstanceMethodCalli()
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.cs b/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.cs
index a23dcfa21865e4..34447a091c1161 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.cs
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Runtime.CompilerServices;
 using Xunit;
+using TestLibrary;
 
 public class C
 {
     [Fact]
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/114908", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
     public static int TestEntryPoint()
     {
         int error = Test1();
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj b/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
index de6d5e08882e86..d50b23efc171bb 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
@@ -5,4 +5,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
 </Project>

From 9155da375784f936640b127439d7814645095213 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Thu, 24 Apr 2025 13:37:51 +0100
Subject: [PATCH 09/13] try BuildAsStandalone=true

---
 src/tests/managed/Managed.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/managed/Managed.csproj b/src/tests/managed/Managed.csproj
index 305a3dfa0b613b..17f84f27c6b009 100644
--- a/src/tests/managed/Managed.csproj
+++ b/src/tests/managed/Managed.csproj
@@ -4,7 +4,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <BuildAsStandalone>false</BuildAsStandalone>
+    <BuildAsStandalone>true</BuildAsStandalone>
   </PropertyGroup>
 
   <Import Project="$(TestSourceDir)MergedTestRunner.targets" />

From 2d2c2725376bd7688084a501c54022a7969da667 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Thu, 24 Apr 2025 18:19:46 +0100
Subject: [PATCH 10/13] try testing runtime tests on maccatalyst

---
 .../runtime-extra-platforms-maccatalyst.yml   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
index 4ffece996d9cdc..8b1b2dbc59962c 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
@@ -43,6 +43,55 @@ jobs:
             creator: dotnet-bot
             testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
+#
+# MacCatalyst interp - requires AOT Compilation and Interp flags
+# Build the whole product using Mono and run runtime tests
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+    buildConfig: Release
+    runtimeFlavor: mono
+    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    platforms:
+      - maccatalyst_x64
+      - maccatalyst_arm64
+    variables:
+      # map dependencies variables to local variables
+      - name: librariesContainsChange
+        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+      - name: monoContainsChange
+        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+        - name: _HelixSource
+          value: pr/dotnet/runtime/$(Build.SourceBranch)
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+        - name: _HelixSource
+          value: ci/dotnet/runtime/$(Build.SourceBranch)
+      - name: timeoutPerTestInMinutes
+        value: 60
+      - name: timeoutPerTestCollectionInMinutes
+        value: 180
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: AllSubsets_Mono_RuntimeTests
+      buildArgs: -s mono+libs -c $(_BuildConfig)
+      timeoutInMinutes: 240
+      # extra steps, run tests
+      extraVariablesTemplates:
+        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
+          parameters:
+            testGroup: innerloop
+      postBuildSteps:
+        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+          parameters:
+            creator: dotnet-bot
+            testBuildArgs: /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
+            compileOnHelix: true
+            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+
 #
 # MacCatalyst interp - requires AOT Compilation and Interp flags
 # Build the whole product using Mono and run libraries tests

From 3cf8ffcb589a5ba68bccc1a26f54adf058e3b57d Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 29 Apr 2025 08:49:24 +0100
Subject: [PATCH 11/13] UseMonoRuntime AppleBuild

---
 src/mono/msbuild/apple/build/AppleBuild.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets
index f219652d697631..c686768b27621a 100644
--- a/src/mono/msbuild/apple/build/AppleBuild.targets
+++ b/src/mono/msbuild/apple/build/AppleBuild.targets
@@ -7,6 +7,7 @@
     <_ProcessRuntimeComponentsForLibraryMode Condition="'$(_IsLibraryMode)' == 'true' and '$(UseNativeAOTRuntime)' != 'true'">_ProcessRuntimeComponentsForLibraryMode</_ProcessRuntimeComponentsForLibraryMode>
     <EnableDefaultAssembliesToBundle Condition="'$(EnableDefaultAssembliesToBundle)' == ''">false</EnableDefaultAssembliesToBundle>
     <UseSystemZlib Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'android' or '$(TargetArchitecture)' == 'armv6'">true</UseSystemZlib>
+    <UseMonoRuntime Condition="'$(RuntimeFlavor)' == 'mono'">true</UseMonoRuntime>
   </PropertyGroup>
 
   <UsingTask Condition="'$(AppleGenerateAppBundle)' == 'true'"

From 886d52afdb6094acd3cec8af36d1e495ae0e2401 Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Tue, 29 Apr 2025 08:50:27 +0100
Subject: [PATCH 12/13] Revert "try BuildAsStandalone=true"

This reverts commit 9155da375784f936640b127439d7814645095213.
---
 src/tests/managed/Managed.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/managed/Managed.csproj b/src/tests/managed/Managed.csproj
index 17f84f27c6b009..305a3dfa0b613b 100644
--- a/src/tests/managed/Managed.csproj
+++ b/src/tests/managed/Managed.csproj
@@ -4,7 +4,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <BuildAsStandalone>true</BuildAsStandalone>
+    <BuildAsStandalone>false</BuildAsStandalone>
   </PropertyGroup>
 
   <Import Project="$(TestSourceDir)MergedTestRunner.targets" />

From 127d5ecda10d30ded4a6de63237d693b6a224e0b Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Sat, 7 Jun 2025 16:20:52 +0200
Subject: [PATCH 13/13] disable Managed test suit on non-Windows Mono conf

---
 src/tests/managed/Managed.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/tests/managed/Managed.csproj b/src/tests/managed/Managed.csproj
index 305a3dfa0b613b..f622053ed9d452 100644
--- a/src/tests/managed/Managed.csproj
+++ b/src/tests/managed/Managed.csproj
@@ -1,4 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+      <!-- disable building for mono until https://github.com/dotnet/xharness/pull/1416 is merged -->
+      <DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono' and '$(TargetsWindows)' != 'true'">true</DisableProjectBuild>    
+  </PropertyGroup>
+
   <ItemGroup>
     <MergedWrapperProjectReference Include="*/**/*.??proj" />
   </ItemGroup>