Re-merge DirectWriteForwarder into PresentationCore

Microsoft.Dotnet.Wpf.sln

@@ -29,9 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.Projec
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "src\Microsoft.DotNet.Wpf\src\WindowsBase\WindowsBase.csproj", "{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "src\Microsoft.DotNet.Wpf\src\DirectWriteForwarder\DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PresentationCore", "PresentationCore", "{71F15358-4D5F-4A27-9639-CAC2DA4D88C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore", "src\Microsoft.DotNet.Wpf\src\PresentationCore\PresentationCore.csproj", "{74C63A45-EAE5-407A-9F89-E0C6BC604841}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCoreCSharp", "src\Microsoft.DotNet.Wpf\src\PresentationCore\CSharp\PresentationCoreCSharp.csproj", "{74C63A45-EAE5-407A-9F89-E0C6BC604841}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "src\Microsoft.DotNet.Wpf\src\PresentationCore\DirectWriteForwarder\DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresentationCore", "src\Microsoft.DotNet.Wpf\src\PresentationCore\PresentationCore.vcxproj", "{E490620F-542F-4F65-9DAA-577F17B0CCB9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework", "src\Microsoft.DotNet.Wpf\src\PresentationFramework\PresentationFramework.csproj", "{B0C1157E-8664-44C4-AD8E-35CD6A78C769}"
 EndProject
@@ -279,6 +283,18 @@ Global
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.Build.0 = Release|x64
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.ActiveCfg = Release|Any CPU
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.Build.0 = Release|Any CPU
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.Build.0 = Debug|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.Deploy.0 = Debug|Win32
@@ -297,18 +313,24 @@ Global
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.ActiveCfg = Release|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.Build.0 = Release|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.Deploy.0 = Release|Win32
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.ActiveCfg = Debug|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.Build.0 = Debug|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.Build.0 = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.ActiveCfg = Release|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.Build.0 = Release|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.ActiveCfg = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.Build.0 = Release|Any CPU
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.Build.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.Deploy.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.ActiveCfg = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.Build.0 = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.Deploy.0 = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.ActiveCfg = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.Build.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.Deploy.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.Build.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.Deploy.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.ActiveCfg = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.Build.0 = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.Deploy.0 = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.ActiveCfg = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.Build.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.Deploy.0 = Release|Win32
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|x64.ActiveCfg = Debug|x64
@@ -1037,6 +1059,9 @@ Global
 		{1D4C8AD7-12E7-4987-98AF-AEE79F53E494} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
 		{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1} = {1D4C8AD7-12E7-4987-98AF-AEE79F53E494}
 		{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
+		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
 		{2DD6F2F8-DFF4-4EE1-9D48-0FD692DB084D} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}
 		{D242FDF9-F132-4154-BB9F-3F85C39F6F4C} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}
 		{4C99DEEE-ED7A-4225-8127-3B1E6EDB39D0} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}

src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml → eng/WpfArcadeSdk/tools/ILLinkTrim.xml

@@ -1,5 +1,5 @@
 <linker>
-  <!-- Include dependencies of DirectWriteForwarder, which is not
+  <!-- Include C++/CLI assembly dependencies, which are not
        analyzed by the linker. -->
   <assembly fullname="System.Diagnostics.Debug" />
   <assembly fullname="mscorlib" />

eng/WpfArcadeSdk/tools/ShippingProjects.props

@@ -4,7 +4,6 @@
       System.Xaml;
       PresentationBuildTasks;
       PresentationCore;
-      DirectWriteForwarder;
       PresentationFramework;
       ReachFramework;
       UIAutomationClient;
@@ -108,7 +107,6 @@
       These assemblies have the public key id 31bf3856ad364e35 (MicrosoftShared)
     -->
     <UseMicrosoftSharedKeyId>
-      DirectWriteForwarder;
       PresentationBuildTasks;
       PresentationCore;
       PresentationCore-ref;

eng/WpfArcadeSdk/tools/SystemResources.props

@@ -28,6 +28,8 @@
       <ClassName Condition="'$(AssemblyName)'=='PresentationUI'">System.Windows.TrustUI.SRID</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='WindowsFormsIntegration'">System.Windows.SRID</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='PresentationCore'">MS.Internal.PresentationCore.SRID </ClassName>
+      <!-- Required to ensure the PresentationCore CSharp NetModule builds. -->
+      <ClassName Condition="'$(AssemblyName)'=='PresentationCoreCSharp'">MS.Internal.PresentationCore.SRID </ClassName>
       <Classname Condition="'%(ClassName)'==''">System.SRID</Classname>
     </EmbeddedResource>
   </ItemDefinitionGroup>

eng/WpfArcadeSdk/tools/Wpf.Cpp.targets

@@ -176,7 +176,7 @@ END
       Additional assembly scope attributes besides TargetFrameworkAttribute are added here 
   -->
   <Target Name="GenerateTargetFrameworkMonikerAttribute2"
-      Condition="'$(ManagedCxx)'=='true'"
+      Condition="'$(ManagedCxx)'=='true' and '$(GenerateAssemblyInfo)'!='false'"
           BeforeTargets="SetMscorlibAdditionalUsingDirectory"
           DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths;InitializeAssemblyAttributeInformation"
           Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)">
@@ -296,7 +296,7 @@ using namespace System::Runtime::Versioning;
     the C++ compiler. 
 
     A simple C# project is generated dynamically. It contains PackageReferences for common packages
-    that are used in WPF's C++/CLI projects. There are only two such projects - DirectWriteForwarder
+    that are used in WPF's C++/CLI projects. There are only three such projects - DirectWriteForwarder, PresentationCore
     and System.Printing - which makes it unnecessary to create a flexible and parametrized target. This
     can remain a simple and one-size-fits-all target for now. 
 

eng/WpfArcadeSdk/tools/WpfProjectReference.targets

@@ -12,9 +12,6 @@
   <ItemGroup>
     <WpfProjectPath Include="System.Xaml" ProjectPath="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <WpfProjectPath Include="WindowsBase" ProjectPath="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <WpfProjectPath Include="DirectWriteForwarder" ProjectPath="$(WpfSourceDir)DirectWriteForwarder\DirectWriteForwarder.vcxproj">
-      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
-    </WpfProjectPath>
     <WpfProjectPath Include="System.Windows.Input.Manipulations" ProjectPath="$(WpfSourceDir)System.Windows.Input.Manipulations\System.Windows.Input.Manipulations.csproj" />
     <WpfProjectPath Include="WindowsFormsIntegration" ProjectPath="$(WpfSourceDir)WindowsFormsIntegration\WindowsFormsIntegration.csproj" />
 
@@ -63,15 +60,51 @@
     </CoreCompileDependsOn>
     <ResolveReferencesDependsOn>
       EnsureWpfProjectReference;
+      EnsureILLinkerTrimming;
       $(ResolveReferencesDependsOn)
-      </ResolveReferencesDependsOn>
+    </ResolveReferencesDependsOn>
     <MarkupCompilePass1DependsOn>
       EnsureWpfProjectReference;
+      EnsureILLinkerTrimming;
       $(MarkupCompilePass1DependsOn)
     </MarkupCompilePass1DependsOn>
   </PropertyGroup>
-
 
+  <!--
+    Automatically add ILLinkTrim.xml as a resource to any project that references 
+    PresentationCore.vcxproj or System.Printing.vcxproj and is a shipping assembly
+    but not a reference assembly.
+  -->
+  <Target Name="EnsureILLinkerTrimming"
+          Condition="'$(IsShipping)'=='true' 
+                      and !$(HandCraftedReferenceProjects.Contains('$(MSBuildProjectName);'))
+                      and !$(MSBuildProjectFile.Contains('vcxproj'))">
+    <ItemGroup>
+      <_PCoreAndSysPrintingReferences Include="@(ProjectReference)" 
+                                      Condition="'%(Filename)%(Extension)'=='PresentationCore.vcxproj' 
+                                                 or '%(Filename)%(Extension)'=='System.Printing.vcxproj'"/>
+      <!-- 
+        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. 
+      -->
+      <EmbeddedResource Include="$(WpfArcadeSdkToolsDir)ILLinkTrim.xml"
+                        Condition="'@(_PCoreAndSysPrintingReferences->Count())' &gt; 0">
+        <XlfInput>false</XlfInput>
+        <LogicalName>$(AssemblyName).xml</LogicalName>
+      </EmbeddedResource>
+    </ItemGroup>
+  </Target>
 
   <Target Name="EnsureWpfProjectReference" 
           DependsOnTargets="$(EnsureWpfProjectReferenceDependsOn)"

src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationCore-ref.baseline.txt

@@ -1,4 +1,5 @@
 Compat issues with assembly PresentationCore:
+TypesMustExist : Type 'MS.Internal.TrueTypeSubsetter' does not exist in the implementation but it does exist in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Windows.LocalizabilityAttribute' changed from '[AttributeUsageAttribute(412, AllowMultiple=false, Inherited=true)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false, Inherited=true)]' in the implementation.
 CannotRemoveAttribute : Attribute 'MS.Internal.PresentationCore.FriendAccessAllowedAttribute' exists on 'System.Windows.Input.InputEventArgs' in the contract but not the implementation.
 MembersMustExist : Member 'System.Windows.Media.Brush.AddRefOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
@@ -19,4 +20,4 @@ MembersMustExist : Member 'System.Windows.Media.Imaging.BitmapDecoder.SealObject
 MembersMustExist : Member 'System.Windows.Media.Imaging.BitmapEncoder.SealObject()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Windows.Media.TextFormatting.TextFormatter.CreateParagraphCache(System.Windows.Media.TextFormatting.TextSource, System.Int32, System.Double, System.Windows.Media.TextFormatting.TextParagraphProperties, System.Windows.Media.TextFormatting.TextLineBreak, System.Windows.Media.TextFormatting.TextRunCache)' does not exist in the implementation but it does exist in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Windows.Resources.AssemblyAssociatedContentFileAttribute' changed from '[AttributeUsageAttribute(1, AllowMultiple=true)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Assembly, AllowMultiple=true)]' in the implementation.
-Total Issues: 20
+Total Issues: 21

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj

@@ -45,7 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj

@@ -50,7 +50,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj

@@ -45,7 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj

@@ -29,7 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
   </ItemGroup>

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI.internals.cs

@@ -6,7 +6,7 @@
 // ------------------------------------------------------------------------------
 
 using System.Runtime.CompilerServices;
-using MS.Internal.PresentationCore;
+using Microsoft.Internal;
 
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFramework)]