From c2fd30d7841299af4b0cc68748123abd4af11cb2 Mon Sep 17 00:00:00 2001
From: Scott Jones <scottj1s@gmail.com>
Date: Tue, 10 Oct 2023 10:47:39 -0700
Subject: [PATCH] Set TrimMode explicitly back to partial for .NET 7 compat
 (#1378)

See:

https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trimming-options?pivots=dotnet-7-0
---
 .../PublishProfiles/win10-arm64-unpackaged.pubxml           | 6 ++++++
 WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml  | 6 ++++++
 .../Properties/PublishProfiles/win10-x64-unpackaged.pubxml  | 6 ++++++
 WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml    | 6 ++++++
 .../Properties/PublishProfiles/win10-x86-unpackaged.pubxml  | 6 ++++++
 WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml    | 6 ++++++
 6 files changed, 36 insertions(+)

diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
index 7ec8241fc..234387866 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>ARM64</Platform>
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
index b0de94924..7777f0dc8 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>ARM64</Platform>
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
index 475bdcab5..0b74be333 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
index 5c98a9790..0ba94cf14 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
index ab2cf4da1..2bda3fa70 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
index 7852b5272..8319695f4 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
     <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file