From f427945115fc43591bd01b26bd315caf23d12947 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 25 Jul 2019 14:47:30 -0700
Subject: [PATCH 1/2] When producing ReadyToRun images, the ILLinker is
 configured to skip C++/CLI images. See mono/linker#651 and mono/linker#658.

In turn, this results in a failure of dependencies of such assemblies (like System.Diagnostics.Debug.dll, which is required by DirectWriteForwarder.dll) from being identified and included in the ReadyToRun images.

These linker hints tell ILLinker to include certain dependencies, which we know to be required by DirectWriteForwarder and System.Printing respectively.
---
 .../src/PresentationCore/ILLinkTrim.xml       |  5 ++++
 .../PresentationCore/PresentationCore.csproj  | 23 +++++++++++++++++++
 .../src/ReachFramework/ILLinkTrim.xml         |  5 ++++
 .../src/ReachFramework/ReachFramework.csproj  | 23 +++++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
 create mode 100644 src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
new file mode 100644
index 00000000000..7bf3371bd99
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
@@ -0,0 +1,5 @@
+<linker>
+  <!-- Include dependencies of DirectWriteForwarder, which is not
+       analyzed by the linker. -->
+  <assembly fullname="System.Diagnostics.Debug" />
+</linker>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
index 1e14b2e0eb7..c01546b7fe3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
@@ -1448,6 +1448,29 @@
       <XlfInput>false</XlfInput>
       <ManifestResourceName>ColorProfiles</ManifestResourceName>
     </EmbeddedResource>
+    
+    <!-- 
+        Workaround for https://github.com/dotnet/wpf/issues/1385
+        ReadyToRun images of WPF applications crash 
+        
+        When producing ReadyToRun images, the ILLinker is configured to skip 
+        C++/CLI images. See https://github.com/mono/linker/issues/651 and 
+        https://github.com/mono/linker/pull/658. 
+        
+        In turn, this results in the failure of the dependencies of such assemblies from being
+        identified and included in the ReadyToRun images. 
+        
+        This linker hint exists to ensure that such dependencies are included. We need
+        to place these hints in an assembly that has a reference to the corresponding
+        C++/CLI assembly. 
+        
+             PresentationCore -> DirectWriteFowarder
+             ReachFramework -> System.Printing
+    -->    
+    <EmbeddedResource Condition="Exists('ILLinkTrim.xml')" Include="ILLinkTrim.xml">
+      <XlfInput>false</XlfInput>
+      <LogicalName>$(AssemblyName).xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 
   <!-- Including the Microsoft.TextTemplating.targets requires us to manually import Sdk.Targets because
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
new file mode 100644
index 00000000000..31482de0011
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
@@ -0,0 +1,5 @@
+<linker>
+  <!-- Include dependencies of System.Printing, which is not
+       analyzed by the linker. -->
+  <assembly fullname="System.Diagnostics.Debug" />
+</linker>
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
index c56f253f181..c2301de6145 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
@@ -21,6 +21,29 @@
       <LogicalName>System.Printing.resources</LogicalName>
       <ManifestResourceName>System.Printing.resources</ManifestResourceName>
     </EmbeddedResource>
+    
+    <!-- 
+        Workaround for https://github.com/dotnet/wpf/issues/1385
+        ReadyToRun images of WPF applications crash 
+        
+        When producing ReadyToRun images, the ILLinker is configured to skip 
+        C++/CLI images. See https://github.com/mono/linker/issues/651 and 
+        https://github.com/mono/linker/pull/658. 
+        
+        In turn, this results in the failure of the dependencies of such assemblies from being
+        identified and included in the ReadyToRun images. 
+        
+        This linker hint exists to ensure that such dependencies are included. We need
+        to place these hints in an assembly that has a reference to the corresponding
+        C++/CLI assembly. 
+        
+             PresentationCore -> DirectWriteFowarder
+             ReachFramework -> System.Printing
+    -->    
+    <EmbeddedResource Condition="Exists('ILLinkTrim.xml')" Include="ILLinkTrim.xml">
+      <XlfInput>false</XlfInput>
+      <LogicalName>$(AssemblyName).xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   
   <ItemGroup>

From 78be6d01ca468a6d137af0681859890544210987 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 25 Jul 2019 16:57:18 -0700
Subject: [PATCH 2/2] Add netstandard and mscorlib to the list of dependencies

---
 src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml | 2 ++
 src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
index 7bf3371bd99..a488f34ce05 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
@@ -2,4 +2,6 @@
   <!-- Include dependencies of DirectWriteForwarder, which is not
        analyzed by the linker. -->
   <assembly fullname="System.Diagnostics.Debug" />
+  <assembly fullname="mscorlib" />
+  <assembly fullname="netstandard" />  
 </linker>
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
index 31482de0011..b5957362218 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
@@ -2,4 +2,6 @@
   <!-- Include dependencies of System.Printing, which is not
        analyzed by the linker. -->
   <assembly fullname="System.Diagnostics.Debug" />
+  <assembly fullname="mscorlib" />
+  <assembly fullname="netstandard" />
 </linker>