diff --git a/dotnet/targets/Microsoft.Sdk.R2R.targets b/dotnet/targets/Microsoft.Sdk.R2R.targets
index b20190e56ef9..d33eb253e862 100644
--- a/dotnet/targets/Microsoft.Sdk.R2R.targets
+++ b/dotnet/targets/Microsoft.Sdk.R2R.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<UsingTask Runtime="$(_TaskRuntime)" TaskName="Xamarin.MacDev.Tasks.ComputeInstructionSet" AssemblyFile="$(_TaskAssemblyName)" />
+	<UsingTask Runtime="$(_TaskRuntime)" TaskName="Xamarin.MacDev.Tasks.GenerateR2RModuleRegistration" AssemblyFile="$(_TaskAssemblyName)" />
 
 	<!-- Workaround until https://github.com/dotnet/sdk/pull/52480 is merged -->
 	<Target Name="_LinkReadyToRunMachO">
@@ -21,13 +22,25 @@
 		</ItemGroup>
 	</Target>
 
+	<!-- Set per-module R2R header symbol names so each .o file exports a unique symbol directly,
+	     avoiding the need for post-link symbol aliasing. -->
+	<Target Name="_SetR2RHeaderSymbolNames"
+			Condition="'$(PublishReadyToRunComposite)' == 'true' And '$(PublishReadyToRunContainerFormat)' == 'macho'"
+			AfterTargets="_FixR2ROutputPaths">
+		<ItemGroup>
+			<_ReadyToRunCompileList>
+				<R2RHeaderSymbolName>RTR_HEADER_$([System.Text.RegularExpressions.Regex]::Replace ($([System.IO.Path]::GetFileName ('%(_ReadyToRunCompileList.OutputR2RImage)')), '[^a-zA-Z0-9_]', '_'))</R2RHeaderSymbolName>
+			</_ReadyToRunCompileList>
+		</ItemGroup>
+	</Target>
+
 	<!--
 		Compute the instruction set for R2R/NAOT compilation based on the SupportedOSPlatformVersion and RuntimeIdentifier.
 		This target runs early in the build to set PublishReadyToRunCrossgen2ExtraArgs if needed.
 		Set ComputeInstructionSetForReadyToRun to false to opt out of this computation.
 	-->
 	<Target Name="_ComputeInstructionSetForCrossgen2"
-		Condition="'$(PublishReadyToRun)' == 'true' And '$(ComputeInstructionSetForReadyToRun)' != 'false'"
+		Condition="'$(PublishReadyToRun)' == 'true' And '$(ComputeInstructionSetForReadyToRun)' != 'false' And '$(RuntimeIdentifiers)' == ''"
 		DependsOnTargets="_DetectSdkLocations"
 		BeforeTargets="ResolveReadyToRunCompilers">
 		<ComputeInstructionSet
@@ -56,8 +69,13 @@
 	</Target>
 
 	<!-- Workaround for https://github.com/dotnet/runtime/issues/122985 -->
-	<Target Name="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == 'true' And '$(UseMonoRuntime)' != 'true'">
-		<PropertyGroup>
+	<Target
+		Name="ResolveReadyToRunCompilers"
+		Condition="'$(PublishReadyToRun)' == 'true' And '$(UseMonoRuntime)' != 'true'">
+		<!-- In the outer multi-RID build (RuntimeIdentifier is empty), we still need to provide a
+		     Crossgen2Tool item so that PrepareForReadyToRunCompilation doesn't NullRef. The actual
+		     crossgen2 work only happens in the inner per-RID builds. -->
+		<PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
 			<_Crossgen2Path Condition="'$(Crossgen2Path)' != ''">$(Crossgen2Path)</_Crossgen2Path>
 			<_FlattenedCrossgen2Packs>@(ResolvedCrossgen2Pack->'%(PackageDirectory)')</_FlattenedCrossgen2Packs>
 			<_Crossgen2Path Condition="'$(Crossgen2Path)' == '' And !$([MSBuild]::IsOSPlatform('windows'))">$(_FlattenedCrossgen2Packs)/tools/crossgen2</_Crossgen2Path>
@@ -67,19 +85,24 @@
 			<_TargetOS>$(RuntimeIdentifier.Split('-')[0])</_TargetOS>
 		</PropertyGroup>
 
-		<ItemGroup>
+		<ItemGroup Condition="'$(RuntimeIdentifier)' != ''">
 			<Crossgen2Tool Include="$(_Crossgen2Path)"
 			               TargetArch="$(_TargetArch)"
 			               TargetOS="$(_TargetOS)"
 			               PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
 		</ItemGroup>
 
-		<Message Text="Using crossgen2: $(_Crossgen2Path)" Importance="high" />
-		<Message Text="  RuntimeIdentifier: $(RuntimeIdentifier)" Importance="high" />
-		<Message Text="  TargetArch: $(_TargetArch)" Importance="high" />
-		<Message Text="  TargetOS: $(_TargetOS)" Importance="high" />
+		<!-- Provide a placeholder Crossgen2Tool for the outer build so the SDK task doesn't NullRef -->
+		<ItemGroup Condition="'$(RuntimeIdentifier)' == ''">
+			<Crossgen2Tool Include="placeholder" TargetArch="arm64" TargetOS="osx" />
+		</ItemGroup>
+
+		<Message Condition="'$(RuntimeIdentifier)' != ''" Text="Using crossgen2: $(_Crossgen2Path)" Importance="high" />
+		<Message Condition="'$(RuntimeIdentifier)' != ''" Text="  RuntimeIdentifier: $(RuntimeIdentifier)" Importance="high" />
+		<Message Condition="'$(RuntimeIdentifier)' != ''" Text="  TargetArch: $(_TargetArch)" Importance="high" />
+		<Message Condition="'$(RuntimeIdentifier)' != ''" Text="  TargetOS: $(_TargetOS)" Importance="high" />
 
-		<Error Condition="!Exists('$(_Crossgen2Path)')" Text="The crossgen2 executable '$(_Crossgen2Path)' does not exist." />
+		<Error Condition="'$(RuntimeIdentifier)' != '' And !Exists('$(_Crossgen2Path)')" Text="The crossgen2 executable '$(_Crossgen2Path)' does not exist." />
 	</Target>
 
 	<!-- Set some default properties -->
@@ -96,7 +119,7 @@
 		User assembly is defined as anything not coming from a NuGet package.
 	-->
 	<Target Name="_SelectR2RAssemblies"
-			Condition="'$(FilterReadyToRunAssemblies)' == 'true'"
+			Condition="'$(FilterReadyToRunAssemblies)' == 'true' And '$(RuntimeIdentifiers)' == ''"
 			BeforeTargets="ResolveReadyToRunCompilers">
 		<ItemGroup>
 			<_ResolvedAssembliesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' == '.dll' And '%(ResolvedFileToPublish.Culture)' == '' And '%(ResolvedFileToPublish.DestinationSubDirectory)' == ''" />
@@ -139,25 +162,27 @@
 	</Target>
 
 	<!--
-		The following section is to create either a .dylib or a .framework from the Composite
-		ReadyToRun output (which is an object file, which must be linked into a dynamic library).
+		The following section creates either a .dylib or a .framework for each
+		ReadyToRun output (which is an object file that must be linked into a dynamic library).
+		Each R2R .o gets its own dylib/framework so that incremental builds only
+		relink the module whose .o changed.  Each .o exports a unique symbol
+		(RTR_HEADER_<module>) set via R2RHeaderSymbolName during compilation.
 	 -->
 
-	<!-- Create a framework from the composite R2R output -->
+	<!-- Create a framework for each R2R module -->
 	<PropertyGroup>
 		<_CreateR2RFrameworkDependsOn>
 			_CollectR2RObjectFilesForLinking;
-			_PrepareR2RFrameworkCreation;
-			_CreateR2RFrameworkStructure;
-			_ForceLinkR2RFramework;
-			_LinkR2RFramework;
+			_PrepareR2RModules;
+			_RegisterR2RNativeReferences;
+			_CreateR2RModuleFrameworks;
+			_AddR2RModuleRegistrationToMainFile;
 		</_CreateR2RFrameworkDependsOn>
 	</PropertyGroup>
 
-	<!-- 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). -->
+	<!-- Properties for per-module R2R framework/dylib creation.
+		Declared outside any target so they are available wherever the R2R modules are consumed,
+		including post-processing in multi-RID outer builds. -->
 	<PropertyGroup>
 		<_DesktopFramework Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</_DesktopFramework>
 		<_DesktopFramework Condition="'$(_PlatformName)' != 'macOS' And '$(_PlatformName)' != 'MacCatalyst'">false</_DesktopFramework>
@@ -165,84 +190,86 @@
 		<_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>
-
-		<_R2RFrameworkStructureStampFile>$(_R2RFrameworkIntermediateOutputPath)$(_R2RFrameworkName)-structure.stamp</_R2RFrameworkStructureStampFile>
-
-		<_R2RFrameworkInfoPlistPath>$(_R2RFrameworkPath)$(_R2RFrameworkResourcesInfix)/Info.plist</_R2RFrameworkInfoPlistPath>
-
-		<_R2RFrameworkCachePath>$(_R2RFrameworkIntermediateOutputPath)cache.txt</_R2RFrameworkCachePath>
-		<_R2RFrameworkCachePath2>$(_R2RFrameworkCachePath).uptodate</_R2RFrameworkCachePath2>
+		<_R2RModuleIntermediateOutputPath Condition="'$(_R2RModuleIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rframework/</_R2RModuleIntermediateOutputPath>
+		<_R2RModuleRegistrationFile>$(_R2RModuleIntermediateOutputPath)r2r_modules.mm</_R2RModuleRegistrationFile>
 	</PropertyGroup>
-
-	<!-- Prepare item groups for r2r framework creation -->
-	<Target Name="_PrepareR2RFrameworkCreation"
-			DependsOnTargets="CreateReadyToRunImages"
+	<!-- Compute per-module metadata from the collected R2R object files -->
+	<Target Name="_PrepareR2RModules"
+			DependsOnTargets="_CollectR2RObjectFilesForLinking"
 			>
+		<!-- For each .o file, compute module name, symbol name, and framework paths.
+		     The _ReadyToRunObjectFilesToLink items have the original .r2r.dylib filenames;
+		     _R2RObjectFilesForLinking items point to the actual .o files.
+		     We derive the module name from the _ReadyToRunObjectFilesToLink filename. -->
 		<ItemGroup>
-			<_R2RFrameworkDirectories Include="$(_R2RFrameworkPath)" />
-
-			<_R2RFrameworkInputs Include="@(_R2RObjectFilesForLinking)" />
-			<_R2RFrameworkLinkerFlags Include="-dynamiclib" />
-			<_R2RFrameworkLinkerFlags Include="-Wl,-dead_strip" />
-			<_R2RFrameworkLinkerFlags Include="-Wl,-install_name,@rpath/$(_R2RFrameworkName).framework/$(_R2RFrameworkName)" />
-
-			<_FrameworkNativeReference Include="$(_R2RFrameworkPath)/$(_R2RFrameworkName)" Kind="Framework" />
+			<_R2RModule Include="@(_ReadyToRunObjectFilesToLink)">
+				<!-- Use the full dylib filename (e.g. "introspection.r2r.dylib") as the module name -->
+				<ModuleName>%(Filename)%(Extension)</ModuleName>
+				<!-- Derive a short name (without .r2r.dylib) for framework/dylib naming -->
+				<ShortName>$([System.Text.RegularExpressions.Regex]::Replace ('%(Filename)', '\.r2r$', ''))</ShortName>
+				<!-- Sanitize the .o filename for C symbol: replace non-identifier chars with _.
+				     Must match the symbol derivation in _SetR2RHeaderSymbolNames (from OutputR2RImage, the .o file). -->
+				<SanitizedName>$([System.Text.RegularExpressions.Regex]::Replace ($([System.IO.Path]::GetFileName ('%(NativeLinkerInputPath)')), '[^a-zA-Z0-9_]', '_'))</SanitizedName>
+			</_R2RModule>
+			<_R2RModule Update="@(_R2RModule)">
+				<SymbolName>RTR_HEADER_%(SanitizedName)</SymbolName>
+				<ObjectFile>%(NativeLinkerInputPath)</ObjectFile>
+				<FrameworkName>%(ShortName).r2r</FrameworkName>
+				<FrameworkPath>$(_R2RModuleIntermediateOutputPath)%(ShortName).r2r.framework</FrameworkPath>
+				<FrameworkOutput>$(_R2RModuleIntermediateOutputPath)%(ShortName).r2r.framework$(_R2RFrameworkBinaryInfix)/%(ShortName).r2r</FrameworkOutput>
+				<InfoPlistPath>$(_R2RModuleIntermediateOutputPath)%(ShortName).r2r.framework$(_R2RFrameworkResourcesInfix)/Info.plist</InfoPlistPath>
+				<DylibOutput>$(_R2RModuleIntermediateOutputPath)%(ShortName).r2r.dylib</DylibOutput>
+			</_R2RModule>
 		</ItemGroup>
+	</Target>
 
-		<ItemGroup Condition="'$(_DesktopFramework)' == 'true'">
-			<_R2RFrameworkDirectories Include="$(_R2RFrameworkPath)/Versions/A/Resources" />
-
-			<_R2RFrameworkSymlinks Include="$(_R2RFrameworkPath)/Resources" SymlinkTo="Versions/A/Resources" />
-			<_R2RFrameworkSymlinks Include="$(_R2RFrameworkPath)/$(_R2RFrameworkName)" SymlinkTo="Versions/A/$(_R2RFrameworkName)" />
-			<_R2RFrameworkSymlinks Include="$(_R2RFrameworkPath)/Versions/Current" SymlinkTo="A" />
+	<!-- Register native references for all R2R modules - runs unconditionally so downstream targets always see them -->
+	<Target Name="_RegisterR2RNativeReferences"
+			DependsOnTargets="_PrepareR2RModules"
+			>
+		<ItemGroup Condition="'$(CreateR2RFramework)' == 'true'">
+			<_FrameworkNativeReference Include="@(_R2RModule->'%(FrameworkPath)/%(FrameworkName)')" Kind="Framework" />
 		</ItemGroup>
-
-		<!-- write a hash of all the relevant input so that we can force a re-link if necessary -->
-		<ItemGroup>
-			<_R2RFrameworkCache Include="@(_R2RFrameworkInputs)" />
-			<_R2RFrameworkCache Include="@(_R2RFrameworkLinkerFlags)" />
-			<_R2RFrameworkCache Include="$(_R2RFrameworkOutput)" />
-			<_R2RFrameworkCache Include="$(_MinimumOSVersion)" />
-		</ItemGroup>
-
-		<Hash
-			ItemsToHash="@(_R2RFrameworkCache)"
-			IgnoreCase="false">
-			<Output TaskParameter="HashResult" PropertyName="_R2RFrameworkCacheHash" />
-		</Hash>
-
-		<WriteLinesToFile Lines="$(_R2RFrameworkCacheHash)" File="$(_R2RFrameworkCachePath)" Overwrite="true" WriteOnlyWhenDifferent="true" />
-
-		<ItemGroup>
-			<FileWrites Include="$(_R2RFrameworkCachePath)" />
+		<ItemGroup Condition="'$(CreateR2RDylib)' == 'true'">
+			<_FileNativeReference Include="@(_R2RModule->'%(DylibOutput)')" Kind="Dynamic">
+				<RelativePath></RelativePath>
+			</_FileNativeReference>
 		</ItemGroup>
 	</Target>
 
-	<Target Name="_CreateR2RFrameworkStructure"
-			Outputs="$(_R2RFrameworkStructureStampFile)"
+	<!-- Create frameworks for each R2R module (iOS/tvOS) -->
+	<Target Name="_CreateR2RModuleFrameworks"
+			Condition="'$(CreateR2RFramework)' == 'true'"
+			Inputs="%(_R2RModule.ObjectFile)"
+			Outputs="%(_R2RModule.FrameworkOutput)"
 			>
 
+		<!-- Create framework directory structure -->
 		<MakeDir
 			SessionId="$(BuildSessionId)"
-			Directories="@(_R2RFrameworkDirectories)"
+			Directories="%(_R2RModule.FrameworkPath)"
+		/>
+
+		<!-- Desktop framework needs extra directories and symlinks -->
+		<MakeDir
+			SessionId="$(BuildSessionId)"
+			Condition="'$(_DesktopFramework)' == 'true'"
+			Directories="%(_R2RModule.FrameworkPath)/Versions/A/Resources"
 		/>
 
 		<Exec
 			SessionId="$(BuildSessionId)"
-			Command="ln -fs &quot;%(SymlinkTo)&quot; &quot;@(_R2RFrameworkSymlinks)&quot;"
-			Condition="@(_R2RFrameworkSymlinks->Count()) &gt; 0"
+			Command="ln -fs &quot;Versions/A/Resources&quot; &quot;%(_R2RModule.FrameworkPath)/Resources&quot; &amp;&amp; ln -fs &quot;Versions/A/%(_R2RModule.FrameworkName)&quot; &quot;%(_R2RModule.FrameworkPath)/%(_R2RModule.FrameworkName)&quot; &amp;&amp; ln -fs &quot;A&quot; &quot;%(_R2RModule.FrameworkPath)/Versions/Current&quot;"
+			Condition="'$(_DesktopFramework)' == 'true'"
 			/>
 
+		<!-- Generate Info.plist for this module's framework -->
 		<CompileAppManifest
 			SessionId="$(BuildSessionId)"
-			AppBundleName="$(_R2RFrameworkName)"
-			ApplicationId="$(_BundleIdentifier).r2rframework"
-			BundleExecutable="$(_R2RFrameworkName)"
-			CompiledAppManifest="$(_R2RFrameworkInfoPlistPath)"
+			AppBundleName="%(_R2RModule.FrameworkName)"
+			ApplicationId="$(_BundleIdentifier).r2r.%(_R2RModule.ShortName)"
+			BundleExecutable="%(_R2RModule.FrameworkName)"
+			CompiledAppManifest="%(_R2RModule.InfoPlistPath)"
 			DefaultSdkVersion="$(_SdkVersion)"
 			GenerateApplicationManifest="true"
 			IsAppExtension="false"
@@ -257,148 +284,127 @@
 			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
 			/>
 
-		<Touch
-			Files="$(_R2RFrameworkStructureStampFile)"
-			AlwaysCreate="True"
-			/>
-
+		<!-- Link the .o file into a dylib inside the framework -->
 		<ItemGroup>
-			<FileWrites Include="@(_R2RFrameworkSymlinks)" />
-			<FileWrites Include="$(_R2RFrameworkInfoPlistPath)" />
-			<FileWrites Include="$(_R2RFrameworkStructureStampFile)" />
+			<_CurrentR2RModuleLinkerFlags Remove="@(_CurrentR2RModuleLinkerFlags)" />
+			<_CurrentR2RModuleLinkerFlags Include="-dynamiclib" />
+			<_CurrentR2RModuleLinkerFlags Include="-Wl,-dead_strip" />
+			<_CurrentR2RModuleLinkerFlags Include="-Wl,-install_name,@rpath/%(_R2RModule.FrameworkName).framework/%(_R2RModule.FrameworkName)" />
 		</ItemGroup>
-	</Target>
 
-	<!-- force the r2r framework executable to be re-created by deleting the executable file-->
-	<Target Name="_ForceLinkR2RFramework"
-			Inputs="$(_R2RFrameworkCachePath)"
-			Outputs="$(_R2RFrameworkCachePath2)"
-			>
-		<Delete Files="$(_R2RFrameworkOutput)" />
-		<Copy SourceFiles="$(_R2RFrameworkCachePath)" DestinationFiles="$(_R2RFrameworkCachePath2)" />
-		<ItemGroup>
-			<FileWrites Include="$(_R2RFrameworkCachePath2)" />
-		</ItemGroup>
-	</Target>
+		<MakeDir
+			SessionId="$(BuildSessionId)"
+			Directories="$([System.IO.Path]::GetDirectoryName ('%(_R2RModule.FrameworkOutput)'))"
+		/>
 
-	<!-- link the object file created by the r2r compiler into a dynamic library we're going to put into the r2r framework -->
-	<Target Name="_LinkR2RFramework"
-			Inputs="@(_R2RFrameworkInputs)"
-			Outputs="$(_R2RFrameworkOutput)"
-			>
+		<LinkNativeCode
+			SessionId="$(BuildSessionId)"
+			ObjectFiles="%(_R2RModule.ObjectFile)"
+			OutputFile="%(_R2RModule.FrameworkOutput)"
+			LinkerFlags="@(_CurrentR2RModuleLinkerFlags)"
 
-			<MakeDir
-				SessionId="$(BuildSessionId)"
-				Directories="$(_R2RFrameworkPath)"
-			/>
+			MinimumOSVersion="$(_MinimumOSVersion)"
+			SdkDevPath="$(_SdkDevPath)"
+			SdkIsSimulator="$(_SdkIsSimulator)"
+			SdkRoot="$(_SdkRoot)"
+			TargetArchitectures="$(TargetArchitectures)"
+			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
+		/>
 
-			<LinkNativeCode
-				SessionId="$(BuildSessionId)"
-				ObjectFiles="@(_R2RFrameworkInputs)"
-				OutputFile="$(_R2RFrameworkOutput)"
-				LinkerFlags="@(_R2RFrameworkLinkerFlags)"
-
-				MinimumOSVersion="$(_MinimumOSVersion)"
-				SdkDevPath="$(_SdkDevPath)"
-				SdkIsSimulator="$(_SdkIsSimulator)"
-				SdkRoot="$(_SdkRoot)"
-				TargetArchitectures="$(TargetArchitectures)"
-				TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
-			/>
+		<ItemGroup>
+			<FileWrites Include="%(_R2RModule.InfoPlistPath)" />
+			<FileWrites Include="%(_R2RModule.FrameworkOutput)" />
+		</ItemGroup>
 	</Target>
 
-	<Target Name="_CreateR2RFramework"
-			Condition="'$(CreateR2RFramework)' == 'true' And '$(IsMacEnabled)' != 'false'"
-			DependsOnTargets="$(_CreateR2RFrameworkDependsOn)"
-			AfterTargets="CreateReadyToRunImages"
-	/>
-
-	<!-- Create a dylib from the composite R2R output -->
-	<PropertyGroup>
-		<_CreateR2RDylibDependsOn>
-			_CollectR2RObjectFilesForLinking;
-			_PrepareR2RDylibCreation;
-			_ForceLinkR2RDylib;
-			_LinkR2RDylib;
-		</_CreateR2RDylibDependsOn>
-	</PropertyGroup>
-
-	<Target Name="_PrepareR2RDylibCreation"
-			DependsOnTargets="CreateReadyToRunImages"
+	<!-- Create dylibs for each R2R module (macOS/Mac Catalyst) -->
+	<Target Name="_CreateR2RModuleDylibs"
+			Condition="'$(CreateR2RDylib)' == 'true'"
+			Inputs="%(_R2RModule.ObjectFile)"
+			Outputs="%(_R2RModule.DylibOutput)"
 			>
-		<PropertyGroup>
-			<_R2RDylibIntermediateOutputPath Condition="'$(_R2RDylibIntermediateOutputPath)' == ''">$(DeviceSpecificIntermediateOutputPath)r2rdylib/</_R2RDylibIntermediateOutputPath>
-			<_R2RDylibName Condition="'$(_R2RDylibName)' == ''">$(AssemblyName)</_R2RDylibName>
-			<_R2RDylibPath Condition="'$(_R2RDylibPath)' == ''">$(_R2RDylibIntermediateOutputPath)</_R2RDylibPath>
-			<_R2RDylibOutput Condition="'$(_R2RDylibOutput)' == ''">$(_R2RDylibPath)$(_R2RDylibName).r2r.dylib</_R2RDylibOutput>
-		</PropertyGroup>
 
-		<ItemGroup>
-			<_R2RDylibInputs Include="@(_R2RObjectFilesForLinking)" />
-			<_R2RDylibLinkerFlags Include="-dynamiclib" />
-			<_R2RDylibLinkerFlags Include="-Wl,-dead_strip" />
-			<_R2RDylibLinkerFlags Include="-Wl,-install_name,@rpath/$(_R2RDylibName).r2r.dylib" />
+		<MakeDir
+			SessionId="$(BuildSessionId)"
+			Directories="$(_R2RModuleIntermediateOutputPath)"
+		/>
 
-			<_FileNativeReference Include="$(_R2RDylibOutput)" Kind="Dynamic" />
+		<!-- Link the .o file into a dylib -->
+		<ItemGroup>
+			<_CurrentR2RDylibLinkerFlags Remove="@(_CurrentR2RDylibLinkerFlags)" />
+			<_CurrentR2RDylibLinkerFlags Include="-dynamiclib" />
+			<_CurrentR2RDylibLinkerFlags Include="-Wl,-dead_strip" />
+			<_CurrentR2RDylibLinkerFlags Include="-Wl,-install_name,@rpath/%(_R2RModule.ModuleName)" />
 		</ItemGroup>
 
-		<!-- write a hash of all the relevant input so that we can force a re-link if necessary -->
-		<PropertyGroup>
-			<_R2RDylibCachePath>$(_R2RDylibIntermediateOutputPath)cache.txt</_R2RDylibCachePath>
-			<_R2RDylibCachePath2>$(_R2RDylibCachePath).uptodate</_R2RDylibCachePath2>
-		</PropertyGroup>
+		<LinkNativeCode
+			SessionId="$(BuildSessionId)"
+			ObjectFiles="%(_R2RModule.ObjectFile)"
+			OutputFile="%(_R2RModule.DylibOutput)"
+			LinkerFlags="@(_CurrentR2RDylibLinkerFlags)"
+
+			MinimumOSVersion="$(_MinimumOSVersion)"
+			SdkDevPath="$(_SdkDevPath)"
+			SdkIsSimulator="$(_SdkIsSimulator)"
+			SdkRoot="$(_SdkRoot)"
+			TargetArchitectures="$(TargetArchitectures)"
+			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
+		/>
+
 		<ItemGroup>
-			<_R2RDylibCache Include="@(_R2RDylibInputs)" />
-			<_R2RDylibCache Include="@(_R2RDylibLinkerFlags)" />
-			<_R2RDylibCache Include="$(_R2RDylibOutput)" />
-			<_R2RDylibCache Include="$(_MinimumOSVersion)" />
+			<FileWrites Include="%(_R2RModule.DylibOutput)" />
 		</ItemGroup>
+	</Target>
 
-		<Hash
-			ItemsToHash="@(_R2RDylibCache)"
-			IgnoreCase="false">
-			<Output TaskParameter="HashResult" PropertyName="_R2RDylibCacheHash" />
-		</Hash>
+	<!-- Generate the R2R module registration file (r2r_modules.mm) -->
+	<Target Name="_GenerateR2RModuleRegistration"
+			DependsOnTargets="_PrepareR2RModules"
+			Condition="@(_R2RModule->Count()) &gt; 0"
+			Inputs="@(_R2RModule->'%(ObjectFile)')"
+			Outputs="$(_R2RModuleRegistrationFile)"
+			>
 
-		<WriteLinesToFile Lines="$(_R2RDylibCacheHash)" File="$(_R2RDylibCachePath)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+		<GenerateR2RModuleRegistration
+			SessionId="$(BuildSessionId)"
+			R2RModules="@(_R2RModule)"
+			OutputFile="$(_R2RModuleRegistrationFile)"
+		/>
 
 		<ItemGroup>
-			<FileWrites Include="$(_R2RDylibCachePath)" />
+			<FileWrites Include="$(_R2RModuleRegistrationFile)" />
 		</ItemGroup>
 	</Target>
 
-	<!-- force the r2r dylib to be re-created by deleting the executable file-->
-	<Target Name="_ForceLinkR2RDylib"
-			Inputs="$(_R2RDylibCachePath)"
-			Outputs="$(_R2RDylibCachePath2)"
+	<!-- Always add the R2R module registration file to _MainFile if it exists, even when
+	     _GenerateR2RModuleRegistration is skipped due to incrementality.
+	     This must be a separate target so that _MainFile is populated on every build. -->
+	<Target Name="_AddR2RModuleRegistrationToMainFile"
+			DependsOnTargets="_GenerateR2RModuleRegistration"
+			Condition="@(_R2RModule->Count()) &gt; 0"
 			>
-		<Delete Files="$(_R2RDylibOutput)" />
-		<Copy SourceFiles="$(_R2RDylibCachePath)" DestinationFiles="$(_R2RDylibCachePath2)" />
 		<ItemGroup>
-			<FileWrites Include="$(_R2RDylibCachePath2)" />
+			<_MainFile Include="$(_R2RModuleRegistrationFile)" Condition="Exists('$(_R2RModuleRegistrationFile)')">
+				<Arch>$(TargetArchitectures.ToLowerInvariant())</Arch>
+			</_MainFile>
 		</ItemGroup>
 	</Target>
 
-	<!-- link the object file created by the r2r compiler into a dynamic library -->
-	<Target Name="_LinkR2RDylib"
-			Inputs="@(_R2RDylibInputs)"
-			Outputs="$(_R2RDylibOutput)"
-			>
+	<Target Name="_CreateR2RFramework"
+			Condition="'$(CreateR2RFramework)' == 'true' And '$(IsMacEnabled)' != 'false'"
+			DependsOnTargets="$(_CreateR2RFrameworkDependsOn)"
+			AfterTargets="CreateReadyToRunImages"
+	/>
 
-			<LinkNativeCode
-				SessionId="$(BuildSessionId)"
-				ObjectFiles="@(_R2RDylibInputs)"
-				OutputFile="$(_R2RDylibOutput)"
-				LinkerFlags="@(_R2RDylibLinkerFlags)"
-
-				MinimumOSVersion="$(_MinimumOSVersion)"
-				SdkDevPath="$(_SdkDevPath)"
-				SdkIsSimulator="$(_SdkIsSimulator)"
-				SdkRoot="$(_SdkRoot)"
-				TargetArchitectures="$(TargetArchitectures)"
-				TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
-			/>
-	</Target>
+	<!-- Create dylibs from R2R output (macOS/Mac Catalyst) -->
+	<PropertyGroup>
+		<_CreateR2RDylibDependsOn>
+			_CollectR2RObjectFilesForLinking;
+			_PrepareR2RModules;
+			_RegisterR2RNativeReferences;
+			_CreateR2RModuleDylibs;
+			_AddR2RModuleRegistrationToMainFile;
+		</_CreateR2RDylibDependsOn>
+	</PropertyGroup>
 
 	<Target Name="_CreateR2RDylib"
 			Condition="'$(CreateR2RDylib)' == 'true' And '$(IsMacEnabled)' != 'false'"
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 0ff20eb0c50c..002e4eb40612 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -2669,19 +2669,20 @@ global using nfloat = global::System.Runtime.InteropServices.NFloat%3B
 			_CollectR2RFrameworksForPostProcessing;
 		</_CollectItemsForPostProcessingDependsOn>
 	</PropertyGroup>
-	<Target Name="_CollectR2RFrameworksForPostProcessing" DependsOnTargets="_ComputeFrameworksToCreate">
+	<Target Name="_CollectR2RFrameworksForPostProcessing" DependsOnTargets="_ComputeFrameworksToCreate;_PrepareR2RModules">
 		<ItemGroup>
 			<!-- Add CoreCLR runtime -->
 			<_PostProcessingItem
 				Include="@(_CreatedFrameworksFromDylibs->'$([System.IO.Path]::GetFileName($(AppBundleDir)))/$(_AppFrameworksRelativePath)%(Filename).framework/%(Filename)')">
 				<Kind>Framework</Kind>
+				<FrameworkName>%(Filename)</FrameworkName>
 				<DSymName>%(Filename).framework.dSYM</DSymName>
 			</_PostProcessingItem>
-			<!-- Add R2R composite -->
+			<!-- Add per-module R2R frameworks -->
 			<_PostProcessingItem
-				Include="$([System.IO.Path]::GetFileName('$(AppBundleDir)'))/$(_AppFrameworksRelativePath)$(_R2RFrameworkName).framework/$(_R2RFrameworkName)" Condition="'$(CreateR2RFramework)' == 'true'">
+				Include="@(_R2RModule->'$([System.IO.Path]::GetFileName($(AppBundleDir)))/$(_AppFrameworksRelativePath)%(FrameworkName).framework/%(FrameworkName)')" Condition="'$(CreateR2RFramework)' == 'true'">
 				<Kind>Framework</Kind>
-				<DSymName>$(_R2RFrameworkName).framework.dSYM</DSymName>
+				<DSymName>%(_R2RModule.FrameworkName).framework.dSYM</DSymName>
 			</_PostProcessingItem>
 		</ItemGroup>
 	</Target>
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/GenerateR2RModuleRegistration.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/GenerateR2RModuleRegistration.cs
new file mode 100644
index 000000000000..c6f4f11a8fd2
--- /dev/null
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/GenerateR2RModuleRegistration.cs
@@ -0,0 +1,89 @@
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+using Xamarin.Messaging.Build.Client;
+
+#nullable enable
+
+namespace Xamarin.MacDev.Tasks {
+	public class GenerateR2RModuleRegistration : XamarinTask, ITaskCallback {
+
+		#region Inputs
+		[Required]
+		public ITaskItem [] R2RModules { get; set; } = [];
+
+		[Required]
+		public string OutputFile { get; set; } = "";
+		#endregion
+
+		public override bool Execute ()
+		{
+			if (ShouldExecuteRemotely ())
+				return ExecuteRemotely ();
+
+			var sb = new StringBuilder ();
+
+			sb.AppendLine ("#include \"xamarin/xamarin.h\"");
+			sb.AppendLine ();
+
+			foreach (var module in R2RModules) {
+				var symbolName = module.GetMetadata ("SymbolName");
+				if (string.IsNullOrEmpty (symbolName)) {
+					Log.LogError ("Missing '{0}' metadata on item '{1}'.", "SymbolName", module.ItemSpec);
+					continue;
+				}
+				sb.AppendLine ($"extern void* {symbolName};");
+			}
+
+			sb.AppendLine ();
+			sb.AppendLine ("static struct xamarin_r2r_module r2r_module_entries [] = {");
+
+			foreach (var module in R2RModules) {
+				var moduleName = module.GetMetadata ("ModuleName");
+				var symbolName = module.GetMetadata ("SymbolName");
+				if (string.IsNullOrEmpty (moduleName)) {
+					Log.LogError ("Missing '{0}' metadata on item '{1}'.", "ModuleName", module.ItemSpec);
+					continue;
+				}
+				if (string.IsNullOrEmpty (symbolName))
+					continue; // already reported above
+				var escapedModuleName = moduleName.Replace ("\\", "\\\\").Replace ("\"", "\\\"");
+				sb.AppendLine ($"\t{{ \"{escapedModuleName}\", &{symbolName} }},");
+			}
+
+			sb.AppendLine ("};");
+			sb.AppendLine ();
+
+			sb.AppendLine ("__attribute__ ((constructor))");
+			sb.AppendLine ("static void xamarin_register_r2r_modules ()");
+			sb.AppendLine ("{");
+			sb.AppendLine ("\txamarin_r2r_modules = r2r_module_entries;");
+			sb.AppendLine ("\txamarin_r2r_module_count = sizeof (r2r_module_entries) / sizeof (r2r_module_entries [0]);");
+			sb.AppendLine ("}");
+
+			if (Log.HasLoggedErrors)
+				return false;
+
+			var content = sb.ToString ();
+			var outputDir = Path.GetDirectoryName (OutputFile);
+			if (!string.IsNullOrEmpty (outputDir))
+				Directory.CreateDirectory (outputDir);
+
+			if (!File.Exists (OutputFile) || File.ReadAllText (OutputFile) != content)
+				File.WriteAllText (OutputFile, content);
+
+			return !Log.HasLoggedErrors;
+		}
+
+		public bool ShouldCopyToBuildServer (ITaskItem item) => false;
+
+		public bool ShouldCreateOutputFile (ITaskItem item) => true;
+
+		public IEnumerable<ITaskItem> GetAdditionalItemsToBeCopied () => Enumerable.Empty<ITaskItem> ();
+	}
+}
diff --git a/runtime/runtime.m b/runtime/runtime.m
index 41fbe8ba9264..106650caf60c 100644
--- a/runtime/runtime.m
+++ b/runtime/runtime.m
@@ -80,7 +80,8 @@
 
 enum XamarinNativeLinkMode xamarin_libmono_native_link_mode = XamarinNativeLinkModeStaticObject;
 const char **xamarin_runtime_libraries = NULL;
-void *xamarin_rtr_header = NULL;
+struct xamarin_r2r_module *xamarin_r2r_modules = NULL;
+int xamarin_r2r_module_count = 0;
 
 /* Callbacks */
 
@@ -2439,9 +2440,17 @@ -(struct NSObjectData*) xamarinGetNSObjectData;
 	if (!context || !data || !context->assembly_path || !context->owner_composite_name)
 		return false;
 
-	void* r2r_header = xamarin_rtr_header;
+	void* r2r_header = NULL;
+
+	for (int i = 0; i < xamarin_r2r_module_count; i++) {
+		if (strcmp (xamarin_r2r_modules [i].name, context->owner_composite_name) == 0) {
+			r2r_header = xamarin_r2r_modules [i].header;
+			break;
+		}
+	}
+
 	if (r2r_header == NULL)
-		xamarin_assertion_message ("Failed to find the RTR_HEADER symbol.");
+		return false;
 
 	Dl_info info;
 	if (dladdr (r2r_header, &info) == 0)
diff --git a/runtime/xamarin/main.h b/runtime/xamarin/main.h
index eedfc65f300b..d986b6324de4 100644
--- a/runtime/xamarin/main.h
+++ b/runtime/xamarin/main.h
@@ -127,7 +127,14 @@ extern bool xamarin_supports_dynamic_registration;
 extern const char *xamarin_runtime_configuration_name;
 extern enum XamarinNativeLinkMode xamarin_libmono_native_link_mode;
 extern const char** xamarin_runtime_libraries;
-extern void *xamarin_rtr_header;
+
+struct xamarin_r2r_module {
+	const char *name;
+	void *header;
+};
+
+extern struct xamarin_r2r_module *xamarin_r2r_modules;
+extern int xamarin_r2r_module_count;
 
 typedef void (*xamarin_setup_callback) ();
 typedef int (*xamarin_extension_main_callback) (int argc, char** argv);
diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs
index 9a6a794f76c6..237b98255058 100644
--- a/tests/dotnet/UnitTests/BundleStructureTest.cs
+++ b/tests/dotnet/UnitTests/BundleStructureTest.cs
@@ -131,7 +131,7 @@ internal static void CheckAppBundleContents (ApplePlatform platform, IEnumerable
 						// macOS bundle checks use '/'. Handle both when extracting the framework name.
 						var slashIdx = fwIdx > 0 ? v.LastIndexOfAny ([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar], fwIdx - 1) : -1;
 						var frameworkName = v.Substring (slashIdx + 1, fwIdx - slashIdx - 1);
-						if (frameworkName.StartsWith ("lib", StringComparison.Ordinal) || frameworkName == "BundleStructure")
+						if (frameworkName.StartsWith ("lib", StringComparison.Ordinal) || frameworkName == "BundleStructure" || frameworkName.EndsWith (".r2r", StringComparison.Ordinal))
 							return true;
 					}
 				}
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 1ae7a1c69fef..e08fd11270f2 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -3040,7 +3040,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"@rpath/libSystem.Native.framework/libSystem.Native",
 			"@rpath/libSystem.Net.Security.Native.framework/libSystem.Net.Security.Native",
 			"@rpath/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple",
-			"@rpath/MySimpleApp.framework/MySimpleApp",
+			"@rpath/MySimpleApp.r2r.framework/MySimpleApp.r2r",
 		];
 
 		static string [] coreclrFrameworks_tvOS = [
@@ -3051,7 +3051,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"@rpath/libSystem.IO.Compression.Native.framework/libSystem.IO.Compression.Native",
 			"@rpath/libSystem.Native.framework/libSystem.Native",
 			"@rpath/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple",
-			"@rpath/MySimpleApp.framework/MySimpleApp",
+			"@rpath/MySimpleApp.r2r.framework/MySimpleApp.r2r",
 		];
 
 		static string [] coreclrFrameworks_MacCatalyst = [
diff --git a/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-Interpreter-size.txt b/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-Interpreter-size.txt
index 1188b2ae0ed2..4c77f3aa0f46 100644
--- a/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-Interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-Interpreter-size.txt
@@ -1,15 +1,15 @@
-AppBundleSize: 10,463,475 bytes (10,218.2 KB = 10.0 MB)
+AppBundleSize: 10,464,199 bytes (10,218.9 KB = 10.0 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 4,951 bytes (4.8 KB = 0.0 MB)
-Contents/Info.plist: 1,099 bytes (1.1 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 242,128 bytes (236.5 KB = 0.2 MB)
+Contents/Info.plist: 1,119 bytes (1.1 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 242,320 bytes (236.6 KB = 0.2 MB)
 Contents/MonoBundle/libcoreclr.dylib: 6,386,608 bytes (6,236.9 KB = 6.1 MB)
 Contents/MonoBundle/libSystem.Globalization.Native.dylib: 110,432 bytes (107.8 KB = 0.1 MB)
 Contents/MonoBundle/libSystem.IO.Compression.Native.dylib: 1,442,208 bytes (1,408.4 KB = 1.4 MB)
 Contents/MonoBundle/libSystem.Native.dylib: 146,768 bytes (143.3 KB = 0.1 MB)
 Contents/MonoBundle/libSystem.Net.Security.Native.dylib: 71,120 bytes (69.5 KB = 0.1 MB)
 Contents/MonoBundle/libSystem.Security.Cryptography.Native.Apple.dylib: 204,768 bytes (200.0 KB = 0.2 MB)
-Contents/MonoBundle/Microsoft.MacCatalyst.dll: 101,888 bytes (99.5 KB = 0.1 MB)
+Contents/MonoBundle/Microsoft.MacCatalyst.dll: 102,400 bytes (100.0 KB = 0.1 MB)
 Contents/MonoBundle/runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
 Contents/MonoBundle/SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
 Contents/MonoBundle/System.Collections.Immutable.dll: 14,848 bytes (14.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-R2R-size.txt b/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-R2R-size.txt
index 25f95b4add07..52f322c6257a 100644
--- a/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-R2R-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacCatalyst-CoreCLR-R2R-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 19,324,509 bytes (18,871.6 KB = 18.4 MB)
+AppBundleSize: 19,325,345 bytes (18,872.4 KB = 18.4 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 5,105 bytes (5.0 KB = 0.0 MB)
-Contents/Info.plist: 1,099 bytes (1.1 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 242,176 bytes (236.5 KB = 0.2 MB)
+Contents/Info.plist: 1,119 bytes (1.1 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 242,960 bytes (237.3 KB = 0.2 MB)
 Contents/MonoBundle/libcoreclr.dylib: 6,386,608 bytes (6,236.9 KB = 6.1 MB)
 Contents/MonoBundle/libSystem.Globalization.Native.dylib: 110,432 bytes (107.8 KB = 0.1 MB)
 Contents/MonoBundle/libSystem.IO.Compression.Native.dylib: 1,442,208 bytes (1,408.4 KB = 1.4 MB)
@@ -12,7 +12,7 @@ Contents/MonoBundle/libSystem.Security.Cryptography.Native.Apple.dylib: 204,768
 Contents/MonoBundle/Microsoft.MacCatalyst.dll: 101,888 bytes (99.5 KB = 0.1 MB)
 Contents/MonoBundle/runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
 Contents/MonoBundle/SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
-Contents/MonoBundle/SizeTestApp.r2r.dylib: 8,847,008 bytes (8,639.7 KB = 8.4 MB)
+Contents/MonoBundle/SizeTestApp.r2r.dylib: 8,847,040 bytes (8,639.7 KB = 8.4 MB)
 Contents/MonoBundle/System.Collections.Immutable.dll: 13,824 bytes (13.5 KB = 0.0 MB)
 Contents/MonoBundle/System.Diagnostics.StackTrace.dll: 7,680 bytes (7.5 KB = 0.0 MB)
 Contents/MonoBundle/System.IO.Compression.dll: 22,016 bytes (21.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-interpreter-size.txt b/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-interpreter-size.txt
index 3828d79e6957..293e83e1c9a4 100644
--- a/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-interpreter-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 5,814,166 bytes (5,677.9 KB = 5.5 MB)
+AppBundleSize: 5,813,322 bytes (5,677.1 KB = 5.5 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 3,310 bytes (3.2 KB = 0.0 MB)
-Contents/Info.plist: 1,099 bytes (1.1 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 4,569,408 bytes (4,462.3 KB = 4.4 MB)
+Contents/Info.plist: 1,119 bytes (1.1 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 4,568,544 bytes (4,461.5 KB = 4.4 MB)
 Contents/MonoBundle/Microsoft.MacCatalyst.dll: 157,696 bytes (154.0 KB = 0.2 MB)
 Contents/MonoBundle/runtimeconfig.bin: 1,405 bytes (1.4 KB = 0.0 MB)
 Contents/MonoBundle/SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-size.txt b/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-size.txt
index f69e6829026d..7e33b5b75a65 100644
--- a/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacCatalyst-MonoVM-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 16,525,506 bytes (16,138.2 KB = 15.8 MB)
+AppBundleSize: 16,524,646 bytes (16,137.3 KB = 15.8 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 4,134 bytes (4.0 KB = 0.0 MB)
-Contents/Info.plist: 1,099 bytes (1.1 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 13,984,464 bytes (13,656.7 KB = 13.3 MB)
+Contents/Info.plist: 1,119 bytes (1.1 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 13,983,584 bytes (13,655.8 KB = 13.3 MB)
 Contents/MonoBundle/aot-instances.aotdata.arm64: 1,037,632 bytes (1,013.3 KB = 1.0 MB)
 Contents/MonoBundle/Microsoft.MacCatalyst.aotdata.arm64: 35,976 bytes (35.1 KB = 0.0 MB)
 Contents/MonoBundle/Microsoft.MacCatalyst.dll: 51,200 bytes (50.0 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacCatalyst-NativeAOT-size.txt b/tests/dotnet/UnitTests/expected/MacCatalyst-NativeAOT-size.txt
index 2c53322aefb9..7eb03909c29a 100644
--- a/tests/dotnet/UnitTests/expected/MacCatalyst-NativeAOT-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacCatalyst-NativeAOT-size.txt
@@ -1,7 +1,7 @@
-AppBundleSize: 2,815,241 bytes (2,749.3 KB = 2.7 MB)
+AppBundleSize: 2,815,261 bytes (2,749.3 KB = 2.7 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 2,358 bytes (2.3 KB = 0.0 MB)
-Contents/Info.plist: 1,099 bytes (1.1 KB = 0.0 MB)
+Contents/Info.plist: 1,119 bytes (1.1 KB = 0.0 MB)
 Contents/MacOS/SizeTestApp: 2,809,968 bytes (2,744.1 KB = 2.7 MB)
 Contents/MonoBundle/runtimeconfig.bin: 1,808 bytes (1.8 KB = 0.0 MB)
 Contents/PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-Interpreter-size.txt b/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-Interpreter-size.txt
index 38ac47ac2bbc..277d931923ce 100644
--- a/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-Interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-Interpreter-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 246,986,938 bytes (241,198.2 KB = 235.5 MB)
+AppBundleSize: 246,987,182 bytes (241,198.4 KB = 235.5 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 54,948 bytes (53.7 KB = 0.1 MB)
-Contents/Info.plist: 730 bytes (0.7 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 7,963,952 bytes (7,777.3 KB = 7.6 MB)
+Contents/Info.plist: 750 bytes (0.7 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 7,964,176 bytes (7,777.5 KB = 7.6 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.CSharp.dll: 884,224 bytes (863.5 KB = 0.8 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.Extensions.Caching.Abstractions.dll: 56,320 bytes (55.0 KB = 0.1 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.Extensions.Configuration.Abstractions.dll: 28,160 bytes (27.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-R2R-size.txt b/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-R2R-size.txt
index ddb515429633..b0d41b6c8931 100644
--- a/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-R2R-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacOSX-CoreCLR-R2R-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 313,861,306 bytes (306,505.2 KB = 299.3 MB)
+AppBundleSize: 313,862,062 bytes (306,505.9 KB = 299.3 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 54,948 bytes (53.7 KB = 0.1 MB)
-Contents/Info.plist: 730 bytes (0.7 KB = 0.0 MB)
-Contents/MacOS/SizeTestApp: 7,963,952 bytes (7,777.3 KB = 7.6 MB)
+Contents/Info.plist: 750 bytes (0.7 KB = 0.0 MB)
+Contents/MacOS/SizeTestApp: 7,964,176 bytes (7,777.5 KB = 7.6 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.CSharp.dll: 884,224 bytes (863.5 KB = 0.8 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.Extensions.Caching.Abstractions.dll: 56,320 bytes (55.0 KB = 0.1 MB)
 Contents/MonoBundle/.xamarin/osx-arm64/Microsoft.Extensions.Configuration.Abstractions.dll: 28,160 bytes (27.5 KB = 0.0 MB)
@@ -116,7 +116,7 @@ Contents/MonoBundle/.xamarin/osx-x64/Microsoft.Extensions.Hosting.Abstractions.d
 Contents/MonoBundle/.xamarin/osx-x64/Microsoft.Extensions.Logging.Abstractions.dll: 132,096 bytes (129.0 KB = 0.1 MB)
 Contents/MonoBundle/.xamarin/osx-x64/Microsoft.Extensions.Options.dll: 118,272 bytes (115.5 KB = 0.1 MB)
 Contents/MonoBundle/.xamarin/osx-x64/Microsoft.Extensions.Primitives.dll: 63,488 bytes (62.0 KB = 0.1 MB)
-Contents/MonoBundle/.xamarin/osx-x64/Microsoft.macOS.dll: 64,387,584 bytes (62,878.5 KB = 61.4 MB)
+Contents/MonoBundle/.xamarin/osx-x64/Microsoft.macOS.dll: 64,388,096 bytes (62,879.0 KB = 61.4 MB)
 Contents/MonoBundle/.xamarin/osx-x64/Microsoft.VisualBasic.Core.dll: 1,155,072 bytes (1,128.0 KB = 1.1 MB)
 Contents/MonoBundle/.xamarin/osx-x64/Microsoft.Win32.Registry.dll: 24,064 bytes (23.5 KB = 0.0 MB)
 Contents/MonoBundle/.xamarin/osx-x64/SizeTestApp.dll: 9,728 bytes (9.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/MacOSX-NativeAOT-size.txt b/tests/dotnet/UnitTests/expected/MacOSX-NativeAOT-size.txt
index 0a5e2c42e299..c7678b8c44b2 100644
--- a/tests/dotnet/UnitTests/expected/MacOSX-NativeAOT-size.txt
+++ b/tests/dotnet/UnitTests/expected/MacOSX-NativeAOT-size.txt
@@ -1,7 +1,7 @@
-AppBundleSize: 6,087,693 bytes (5,945.0 KB = 5.8 MB)
+AppBundleSize: 6,087,713 bytes (5,945.0 KB = 5.8 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 Contents/_CodeSignature/CodeResources: 2,644 bytes (2.6 KB = 0.0 MB)
-Contents/Info.plist: 730 bytes (0.7 KB = 0.0 MB)
+Contents/Info.plist: 750 bytes (0.7 KB = 0.0 MB)
 Contents/MacOS/SizeTestApp: 6,082,304 bytes (5,939.8 KB = 5.8 MB)
 Contents/MonoBundle/runtimeconfig.bin: 1,766 bytes (1.7 KB = 0.0 MB)
 Contents/PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-Interpreter-size.txt b/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-Interpreter-size.txt
index d0985c362b6c..1743754490c6 100644
--- a/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-Interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-Interpreter-size.txt
@@ -1,23 +1,23 @@
-AppBundleSize: 9,187,098 bytes (8,971.8 KB = 8.8 MB)
+AppBundleSize: 9,187,218 bytes (8,971.9 KB = 8.8 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 9,851 bytes (9.6 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libcoreclr.framework/Info.plist: 789 bytes (0.8 KB = 0.0 MB)
+Frameworks/libcoreclr.framework/Info.plist: 809 bytes (0.8 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/libcoreclr: 5,216,464 bytes (5,094.2 KB = 5.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Globalization.Native.framework/Info.plist: 831 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Globalization.Native.framework/Info.plist: 851 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/libSystem.Globalization.Native: 109,776 bytes (107.2 KB = 0.1 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 833 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 853 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/libSystem.IO.Compression.Native: 1,439,536 bytes (1,405.8 KB = 1.4 MB)
 Frameworks/libSystem.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Native.framework/Info.plist: 803 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Native.framework/Info.plist: 823 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Native.framework/libSystem.Native: 162,480 bytes (158.7 KB = 0.2 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 859 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 879 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple: 195,232 bytes (190.7 KB = 0.2 MB)
-Info.plist: 1,117 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,137 bytes (1.1 KB = 0.0 MB)
 Microsoft.tvOS.dll: 99,328 bytes (97.0 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-R2R-size.txt b/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-R2R-size.txt
index 805b44955d1f..855fcac626f8 100644
--- a/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-R2R-size.txt
+++ b/tests/dotnet/UnitTests/expected/TVOS-CoreCLR-R2R-size.txt
@@ -1,30 +1,30 @@
-AppBundleSize: 12,628,622 bytes (12,332.6 KB = 12.0 MB)
+AppBundleSize: 12,628,883 bytes (12,332.9 KB = 12.0 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
-_CodeSignature/CodeResources: 10,705 bytes (10.5 KB = 0.0 MB)
+_CodeSignature/CodeResources: 10,737 bytes (10.5 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libcoreclr.framework/Info.plist: 789 bytes (0.8 KB = 0.0 MB)
+Frameworks/libcoreclr.framework/Info.plist: 809 bytes (0.8 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/libcoreclr: 5,216,464 bytes (5,094.2 KB = 5.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Globalization.Native.framework/Info.plist: 831 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Globalization.Native.framework/Info.plist: 851 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/libSystem.Globalization.Native: 109,776 bytes (107.2 KB = 0.1 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 833 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 853 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/libSystem.IO.Compression.Native: 1,439,536 bytes (1,405.8 KB = 1.4 MB)
 Frameworks/libSystem.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Native.framework/Info.plist: 803 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Native.framework/Info.plist: 823 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Native.framework/libSystem.Native: 162,480 bytes (158.7 KB = 0.2 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 859 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 879 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple: 195,232 bytes (190.7 KB = 0.2 MB)
-Frameworks/SizeTestApp.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/SizeTestApp.framework/Info.plist: 792 bytes (0.8 KB = 0.0 MB)
-Frameworks/SizeTestApp.framework/SizeTestApp: 3,424,688 bytes (3,344.4 KB = 3.3 MB)
-Info.plist: 1,117 bytes (1.1 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/Info.plist: 821 bytes (0.8 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/SizeTestApp.r2r: 3,424,720 bytes (3,344.5 KB = 3.3 MB)
+Info.plist: 1,137 bytes (1.1 KB = 0.0 MB)
 Microsoft.tvOS.dll: 98,816 bytes (96.5 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
-SizeTestApp: 197,104 bytes (192.5 KB = 0.2 MB)
+SizeTestApp: 197,152 bytes (192.5 KB = 0.2 MB)
 SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
 System.Collections.Immutable.dll: 13,824 bytes (13.5 KB = 0.0 MB)
 System.Diagnostics.StackTrace.dll: 7,680 bytes (7.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/TVOS-MonoVM-interpreter-size.txt b/tests/dotnet/UnitTests/expected/TVOS-MonoVM-interpreter-size.txt
index 8fd6cd4deab4..11e26a652bc5 100644
--- a/tests/dotnet/UnitTests/expected/TVOS-MonoVM-interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/TVOS-MonoVM-interpreter-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 3,637,817 bytes (3,552.6 KB = 3.5 MB)
+AppBundleSize: 3,637,837 bytes (3,552.6 KB = 3.5 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 3,999 bytes (3.9 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,117 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,137 bytes (1.1 KB = 0.0 MB)
 Microsoft.tvOS.dll: 154,624 bytes (151.0 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,405 bytes (1.4 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/TVOS-MonoVM-size.txt b/tests/dotnet/UnitTests/expected/TVOS-MonoVM-size.txt
index 76e4c9384a09..6255862f4728 100644
--- a/tests/dotnet/UnitTests/expected/TVOS-MonoVM-size.txt
+++ b/tests/dotnet/UnitTests/expected/TVOS-MonoVM-size.txt
@@ -1,9 +1,9 @@
-AppBundleSize: 9,503,383 bytes (9,280.6 KB = 9.1 MB)
+AppBundleSize: 9,503,403 bytes (9,280.7 KB = 9.1 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 5,233 bytes (5.1 KB = 0.0 MB)
 aot-instances.aotdata.arm64: 818,536 bytes (799.4 KB = 0.8 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,117 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,137 bytes (1.1 KB = 0.0 MB)
 Microsoft.tvOS.aotdata.arm64: 22,584 bytes (22.1 KB = 0.0 MB)
 Microsoft.tvOS.dll: 49,152 bytes (48.0 KB = 0.0 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/TVOS-NativeAOT-size.txt b/tests/dotnet/UnitTests/expected/TVOS-NativeAOT-size.txt
index daacc6d7e0dc..42073af95b9b 100644
--- a/tests/dotnet/UnitTests/expected/TVOS-NativeAOT-size.txt
+++ b/tests/dotnet/UnitTests/expected/TVOS-NativeAOT-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 2,849,442 bytes (2,782.7 KB = 2.7 MB)
+AppBundleSize: 2,849,462 bytes (2,782.7 KB = 2.7 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 2,589 bytes (2.5 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,117 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,137 bytes (1.1 KB = 0.0 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,808 bytes (1.8 KB = 0.0 MB)
 SizeTestApp: 2,843,536 bytes (2,776.9 KB = 2.7 MB)
diff --git a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt
index 612738da6cc9..016cde2ba86d 100644
--- a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-Interpreter-size.txt
@@ -1,26 +1,26 @@
-AppBundleSize: 9,255,337 bytes (9,038.4 KB = 8.8 MB)
+AppBundleSize: 9,255,477 bytes (9,038.6 KB = 8.8 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 10,847 bytes (10.6 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libcoreclr.framework/Info.plist: 813 bytes (0.8 KB = 0.0 MB)
+Frameworks/libcoreclr.framework/Info.plist: 833 bytes (0.8 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/libcoreclr: 5,203,936 bytes (5,082.0 KB = 5.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Globalization.Native.framework/Info.plist: 855 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Globalization.Native.framework/Info.plist: 875 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/libSystem.Globalization.Native: 109,232 bytes (106.7 KB = 0.1 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 857 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 877 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/libSystem.IO.Compression.Native: 1,431,280 bytes (1,397.7 KB = 1.4 MB)
 Frameworks/libSystem.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Native.framework/Info.plist: 827 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Native.framework/Info.plist: 847 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Native.framework/libSystem.Native: 162,256 bytes (158.5 KB = 0.2 MB)
 Frameworks/libSystem.Net.Security.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Net.Security.Native.framework/Info.plist: 853 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Net.Security.Native.framework/Info.plist: 873 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Net.Security.Native.framework/libSystem.Net.Security.Native: 88,000 bytes (85.9 KB = 0.1 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 883 bytes (0.9 KB = 0.0 MB)
+Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 903 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple: 194,256 bytes (189.7 KB = 0.2 MB)
-Info.plist: 1,141 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,161 bytes (1.1 KB = 0.0 MB)
 Microsoft.iOS.dll: 99,328 bytes (97.0 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-R2R-size.txt b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-R2R-size.txt
index 7256e3308504..6448362c0c9e 100644
--- a/tests/dotnet/UnitTests/expected/iOS-CoreCLR-R2R-size.txt
+++ b/tests/dotnet/UnitTests/expected/iOS-CoreCLR-R2R-size.txt
@@ -1,33 +1,33 @@
-AppBundleSize: 12,677,045 bytes (12,379.9 KB = 12.1 MB)
+AppBundleSize: 12,677,326 bytes (12,380.2 KB = 12.1 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
-_CodeSignature/CodeResources: 11,701 bytes (11.4 KB = 0.0 MB)
+_CodeSignature/CodeResources: 11,733 bytes (11.5 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libcoreclr.framework/Info.plist: 813 bytes (0.8 KB = 0.0 MB)
+Frameworks/libcoreclr.framework/Info.plist: 833 bytes (0.8 KB = 0.0 MB)
 Frameworks/libcoreclr.framework/libcoreclr: 5,203,936 bytes (5,082.0 KB = 5.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Globalization.Native.framework/Info.plist: 855 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Globalization.Native.framework/Info.plist: 875 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Globalization.Native.framework/libSystem.Globalization.Native: 109,232 bytes (106.7 KB = 0.1 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 857 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.IO.Compression.Native.framework/Info.plist: 877 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.IO.Compression.Native.framework/libSystem.IO.Compression.Native: 1,431,280 bytes (1,397.7 KB = 1.4 MB)
 Frameworks/libSystem.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Native.framework/Info.plist: 827 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Native.framework/Info.plist: 847 bytes (0.8 KB = 0.0 MB)
 Frameworks/libSystem.Native.framework/libSystem.Native: 162,256 bytes (158.5 KB = 0.2 MB)
 Frameworks/libSystem.Net.Security.Native.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Net.Security.Native.framework/Info.plist: 853 bytes (0.8 KB = 0.0 MB)
+Frameworks/libSystem.Net.Security.Native.framework/Info.plist: 873 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Net.Security.Native.framework/libSystem.Net.Security.Native: 88,000 bytes (85.9 KB = 0.1 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 883 bytes (0.9 KB = 0.0 MB)
+Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/Info.plist: 903 bytes (0.9 KB = 0.0 MB)
 Frameworks/libSystem.Security.Cryptography.Native.Apple.framework/libSystem.Security.Cryptography.Native.Apple: 194,256 bytes (189.7 KB = 0.2 MB)
-Frameworks/SizeTestApp.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
-Frameworks/SizeTestApp.framework/Info.plist: 816 bytes (0.8 KB = 0.0 MB)
-Frameworks/SizeTestApp.framework/SizeTestApp: 3,404,880 bytes (3,325.1 KB = 3.2 MB)
-Info.plist: 1,141 bytes (1.1 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/_CodeSignature/CodeResources: 1,798 bytes (1.8 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/Info.plist: 845 bytes (0.8 KB = 0.0 MB)
+Frameworks/SizeTestApp.r2r.framework/SizeTestApp.r2r: 3,404,912 bytes (3,325.1 KB = 3.2 MB)
+Info.plist: 1,161 bytes (1.1 KB = 0.0 MB)
 Microsoft.iOS.dll: 98,816 bytes (96.5 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,481 bytes (1.4 KB = 0.0 MB)
-SizeTestApp: 196,048 bytes (191.5 KB = 0.2 MB)
+SizeTestApp: 196,096 bytes (191.5 KB = 0.2 MB)
 SizeTestApp.dll: 7,680 bytes (7.5 KB = 0.0 MB)
 System.Collections.Immutable.dll: 13,824 bytes (13.5 KB = 0.0 MB)
 System.Diagnostics.StackTrace.dll: 7,680 bytes (7.5 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt b/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt
index 53977d8b9561..2ff4293035dc 100644
--- a/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt
+++ b/tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 3,624,255 bytes (3,539.3 KB = 3.5 MB)
+AppBundleSize: 3,624,275 bytes (3,539.3 KB = 3.5 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 3,997 bytes (3.9 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,141 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,161 bytes (1.1 KB = 0.0 MB)
 Microsoft.iOS.dll: 154,624 bytes (151.0 KB = 0.1 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,405 bytes (1.4 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt b/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt
index 85c091554a05..c5658e78ce94 100644
--- a/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt
+++ b/tests/dotnet/UnitTests/expected/iOS-MonoVM-size.txt
@@ -1,9 +1,9 @@
-AppBundleSize: 9,460,643 bytes (9,238.9 KB = 9.0 MB)
+AppBundleSize: 9,460,663 bytes (9,238.9 KB = 9.0 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 5,229 bytes (5.1 KB = 0.0 MB)
 aot-instances.aotdata.arm64: 818,536 bytes (799.4 KB = 0.8 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,141 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,161 bytes (1.1 KB = 0.0 MB)
 Microsoft.iOS.aotdata.arm64: 22,944 bytes (22.4 KB = 0.0 MB)
 Microsoft.iOS.dll: 49,152 bytes (48.0 KB = 0.0 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
diff --git a/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt b/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt
index 931608ccc372..d655efa679ab 100644
--- a/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt
+++ b/tests/dotnet/UnitTests/expected/iOS-NativeAOT-size.txt
@@ -1,8 +1,8 @@
-AppBundleSize: 2,849,802 bytes (2,783.0 KB = 2.7 MB)
+AppBundleSize: 2,849,822 bytes (2,783.0 KB = 2.7 MB)
 # The following list of files and their sizes is just informational / for review, and isn't used in the test:
 _CodeSignature/CodeResources: 2,589 bytes (2.5 KB = 0.0 MB)
 archived-expanded-entitlements.xcent: 384 bytes (0.4 KB = 0.0 MB)
-Info.plist: 1,141 bytes (1.1 KB = 0.0 MB)
+Info.plist: 1,161 bytes (1.1 KB = 0.0 MB)
 PkgInfo: 8 bytes (0.0 KB = 0.0 MB)
 runtimeconfig.bin: 1,808 bytes (1.8 KB = 0.0 MB)
 SizeTestApp: 2,843,872 bytes (2,777.2 KB = 2.7 MB)
diff --git a/tools/common/Target.cs b/tools/common/Target.cs
index 64cc8fa88dd7..7970c889b403 100644
--- a/tools/common/Target.cs
+++ b/tools/common/Target.cs
@@ -344,11 +344,6 @@ void GenerateMainImpl (StringWriter sw, Abi abi)
 			sw.WriteLine ();
 			sw.WriteLine (assembly_externs);
 
-			if (app.PublishReadyToRun == true && app.PublishReadyToRunContainerFormat == "macho") {
-				sw.WriteLine ("extern void* RTR_HEADER;");
-				sw.WriteLine ();
-			}
-
 			sw.WriteLine ("void xamarin_register_modules_impl ()");
 			sw.WriteLine ("{");
 			sw.WriteLine (assembly_aot_modules);
@@ -440,8 +435,6 @@ void GenerateMainImpl (StringWriter sw, Abi abi)
 			sw.WriteLine ("\txamarin_runtime_configuration_name = {0};", string.IsNullOrEmpty (app.RuntimeConfigurationFile) ? "NULL" : $"\"{app.RuntimeConfigurationFile}\"");
 			if (app.Registrar == RegistrarMode.ManagedStatic)
 				sw.WriteLine ("\txamarin_set_is_managed_static_registrar (true);");
-			if (app.PublishReadyToRun == true && app.PublishReadyToRunContainerFormat == "macho")
-				sw.WriteLine ("\txamarin_rtr_header = &RTR_HEADER;");
 			sw.WriteLine ("}");
 			sw.WriteLine ();
 			sw.Write ("int main");