diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 097ab04454a0..b79b2ce0fc38 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -116,7 +116,10 @@
 		<_AdditionalTaskAssemblyDirectory>$(_XamarinSdkRootDirectory)tools/dotnet-linker/</_AdditionalTaskAssemblyDirectory>
 		<_AdditionalTaskAssembly>$(_AdditionalTaskAssemblyDirectory)dotnet-linker.dll</_AdditionalTaskAssembly>
 	</PropertyGroup>
-	<Target Name="_ComputeLinkerArguments" DependsOnTargets="_ComputeLinkMode">
+	<Target Name="_ComputeLinkerArguments" DependsOnTargets="_ComputeLinkMode;ComputeResolvedFilesToPublishList">
+		<!-- Validate the linker mode -->
+		<Error Text="Invalid link mode: '$(_LinkMode)'. Valid link modes are: 'None', 'SdkOnly' and 'Full'" Condition="'$(_LinkMode)' != 'None' And '$(_LinkMode)' != 'SdkOnly' And '$(_LinkMode)' != 'Full'" />
+
 		<PropertyGroup>
 			<!-- Pass the custom options to our custom steps -->
 			<_CustomLinkerOptionsFile>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)custom-linker-options.txt'))</_CustomLinkerOptionsFile>
@@ -146,6 +149,11 @@
 			<!-- System.Runtime.dll isn't always copied to the .app -->
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) -p copy "System.Runtime"</_ExtraTrimmerArgs>
 
+			<!-- TrimMode specifies what the linker will do with framework assemblies -->
+			<TrimMode Condition="'$(_LinkMode)' == 'None'">copy</TrimMode> <!-- Don't use 'copyused', because that might still end up saving some assemblies, and if that's the platform assembly, it may break the partial static registrar -->
+			<TrimMode Condition="'$(_LinkMode)' == 'SdkOnly' Or '$(_LinkMode)' == 'Full'">link</TrimMode>
+			<!-- For Full link mode we also need to set TrimMode for all non-framework assemblies. This is done further below -->
+
 			<!-- Verbose output, so that we get something to stdout when something goes wrong -->
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
 
@@ -161,7 +169,19 @@
 			-->
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) -b</_ExtraTrimmerArgs>
 		</PropertyGroup>
+
 		<ItemGroup>
+			<!-- Mark all assemblies to be linked if we're linking all assemblies -->
+			<ResolvedFileToPublish
+				Update="@(ResolvedFileToPublish)"
+				Condition="'$(_LinkMode)' == 'Full' And '%(ResolvedFileToPublish.Extension)' == '.dll' And '%(ResolvedFileToPublish.AssetType)' != 'native'"
+			>
+				<TrimMode>link</TrimMode>
+			</ResolvedFileToPublish>
+
+			<!-- Mark our entry assembly as a root assembly. -->
+			<TrimmerRootAssembly Include="$(AssemblyName)" />
+
 			<!-- add a custom step which inserts any other steps we need -->
 			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)">
 				<BeforeStep>LoadReferencesStep</BeforeStep>
diff --git a/tools/common/Application.cs b/tools/common/Application.cs
index 7bccce19232e..b1c228827d38 100644
--- a/tools/common/Application.cs
+++ b/tools/common/Application.cs
@@ -74,7 +74,7 @@ public partial class Application
 		public ApplePlatform Platform { get { return Driver.TargetFramework.Platform; } }
 
 		// Linker config
-		public LinkMode LinkMode = LinkMode.All;
+		public LinkMode LinkMode = LinkMode.Full;
 		public List<string> LinkSkipped = new List<string> ();
 		public List<string> Definitions = new List<string> ();
 		public I18nAssemblies I18n;
diff --git a/tools/common/LinkMode.cs b/tools/common/LinkMode.cs
index 4d293115c603..cff6a2ac4ad3 100644
--- a/tools/common/LinkMode.cs
+++ b/tools/common/LinkMode.cs
@@ -8,7 +8,7 @@ namespace Xamarin.Bundler {
 	public enum LinkMode {
 		None,
 		SDKOnly,
-		All,
+		Full,
 		Platform,
 	}
 }
diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs
index 23f4ebbfadc9..213f5a590dfd 100644
--- a/tools/mmp/driver.cs
+++ b/tools/mmp/driver.cs
@@ -599,7 +599,7 @@ static void Pack (IList<string> unprocessed)
 			if (generate_plist)
 				GeneratePList ();
 
-			if (App.LinkMode != LinkMode.All && App.RuntimeOptions != null)
+			if (App.LinkMode != LinkMode.Full && App.RuntimeOptions != null)
 				App.RuntimeOptions.Write (resources_dir);
 
 			if (App.AOTOptions != null && App.AOTOptions.IsAOT) {