From 8e63b07913377f64857882f5ebaf8d9ceaba0af9 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 21 Mar 2024 13:13:45 +0100
Subject: [PATCH 1/4] [dotnet] Make 'TrimMode=full' the default for release
 builds in our templates.

---
 .../maccatalyst/csharp/MacCatalystApp1.csproj               | 6 ++++++
 .../Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj | 6 ++++++
 .../Microsoft.iOS.Templates/ios/csharp/iOSApp1.csproj       | 6 ++++++
 .../Microsoft.macOS.Templates/macos/csharp/macOSApp1.csproj | 6 ++++++
 .../Microsoft.tvOS.Templates/tvos/csharp/tvOSApp1.csproj    | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
index 5aa19cf04895..94b57039fcd4 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/csharp/MacCatalystApp1.csproj
@@ -11,6 +11,12 @@
     <ImplicitUsings>true</ImplicitUsings>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
+
+    <!--
+      Enable full trimming in Release mode.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
+    -->
+    <TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
   </PropertyGroup>
 
   <!-- Notes about the values set below:
diff --git a/dotnet/Templates/Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj b/dotnet/Templates/Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj
index 8d9f4b27f363..f1edd7011eaa 100644
--- a/dotnet/Templates/Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj
+++ b/dotnet/Templates/Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj
@@ -6,5 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
+
+    <!--
+      Enable full trimming in Release mode.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
+    -->
+    <TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.iOS.Templates/ios/csharp/iOSApp1.csproj b/dotnet/Templates/Microsoft.iOS.Templates/ios/csharp/iOSApp1.csproj
index 0d36a839d48d..f894bc211824 100644
--- a/dotnet/Templates/Microsoft.iOS.Templates/ios/csharp/iOSApp1.csproj
+++ b/dotnet/Templates/Microsoft.iOS.Templates/ios/csharp/iOSApp1.csproj
@@ -6,5 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
+
+    <!--
+      Enable full trimming in Release mode.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
+    -->
+    <TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/macOSApp1.csproj b/dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/macOSApp1.csproj
index 673970a02b56..a87d57a208ed 100644
--- a/dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/macOSApp1.csproj
+++ b/dotnet/Templates/Microsoft.macOS.Templates/macos/csharp/macOSApp1.csproj
@@ -6,5 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
+
+    <!--
+      Enable full trimming in Release mode.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
+    -->
+    <TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.tvOS.Templates/tvos/csharp/tvOSApp1.csproj b/dotnet/Templates/Microsoft.tvOS.Templates/tvos/csharp/tvOSApp1.csproj
index 8bffbdd36f06..173bcca565f1 100644
--- a/dotnet/Templates/Microsoft.tvOS.Templates/tvos/csharp/tvOSApp1.csproj
+++ b/dotnet/Templates/Microsoft.tvOS.Templates/tvos/csharp/tvOSApp1.csproj
@@ -6,5 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
+
+    <!--
+      Enable full trimming in Release mode.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/trimming-options#trimming-granularity
+    -->
+    <TrimMode Condition="'$(Configuration)' == 'Release'">full</TrimMode>
   </PropertyGroup>
 </Project>

From 3b82a7da30ad28d711971990af7c36ff7672ea94 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 21 Mar 2024 13:14:23 +0100
Subject: [PATCH 2/4] [dotnet] Change all library templates to set
 'IsTrimmable=true'.

This way the trimming analyzers will be enabled for library projects, which
will help towards getting all libraries trimmer safe.
---
 .../maccatalystbinding/csharp/MacCatalystBinding1.csproj    | 6 ++++++
 .../maccatalystlib/csharp/MacCatalystLib1.csproj            | 6 ++++++
 .../iosbinding/csharp/iOSBinding1.csproj                    | 6 ++++++
 .../Microsoft.iOS.Templates/ioslib/csharp/iOSLib1.csproj    | 6 ++++++
 .../macosbinding/csharp/macOSBinding1.csproj                | 6 ++++++
 .../macoslib/csharp/macOSLib1.csproj                        | 6 ++++++
 .../tvosbinding/csharp/tvOSBinding1.csproj                  | 6 ++++++
 .../Microsoft.tvOS.Templates/tvoslib/csharp/tvOSLib1.csproj | 6 ++++++
 8 files changed, 48 insertions(+)

diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystbinding/csharp/MacCatalystBinding1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystbinding/csharp/MacCatalystBinding1.csproj
index 2e39782bbdcb..b0bb9a5acfe8 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystbinding/csharp/MacCatalystBinding1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystbinding/csharp/MacCatalystBinding1.csproj
@@ -5,6 +5,12 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <IsBindingProject>true</IsBindingProject>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystlib/csharp/MacCatalystLib1.csproj b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystlib/csharp/MacCatalystLib1.csproj
index 966cd2c77c9d..5dae695100cf 100644
--- a/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystlib/csharp/MacCatalystLib1.csproj
+++ b/dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystlib/csharp/MacCatalystLib1.csproj
@@ -4,5 +4,11 @@
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystLib1</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.iOS.Templates/iosbinding/csharp/iOSBinding1.csproj b/dotnet/Templates/Microsoft.iOS.Templates/iosbinding/csharp/iOSBinding1.csproj
index f5fb2a162d07..7c8280edeb93 100644
--- a/dotnet/Templates/Microsoft.iOS.Templates/iosbinding/csharp/iOSBinding1.csproj
+++ b/dotnet/Templates/Microsoft.iOS.Templates/iosbinding/csharp/iOSBinding1.csproj
@@ -5,6 +5,12 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <IsBindingProject>true</IsBindingProject>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/dotnet/Templates/Microsoft.iOS.Templates/ioslib/csharp/iOSLib1.csproj b/dotnet/Templates/Microsoft.iOS.Templates/ioslib/csharp/iOSLib1.csproj
index ba5bfe4e9faf..a77d6526d31f 100644
--- a/dotnet/Templates/Microsoft.iOS.Templates/ioslib/csharp/iOSLib1.csproj
+++ b/dotnet/Templates/Microsoft.iOS.Templates/ioslib/csharp/iOSLib1.csproj
@@ -4,5 +4,11 @@
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.macOS.Templates/macosbinding/csharp/macOSBinding1.csproj b/dotnet/Templates/Microsoft.macOS.Templates/macosbinding/csharp/macOSBinding1.csproj
index 75c094cbb7ff..c9d67d9c6054 100644
--- a/dotnet/Templates/Microsoft.macOS.Templates/macosbinding/csharp/macOSBinding1.csproj
+++ b/dotnet/Templates/Microsoft.macOS.Templates/macosbinding/csharp/macOSBinding1.csproj
@@ -5,6 +5,12 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <IsBindingProject>true</IsBindingProject>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/dotnet/Templates/Microsoft.macOS.Templates/macoslib/csharp/macOSLib1.csproj b/dotnet/Templates/Microsoft.macOS.Templates/macoslib/csharp/macOSLib1.csproj
index 858a4723ba6b..b59b1054e293 100644
--- a/dotnet/Templates/Microsoft.macOS.Templates/macoslib/csharp/macOSLib1.csproj
+++ b/dotnet/Templates/Microsoft.macOS.Templates/macoslib/csharp/macOSLib1.csproj
@@ -4,5 +4,11 @@
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">macOSLib1</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 </Project>
diff --git a/dotnet/Templates/Microsoft.tvOS.Templates/tvosbinding/csharp/tvOSBinding1.csproj b/dotnet/Templates/Microsoft.tvOS.Templates/tvosbinding/csharp/tvOSBinding1.csproj
index 99cfa5b053a7..55a8a2e61e7d 100644
--- a/dotnet/Templates/Microsoft.tvOS.Templates/tvosbinding/csharp/tvOSBinding1.csproj
+++ b/dotnet/Templates/Microsoft.tvOS.Templates/tvosbinding/csharp/tvOSBinding1.csproj
@@ -5,6 +5,12 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <IsBindingProject>true</IsBindingProject>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/dotnet/Templates/Microsoft.tvOS.Templates/tvoslib/csharp/tvOSLib1.csproj b/dotnet/Templates/Microsoft.tvOS.Templates/tvoslib/csharp/tvOSLib1.csproj
index 854e54f739ef..9512a09c27b4 100644
--- a/dotnet/Templates/Microsoft.tvOS.Templates/tvoslib/csharp/tvOSLib1.csproj
+++ b/dotnet/Templates/Microsoft.tvOS.Templates/tvoslib/csharp/tvOSLib1.csproj
@@ -4,5 +4,11 @@
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">tvOSLib1</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+
+    <!--
+      Enable trim analyzers for class libraries.
+      To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
+    -->
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 </Project>

From ef26cb8973608f90ffff8cc21531d58d0523dbe3 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 21 Mar 2024 13:15:35 +0100
Subject: [PATCH 3/4] [dotnet] Don't suppress trimmer warnings anymore when
 'TrimMode=full' is set.

---
 dotnet/targets/Xamarin.Shared.Sdk.props   | 22 +++++++++++++---------
 dotnet/targets/Xamarin.Shared.Sdk.targets |  4 ++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index e2c40248b2b2..ba5b9c0fde4d 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -40,15 +40,6 @@
 		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_UseNativeAot)' == 'true'">false</UseMonoRuntime>
 		<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == ''">true</UseMonoRuntime>
 
-		<!--
-			With NativeAOT we want to suppress trim warnings coming from ILLink and enable them only for ILC.
-			For this reason, in case of NativeAOT, we set SuppressTrimAnalysisWarnings to true by default and store the overwriten default in
-			_OriginalSuppressTrimAnalysisWarnings property, which is later used to properly configure warning suppression for ILC.
-		-->
-		<_OriginalSuppressTrimAnalysisWarnings>$(SuppressTrimAnalysisWarnings)</_OriginalSuppressTrimAnalysisWarnings>
-		<SuppressTrimAnalysisWarnings Condition="'$(_UseNativeAot)' == 'true'">true</SuppressTrimAnalysisWarnings>
-		<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == ''">true</SuppressTrimAnalysisWarnings>
-
 		<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets</AfterMicrosoftNETSdkTargets>
 
 		<!-- _XamarinSdkRoot is used by the existing MSBuild targets files -->
@@ -173,6 +164,19 @@
 		<!-- For None link mode we also need to set TrimMode for all assemblies. This is done later -->
 	</PropertyGroup>
 
+	<PropertyGroup>
+		<!--
+			With NativeAOT we want to suppress trim warnings coming from ILLink and enable them only for ILC.
+			For this reason, in case of NativeAOT, we set SuppressTrimAnalysisWarnings to true by default and store the overwriten default in
+			_OriginalSuppressTrimAnalysisWarnings property, which is later used to properly configure warning suppression for ILC.
+		-->
+		<_OriginalSuppressTrimAnalysisWarnings>$(SuppressTrimAnalysisWarnings)</_OriginalSuppressTrimAnalysisWarnings>
+		<SuppressTrimAnalysisWarnings Condition="'$(_UseNativeAot)' == 'true'">true</SuppressTrimAnalysisWarnings>
+		<!-- Otherwise suppress trimmer warnings unless we're trimming all assemblies -->
+		<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == '' And '$(TrimMode)' == 'full'">false</SuppressTrimAnalysisWarnings>
+		<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == ''">true</SuppressTrimAnalysisWarnings>
+	</PropertyGroup>
+
 	<!-- We're never using any app hosts -->
 	<PropertyGroup>
 		<_RuntimeIdentifierUsesAppHost>false</_RuntimeIdentifierUsesAppHost>
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 7db0b60ac8f2..82875388479f 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -526,6 +526,10 @@
 			<!-- Yep, we want to run ILLink as well, because we need our custom steps to run (NativeAOT sets this to false, so set it back to true) -->
 			<RunILLink Condition="'$(PublishAot)' == 'true'">true</RunILLink>
 
+			<!-- Suppress trimmer warnings unless we're trimming all assemblies -->
+			<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == '' And '$(TrimMode)' == 'full'">false</SuppressTrimAnalysisWarnings>
+			<SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == ''">true</SuppressTrimAnalysisWarnings>
+
 			<!-- Pass the custom options to our custom steps -->
 			<_CustomLinkerOptionsFile>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)custom-linker-options.txt'))</_CustomLinkerOptionsFile>
 			<_CustomLinkerOptionsFile Condition="'$(BuildSessionId)' != ''">$(IntermediateOutputPath)custom-linker-options.txt</_CustomLinkerOptionsFile>

From ce98e3f07fb38fd2bd39d6bef9023f7ecaa7ab7f Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 18 Apr 2024 08:58:56 +0200
Subject: [PATCH 4/4] [dotnet] Disable COM object descriptor support.

This is off by default in .NET, but it's turned off in a property group
conditioned on "PublishTrimmed = true", which we only set in a target later in
the build, thus we don't pick up the default.

Fixes:

> Trim analysis error IL2026: System.ComponentModel.TypeDescriptor.NodeFor(Object, Boolean): Using member 'System.ComponentModel.TypeDescriptor.ComObjectType.get' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. COM type descriptors are not trim-compatible.
---
 dotnet/targets/Xamarin.Shared.Sdk.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 82875388479f..9e419e993c92 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -145,6 +145,7 @@
 		<VerifyDependencyInjectionOpenGenericServiceTrimmability Condition="'$(VerifyDependencyInjectionOpenGenericServiceTrimmability)' == ''">true</VerifyDependencyInjectionOpenGenericServiceTrimmability>
 		<!-- This should be set by dotnet/sdk instead, once https://github.com/dotnet/sdk/issues/25392 gets resolved.  -->
 		<DynamicCodeSupport Condition="'$(DynamicCodeSupport)' == '' And '$(MtouchInterpreter)' != '' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS' Or '$(_PlatformName)' == 'MacCatalyst')">false</DynamicCodeSupport>
+		<_ComObjectDescriptorSupport Condition="'$(_ComObjectDescriptorSupport)' == ''">false</_ComObjectDescriptorSupport>
 
 		<!-- We don't need to generate reference assemblies for apps or app extensions -->
 		<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' And ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true')">false</ProduceReferenceAssembly>