From 32e4d05195abe86c5a02ed38a0abd232cd5f47aa Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 16 Mar 2021 18:32:04 +0100
Subject: [PATCH] [dotnet] Add support for specifying the VM with the
 _XamarinRuntime property. (#10881)

Use a private property (prefixed with underscore) for now, until we can decide
on a better/general name.

Also add a variation to xharness to build monotouch-test with CoreCLR
(building works fine, but it crashes at startup, which is expected at this
point).
---
 dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets | 2 +-
 dotnet/targets/Xamarin.Shared.Sdk.targets              | 9 ++++++---
 tests/xharness/Harness.cs                              | 1 +
 tests/xharness/Jenkins/TestData.cs                     | 1 +
 tests/xharness/Jenkins/TestVariationsFactory.cs        | 7 +++++++
 tools/common/Application.cs                            | 1 +
 tools/common/Target.cs                                 | 3 ++-
 tools/common/XamarinRuntime.cs                         | 6 ++++++
 tools/dotnet-linker/LinkerConfiguration.cs             | 6 ++++++
 tools/dotnet-linker/dotnet-linker.csproj               | 3 +++
 tools/mmp/mmp.csproj                                   | 3 +++
 tools/mtouch/mtouch.csproj                             | 3 +++
 12 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 tools/common/XamarinRuntime.cs

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
index c616714bb530..62b3f7fffff4 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
@@ -89,7 +89,7 @@
        The problem is that by default we get the 'Microsoft.NETCore.App.Runtime.osx-x64' runtime pack (the core clr version), when we want the 'Microsoft.NETCore.App.Mono.Runtime.osx-x64' runtime pack.
        This works around that by declaring a new known framework for mono's runtime pack, removing the default 'Microsoft.NETCore.App' framework reference, and adding the mono one.
    -->
-  <ItemGroup Condition="'$(_PlatformName)' == 'macOS'">
+  <ItemGroup Condition="'$(_PlatformName)' == 'macOS' And '$(_XamarinRuntime)' != 'CoreCLR'">
     <KnownFrameworkReference Include="Microsoft.NETCore.App.Mono"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.NETCore.App.Mono"
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 136499be9418..cb11ca1a44b9 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -260,6 +260,7 @@
 				TargetArchitectures=$(TargetArchitectures)
 				TargetFramework=$(_ComputedTargetFrameworkMoniker)
 				Verbosity=$(_BundlerVerbosity)
+				XamarinRuntime=$(_XamarinRuntime)
 			</_CustomLinkerOptions>
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)"</_ExtraTrimmerArgs>
 
@@ -379,8 +380,9 @@
 
 	<Target Name="_ComputeFrameworkVariables" DependsOnTargets="ResolveRuntimePackAssets">
 		<PropertyGroup>
-			<_MonoNugetPackageId Condition="'$(_PlatformName)' != 'macOS'">Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)</_MonoNugetPackageId>
-			<_MonoNugetPackageId Condition="'$(_PlatformName)' == 'macOS'">Microsoft.NETCore.App.Runtime.Mono.$(RuntimeIdentifier)</_MonoNugetPackageId>
+			<_PackageIdInfix Condition="'$(_XamarinRuntime)' != 'CoreCLR' And '$(_PlatformName)' == 'macOS'">Mono.</_PackageIdInfix>
+
+			<_MonoNugetPackageId>Microsoft.NETCore.App.Runtime.$(_PackageIdInfix)$(RuntimeIdentifier)</_MonoNugetPackageId>
 		</PropertyGroup>
 		<ItemGroup>
 			<!-- Look in the ResolvedFrameworkReference for our Microsoft.* package. This should only find a single package. -->
@@ -428,8 +430,9 @@
 			<_LibXamarinLinkMode Condition="'$(_LibXamarinLinkMode)' == ''">static</_LibXamarinLinkMode>
 			<_LibXamarinExtension Condition="'$(_LibXamarinLinkMode)' == 'dylib'">dylib</_LibXamarinExtension>
 			<_LibXamarinExtension Condition="'$(_LibXamarinLinkMode)' == 'static'">a</_LibXamarinExtension>
+			<_LibXamarinRuntime Condition="'$(_XamarinRuntime)' == 'CoreCLR'">-coreclr</_LibXamarinRuntime>
 			<_LibXamarinDebug Condition="'$(_BundlerDebug)' == 'true'">-debug</_LibXamarinDebug>
-			<_LibXamarinName Condition="'$(_LibXamarinName)' == ''">libxamarin-dotnet$(_LibXamarinDebug).$(_LibXamarinExtension)</_LibXamarinName>
+			<_LibXamarinName Condition="'$(_LibXamarinName)' == ''">libxamarin-dotnet$(_LibXamarinRuntime)$(_LibXamarinDebug).$(_LibXamarinExtension)</_LibXamarinName>
 
 		</PropertyGroup>
 
diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
index 43ed1f3bd2f9..1417daa408b8 100644
--- a/tests/xharness/Harness.cs
+++ b/tests/xharness/Harness.cs
@@ -293,6 +293,7 @@ int AutoConfigureMac (bool generate_projects)
 				Name = "monotouch-test",
 				IsDotNetProject = true,
 				TargetFrameworkFlavors = MacFlavors.DotNet,
+				Platform = "AnyCPU",
 			});
 
 			foreach (var flavor in new MonoNativeFlavor [] { MonoNativeFlavor.Compat, MonoNativeFlavor.Unified }) {
diff --git a/tests/xharness/Jenkins/TestData.cs b/tests/xharness/Jenkins/TestData.cs
index e5966a0b5c91..5bdeefe7f49f 100644
--- a/tests/xharness/Jenkins/TestData.cs
+++ b/tests/xharness/Jenkins/TestData.cs
@@ -18,6 +18,7 @@ class TestData
 		public bool? Ignored;
 		public bool EnableSGenConc;
 		public bool UseThumb;
+		public string XamarinRuntime;
 		public MonoNativeLinkMode MonoNativeLinkMode;
 		public IEnumerable<IDevice> Candidates;
 	}
diff --git a/tests/xharness/Jenkins/TestVariationsFactory.cs b/tests/xharness/Jenkins/TestVariationsFactory.cs
index b966568ffb54..df9b1a3f02f1 100644
--- a/tests/xharness/Jenkins/TestVariationsFactory.cs
+++ b/tests/xharness/Jenkins/TestVariationsFactory.cs
@@ -115,6 +115,10 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 			case "AnyCPU":
 			case "x86":
 				switch (test.TestName) {
+				case "monotouch-test":
+					if (test.TestProject.IsDotNetProject)
+						yield return new TestData { Variation = "Debug (CoreCLR)", Debug = true, XamarinRuntime = "CoreCLR", Ignored = true, };
+					break;
 				case "xammac tests":
 					switch (test.ProjectConfiguration) {
 					case "Release":
@@ -157,6 +161,7 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 					var ignored = test_data.Ignored;
 					var known_failure = test_data.KnownFailure;
 					var candidates = test_data.Candidates;
+					var xamarin_runtime = test_data.XamarinRuntime;
 
 					if (task.TestProject.IsDotNetProject)
 						variation += " [dotnet]";
@@ -210,6 +215,8 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 
 						if (!debug && !isMac)
 							clone.Xml.SetMtouchUseLlvm (true, task.ProjectPlatform, configuration);
+						if (!string.IsNullOrEmpty (xamarin_runtime))
+							clone.Xml.SetTopLevelPropertyGroupValue ("_XamarinRuntime", xamarin_runtime);
 						clone.Xml.Save (clone.Path);
 					});
 
diff --git a/tools/common/Application.cs b/tools/common/Application.cs
index 3253b699fa61..ee9886ad7a18 100644
--- a/tools/common/Application.cs
+++ b/tools/common/Application.cs
@@ -131,6 +131,7 @@ public bool IsDefaultMarshalManagedExceptionMode {
 		public bool? DisableOmitFramePointer = null; // Only applicable to Xamarin.Mac
 		public string CustomBundleName = "MonoBundle"; // Only applicable to Xamarin.Mac and Mac Catalyst
 
+		public XamarinRuntime XamarinRuntime;
 		public bool? UseMonoFramework;
 
 		// The bitcode mode to compile to.
diff --git a/tools/common/Target.cs b/tools/common/Target.cs
index 249be9ed030f..70cc46acc6f8 100644
--- a/tools/common/Target.cs
+++ b/tools/common/Target.cs
@@ -785,7 +785,8 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 				sw.WriteLine ("\txamarin_gc_pump = {0};", app.DebugTrack.Value ? "TRUE" : "FALSE");
 			sw.WriteLine ("\txamarin_init_mono_debug = {0};", app.PackageManagedDebugSymbols ? "TRUE" : "FALSE");
 			sw.WriteLine ("\txamarin_executable_name = \"{0}\";", assembly_name);
-			sw.WriteLine ("\tmono_use_llvm = {0};", enable_llvm ? "TRUE" : "FALSE");
+			if (app.XamarinRuntime == XamarinRuntime.MonoVM)
+				sw.WriteLine ("\tmono_use_llvm = {0};", enable_llvm ? "TRUE" : "FALSE");
 			sw.WriteLine ("\txamarin_log_level = {0};", Driver.Verbosity.ToString (CultureInfo.InvariantCulture));
 			sw.WriteLine ("\txamarin_arch_name = \"{0}\";", abi.AsArchString ());
 			if (!app.IsDefaultMarshalManagedExceptionMode)
diff --git a/tools/common/XamarinRuntime.cs b/tools/common/XamarinRuntime.cs
new file mode 100644
index 000000000000..af78ec9c2e78
--- /dev/null
+++ b/tools/common/XamarinRuntime.cs
@@ -0,0 +1,6 @@
+namespace Xamarin.Bundler {
+	public enum XamarinRuntime {
+		MonoVM,
+		CoreCLR,
+	}
+}
diff --git a/tools/dotnet-linker/LinkerConfiguration.cs b/tools/dotnet-linker/LinkerConfiguration.cs
index fad60f153868..cb9917edcfb1 100644
--- a/tools/dotnet-linker/LinkerConfiguration.cs
+++ b/tools/dotnet-linker/LinkerConfiguration.cs
@@ -216,6 +216,11 @@ public static LinkerConfiguration GetInstance (LinkContext context, bool createI
 						throw new InvalidOperationException ($"Invalid Verbosity '{value}' in {linker_file}");
 					Driver.Verbosity += verbosity;
 					break;
+				case "XamarinRuntime":
+					if (!Enum.TryParse<XamarinRuntime> (value, out var rv))
+						throw new InvalidOperationException ($"Invalid XamarinRuntime '{value}' in {linker_file}");
+					Application.XamarinRuntime = rv;
+					break;
 				default:
 					throw new InvalidOperationException ($"Unknown key '{key}' in {linker_file}");
 				}
@@ -291,6 +296,7 @@ public void Write ()
 				Console.WriteLine ($"    SdkVersion: {SdkVersion}");
 				Console.WriteLine ($"    UseInterpreter: {Application.UseInterpreter}");
 				Console.WriteLine ($"    Verbosity: {Verbosity}");
+				Console.WriteLine ($"    XamarinRuntime: {Application.XamarinRuntime}");
 			}
 		}
 
diff --git a/tools/dotnet-linker/dotnet-linker.csproj b/tools/dotnet-linker/dotnet-linker.csproj
index 71afb5b5dc91..5dcbeed3d808 100644
--- a/tools/dotnet-linker/dotnet-linker.csproj
+++ b/tools/dotnet-linker/dotnet-linker.csproj
@@ -191,6 +191,9 @@
     <Compile Include="..\common\DlsymOptions.cs">
       <Link>external\tools\common\DlsymOptions.cs</Link>
     </Compile>
+    <Compile Include="..\common\XamarinRuntime.cs">
+      <Link>tools\common\XamarinRuntime.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\mtouch\Errors.resx">
diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj
index e6b821302444..a8a4867caa84 100644
--- a/tools/mmp/mmp.csproj
+++ b/tools/mmp/mmp.csproj
@@ -467,6 +467,9 @@
     <Compile Include="..\common\DlsymOptions.cs">
       <Link>tools\common\DlsymOptions.cs</Link>
     </Compile>
+    <Compile Include="..\common\XamarinRuntime.cs">
+      <Link>tools\common\XamarinRuntime.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/tools/mtouch/mtouch.csproj b/tools/mtouch/mtouch.csproj
index 494e77df995d..e8c2e55ec97d 100644
--- a/tools/mtouch/mtouch.csproj
+++ b/tools/mtouch/mtouch.csproj
@@ -481,6 +481,9 @@
     <Compile Include="..\common\DlsymOptions.cs">
       <Link>tools\common\DlsymOptions.cs</Link>
     </Compile>
+    <Compile Include="..\common\XamarinRuntime.cs">
+      <Link>tools\common\XamarinRuntime.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Core" />