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 @@
true
MacCatalystApp1
minOSVersion
+
+
+ full
+ true
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 @@
MacCatalystLib1
enable
true
+
+
+ true
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 @@
enable
true
minOSVersion
+
+
+ full
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 @@
enable
true
minOSVersion
+
+
+ full
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 @@
enable
true
true
+
+
+ true
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 @@
iOSLib1
enable
true
+
+
+ true
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 @@
enable
true
minOSVersion
+
+
+ full
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 @@
enable
true
true
+
+
+ true
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 @@
macOSLib1
enable
true
+
+
+ true
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 @@
enable
true
minOSVersion
+
+
+ full
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 @@
enable
true
true
+
+
+ true
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 @@
tvOSLib1
enable
true
+
+
+ true
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 @@
false
true
-
- <_OriginalSuppressTrimAnalysisWarnings>$(SuppressTrimAnalysisWarnings)
- true
- true
-
$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets
@@ -173,6 +164,19 @@
+
+
+ <_OriginalSuppressTrimAnalysisWarnings>$(SuppressTrimAnalysisWarnings)
+ true
+
+ false
+ true
+
+
<_RuntimeIdentifierUsesAppHost>false
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 7db0b60ac8f2..9e419e993c92 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -145,6 +145,7 @@
true
false
+ <_ComObjectDescriptorSupport Condition="'$(_ComObjectDescriptorSupport)' == ''">false
false
@@ -526,6 +527,10 @@
true
+
+ false
+ true
+
<_CustomLinkerOptionsFile>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)custom-linker-options.txt'))
<_CustomLinkerOptionsFile Condition="'$(BuildSessionId)' != ''">$(IntermediateOutputPath)custom-linker-options.txt