[net11.0] Make CoreCLR the default runtime.

dotnet/targets/Microsoft.Sdk.R2R.targets

@@ -154,27 +154,34 @@
 		</_CreateR2RFrameworkDependsOn>
 	</PropertyGroup>
 
-	<!-- Prepare properties and item groups for r2r framework creation -->
-	<Target Name="_PrepareR2RFrameworkCreation"
-			DependsOnTargets="CreateReadyToRunImages"
-			>
-		<PropertyGroup>
-			<_DesktopFramework Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</_DesktopFramework>
-			<_DesktopFramework Condition="'$(_PlatformName)' != 'macOS' And '$(_PlatformName)' != 'MacCatalyst'">false</_DesktopFramework>
+	<!-- Properties for R2R framework creation.
+		Declared outside any target so they are available at evaluation time,
+		including in multi-RID outer builds where _PrepareR2RFrameworkCreation
+		may not have run yet (e.g. _CollectR2RFrameworksForPostProcessing). -->
+	<PropertyGroup>
+		<_DesktopFramework Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</_DesktopFramework>
+		<_DesktopFramework Condition="'$(_PlatformName)' != 'macOS' And '$(_PlatformName)' != 'MacCatalyst'">false</_DesktopFramework>
 
-			<_R2RFrameworkBinaryInfix Condition="'$(_DesktopFramework)' == 'true'">/Versions/A</_R2RFrameworkBinaryInfix>
-			<_R2RFrameworkResourcesInfix Condition="'$(_DesktopFramework)' == 'true'">/Versions/A/Resources</_R2RFrameworkResourcesInfix>
+		<_R2RFrameworkBinaryInfix Condition="'$(_DesktopFramework)' == 'true'">/Versions/A</_R2RFrameworkBinaryInfix>
+		<_R2RFrameworkResourcesInfix Condition="'$(_DesktopFramework)' == 'true'">/Versions/A/Resources</_R2RFrameworkResourcesInfix>
 
-			<_R2RFrameworkIntermediateOutputPath Condition="'$(_R2RFrameworkIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rframework/</_R2RFrameworkIntermediateOutputPath>
-			<_R2RFrameworkName Condition="'$(_R2RFrameworkName)' == ''">$(AssemblyName)</_R2RFrameworkName>
-			<_R2RFrameworkPath Condition="'$(_R2RFrameworkPath)' == ''">$(_R2RFrameworkIntermediateOutputPath)$(_R2RFrameworkName).framework</_R2RFrameworkPath>
-			<_R2RFrameworkOutput Condition="'$(_R2RFrameworkOutput)' == ''">$(_R2RFrameworkPath)$(_R2RFrameworkBinaryInfix)/$(_R2RFrameworkName)</_R2RFrameworkOutput>
+		<_R2RFrameworkIntermediateOutputPath Condition="'$(_R2RFrameworkIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rframework/</_R2RFrameworkIntermediateOutputPath>
+		<_R2RFrameworkName Condition="'$(_R2RFrameworkName)' == ''">$(AssemblyName)</_R2RFrameworkName>
+		<_R2RFrameworkPath Condition="'$(_R2RFrameworkPath)' == ''">$(_R2RFrameworkIntermediateOutputPath)$(_R2RFrameworkName).framework</_R2RFrameworkPath>
+		<_R2RFrameworkOutput Condition="'$(_R2RFrameworkOutput)' == ''">$(_R2RFrameworkPath)$(_R2RFrameworkBinaryInfix)/$(_R2RFrameworkName)</_R2RFrameworkOutput>
 
-			<_R2RFrameworkStructureStampFile>$(_R2RFrameworkIntermediateOutputPath)$(_R2RFrameworkName)-structure.stamp</_R2RFrameworkStructureStampFile>
+		<_R2RFrameworkStructureStampFile>$(_R2RFrameworkIntermediateOutputPath)$(_R2RFrameworkName)-structure.stamp</_R2RFrameworkStructureStampFile>
 
-			<_R2RFrameworkInfoPlistPath>$(_R2RFrameworkPath)$(_R2RFrameworkResourcesInfix)/Info.plist</_R2RFrameworkInfoPlistPath>
-		</PropertyGroup>
+		<_R2RFrameworkInfoPlistPath>$(_R2RFrameworkPath)$(_R2RFrameworkResourcesInfix)/Info.plist</_R2RFrameworkInfoPlistPath>
 
+		<_R2RFrameworkCachePath>$(_R2RFrameworkIntermediateOutputPath)cache.txt</_R2RFrameworkCachePath>
+		<_R2RFrameworkCachePath2>$(_R2RFrameworkCachePath).uptodate</_R2RFrameworkCachePath2>
+	</PropertyGroup>
+
+	<!-- Prepare item groups for r2r framework creation -->
+	<Target Name="_PrepareR2RFrameworkCreation"
+			DependsOnTargets="CreateReadyToRunImages"
+			>
 		<ItemGroup>
 			<_R2RFrameworkDirectories Include="$(_R2RFrameworkPath)" />
 
@@ -195,10 +202,6 @@
 		</ItemGroup>
 
 		<!-- write a hash of all the relevant input so that we can force a re-link if necessary -->
-		<PropertyGroup>
-			<_R2RFrameworkCachePath>$(_R2RFrameworkIntermediateOutputPath)cache.txt</_R2RFrameworkCachePath>
-			<_R2RFrameworkCachePath2>$(_R2RFrameworkCachePath).uptodate</_R2RFrameworkCachePath2>
-		</PropertyGroup>
 		<ItemGroup>
 			<_R2RFrameworkCache Include="@(_R2RFrameworkInputs)" />
 			<_R2RFrameworkCache Include="@(_R2RFrameworkLinkerFlags)" />
@@ -305,7 +308,7 @@
 	</Target>
 
 	<Target Name="_CreateR2RFramework"
-			Condition="'$(CreateR2RFramework)' == 'true'"
+			Condition="'$(CreateR2RFramework)' == 'true' And '$(IsMacEnabled)' != 'false'"
 			DependsOnTargets="$(_CreateR2RFrameworkDependsOn)"
 			AfterTargets="CreateReadyToRunImages"
 	/>
@@ -324,7 +327,7 @@
 			DependsOnTargets="CreateReadyToRunImages"
 			>
 		<PropertyGroup>
-			<_R2RDylibIntermediateOutputPath Condition="'$(_R2RFrameworkIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rdylib/</_R2RDylibIntermediateOutputPath>
+			<_R2RDylibIntermediateOutputPath Condition="'$(_R2RDylibIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rdylib/</_R2RDylibIntermediateOutputPath>
 			<_R2RDylibName Condition="'$(_R2RDylibName)' == ''">$(AssemblyName)</_R2RDylibName>
 			<_R2RDylibPath Condition="'$(_R2RDylibPath)' == ''">$(_R2RDylibIntermediateOutputPath)</_R2RDylibPath>
 			<_R2RDylibOutput Condition="'$(_R2RDylibOutput)' == ''">$(_R2RDylibPath)$(_R2RDylibName).r2r.dylib</_R2RDylibOutput>
@@ -398,7 +401,7 @@
 	</Target>
 
 	<Target Name="_CreateR2RDylib"
-			Condition="'$(CreateR2RDylib)' == 'true'"
+			Condition="'$(CreateR2RDylib)' == 'true' And '$(IsMacEnabled)' != 'false'"
 			DependsOnTargets="$(_CreateR2RDylibDependsOn)"
 			AfterTargets="CreateReadyToRunImages"
 	/>

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -37,9 +37,7 @@
 		-->
 		<_UseNativeAot Condition="'$(PublishAot)' == 'true' And '$(_IsPublishing)' == 'true'">true</_UseNativeAot>
 
-		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_PlatformName)' == 'macOS'">false</UseMonoRuntime>
-		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_UseNativeAot)' == 'true'">false</UseMonoRuntime>
-		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == ''">true</UseMonoRuntime>
+		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == ''">false</UseMonoRuntime>
 
 		<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets</AfterMicrosoftNETSdkTargets>
 
@@ -91,6 +89,7 @@
 
 		<!-- Tell .NET to skip sanity checks that trigger too eagerly for builds with multiple RuntimeIdentifiers -->
 		<AllowPublishAotWithoutRuntimeIdentifier Condition="'$(AllowPublishAotWithoutRuntimeIdentifier)' == '' And '$(_UseNativeAot)' == 'true'">true</AllowPublishAotWithoutRuntimeIdentifier>
+		<AllowReadyToRunWithoutRuntimeIdentifier Condition="'$(AllowReadyToRunWithoutRuntimeIdentifier)' == '' And '$(RuntimeIdentifiers)' != '' And '$(RuntimeIdentifier)' == ''">true</AllowReadyToRunWithoutRuntimeIdentifier>
 		<AllowSelfContainedWithoutRuntimeIdentifier Condition="'$(AllowSelfContainedWithoutRuntimeIdentifier)' == ''">true</AllowSelfContainedWithoutRuntimeIdentifier>
 
 		<!--

msbuild/Xamarin.MacDev.Tasks/Tasks/MergeAppBundles.cs

@@ -186,19 +186,16 @@ public bool IsIdenticalTo (Entry other)
 				return true;
 			}
 
-			public void CopyTo (string outputDirectory, string? subDirectory = null)
+			public void CopyTo (string outputDirectory, string? subDirectory = null, Entry? dependentOn = null)
 			{
 				string outputFile;
 
 				if (subDirectory is null) {
 					outputFile = Path.Combine (outputDirectory, RelativePath);
 				} else {
-					var relativeAppDir = Path.GetDirectoryName (RelativePath);
-					if (string.IsNullOrEmpty (relativeAppDir)) {
-						outputFile = Path.Combine (outputDirectory, subDirectory, RelativePath);
-					} else {
-						outputFile = Path.Combine (outputDirectory, relativeAppDir, subDirectory, Path.GetFileName (RelativePath));
-					}
+					var outputRelativePath = Path.GetDirectoryName (dependentOn?.RelativePath ?? RelativePath) ?? "";
+					var outputRelativeName = RelativePath.Substring (outputRelativePath.Length).TrimStart ('/');
+					outputFile = Path.Combine (outputDirectory, outputRelativePath, subDirectory, outputRelativeName);
 				}
 
 				if (Type == FileType.Directory) {
@@ -221,7 +218,7 @@ public void CopyTo (string outputDirectory, string? subDirectory = null)
 
 				if (DependentFiles is not null) {
 					foreach (var file in DependentFiles)
-						file.CopyTo (outputDirectory, subDirectory);
+						file.CopyTo (outputDirectory, subDirectory, this);
 				}
 			}
 		}

runtime/Makefile

@@ -93,8 +93,8 @@ MONOTOUCH_ARM64_SOURCE_STEMS = $(patsubst %.s,%,$(patsubst %.m,%,$(SHARED_ARM64_
 # .NET
 #
 
-DOTNET_iOS_LIBRARIES = libextension-dotnet.a
-DOTNET_tvOS_LIBRARIES = libextension-dotnet.a libtvextension-dotnet.a
+DOTNET_iOS_LIBRARIES = libextension-dotnet.a libextension-dotnet-coreclr.a
+DOTNET_tvOS_LIBRARIES = libextension-dotnet.a libtvextension-dotnet.a libextension-dotnet-coreclr.a libtvextension-dotnet-coreclr.a
 DOTNET_macOS_LIBRARIES = libextension-dotnet-coreclr.a
 DOTNET_MacCatalyst_LIBRARIES =
 

scripts/run-with-timeout/README.md

@@ -3,9 +3,11 @@
 This script runs an external process with a few extra features:
 
 * The process will be killed if it takes longer than the specified timeout.
-* The process will be killed if it doesn't launch within 10 seconds. This is
-  implemented by passing the environment variable `LAUNCH_SENTINEL_FILE` (with
-  a path to a file) to the process, which has 10 seconds to create said file.
+* The process will be killed if it doesn't launch within 10 seconds by default.
+  This is implemented by passing the environment variable
+  `LAUNCH_SENTINEL_FILE` (with a path to a file) to the process, which has 10
+  seconds to create said file. Set `LAUNCH_TIMEOUT_SECONDS` to override the
+  default launch timeout when needed.
 * If the launch timed out, the process will be relaunched, up to a maximum of
   10 attempts.
 

scripts/run-with-timeout/run-with-timeout.cs

@@ -12,6 +12,9 @@
 }
 
 var launchTimeout = TimeSpan.FromSeconds (10); // must launch within a few seconds.
+var launchTimeoutValue = Environment.GetEnvironmentVariable ("LAUNCH_TIMEOUT_SECONDS");
+if (int.TryParse (launchTimeoutValue, out var launchTimeoutSeconds) && launchTimeoutSeconds > 0)
+	launchTimeout = TimeSpan.FromSeconds (launchTimeoutSeconds);
 var argIndex = 0;
 var executionTimeout = TimeSpan.FromSeconds (int.Parse (args [argIndex++]));
 var commands = args.Skip (argIndex).ToArray ();