From cc49a5a7980a41092e181cc889f9814e35077c69 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Wed, 5 Feb 2020 17:05:51 -0800
Subject: [PATCH 1/5] Include Microsoft.DotNet.Wpf.DncEng only when running
 CppHelper in RepoLocation=External. When RepoLocation=Internal, this package
 is not really needed.

---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index 319b8a35c39..0ad3d31c4fb 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -499,8 +499,9 @@ using namespace System::Runtime::Versioning;
           <![CDATA[
    <ItemGroup>
       <PackageReference Include="runtime.$(WpfRuntimeIdentifier).Microsoft.DotNet.Wpf.DncEng"
-                      Version="$(MicrosoftDotNetWpfDncEngVersion)" 
-                      GeneratePathProperty="true" />
+                        Condition="'$(MicrosoftDotNetWpfDncEngVersion)' != ''"
+                        Version="$(MicrosoftDotNetWpfDncEngVersion)" 
+                        GeneratePathProperty="true" />
   </ItemGroup>
   ]]>
         </Text>

From 06a06500fb1cc4874201ec7ef288d123e96a8bf0 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Wed, 5 Feb 2020 17:18:03 -0800
Subject: [PATCH 2/5] Document FilterItem1ByItem2 task

---
 eng/WpfArcadeSdk/tools/InlineTasks.targets | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/eng/WpfArcadeSdk/tools/InlineTasks.targets b/eng/WpfArcadeSdk/tools/InlineTasks.targets
index 33bbd2842f7..3b4e438033d 100644
--- a/eng/WpfArcadeSdk/tools/InlineTasks.targets
+++ b/eng/WpfArcadeSdk/tools/InlineTasks.targets
@@ -7,6 +7,27 @@
     <TaskFactoryAssemblyToUse Condition="'$(MSBuildProjectExtension)'=='.vcxproj'">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll</TaskFactoryAssemblyToUse>
   </PropertyGroup>
   
+  <!-- 
+    Summary:
+      Selects @(Item2) items that are present in @(Item1). In effect, calculates 
+      set subtraction:
+      
+              Result = Item2 - Item1
+
+    Parameters:
+      @(Item1)                ITaskItem[]   Required
+      PreserveItem1Metadata   Bool          Optional    Preserves item-metadata from @(Item1) in @(Result)
+      
+      @(Item2)                ITaskItem[]   Required
+      Metadata2               String        Required
+      PreserveItem2Metadata   Bool          Optional    Preserves item-metadata from @(Item2) in @(Result)
+      
+      TreatItemsAsPaths       Bool          Optional
+      
+    Outputs:
+      @(Result)               ITaskItem[]
+      @(UnmatchedReferences)  ITaskItem[]
+  --> 
   <UsingTask TaskName="FilterItem1ByItem2"
                TaskFactory="$(TaskFactoryToUse)"
                AssemblyFile="$(TaskFactoryAssemblyToUse)">

From c46ef72673391e734e8924a4b4eaa6a53baacab9 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Wed, 5 Feb 2020 17:19:03 -0800
Subject: [PATCH 3/5] Use /Z7 (i.e., oldStyle) when building dotnet-wpf-int
 repo. This is needed to workaround
 https://github.com/dotnet/arcade/issues/4763

---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index c59044a2f0a..e829da76273 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -208,6 +208,14 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       
+      <!-- 
+        Workaround for https://github.com/dotnet/arcade/issues/4763
+        Embed PDB's into the .lib files directly using /Z7 when building out of 
+        dotnet-wpf-int repo
+      -->
+      <DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and 
+                                         '$(RepoLocation)' == 'Internal'">oldStyle</DebugInformationFormat>
+      
       <!-- 
         Disambiguate the PDB produced by the compiler with a -compile suffix, so that the PDB
         produced by the linker is not accidentally clobbered by this one.

From 68fed80f5a911b5d2d847af48e01f666a4cb81dd Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Wed, 5 Feb 2020 17:19:34 -0800
Subject: [PATCH 4/5] Add missing '\'; improve a condition

---
 eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index 0ad3d31c4fb..7359f1ebc96 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -462,10 +462,15 @@ using namespace System::Runtime::Versioning;
    The main purpose of this target is to restore the package with PathProperty=true. As a side-effect, 
    we will also generate an Item @(NuGetReferencesForCpp) from IdentifyNuGetReferences target, which
    will be used by ResolveMicrosoftDotNetWpfDncEngReferencesForCpp
+
+   Note: 
+    Test for "$(RepoLocation) != Internal" rather than "$(RepoLocation) == External"
+    The former form is more reliable. 
+
   -->
   <Target Name="CppHelper"
           Returns="@(NuGetReferencesForCpp)"
-          Condition="'$(ManagedCxx)' != 'true' and '$(RepoLocation)' == 'External'">
+          Condition="'$(ManagedCxx)' != 'true' and '$(RepoLocation)' != 'Internal'">
 
     <PropertyGroup>
       <CppHelperProject>$(IntermediateOutputPath)CppSupport\CppSupport_$(MSBuildProjectName).csproj</CppHelperProject>
@@ -522,7 +527,7 @@ using namespace System::Runtime::Versioning;
 
    <PropertyGroup>
       <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x86' Or '%24(WpfRuntimeIdentifier)'=='win-x86'">%24(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
-      <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
+      <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\%24(RuntimeIdentifier)\native\</WpfDncEngRidSpecificLibPath>
    </PropertyGroup>
 <!-- Save Microsoft.NETCore.App assemblies and return them -->
     <ItemGroup>
@@ -565,7 +570,7 @@ using namespace System::Runtime::Versioning;
     <MSBuild Projects="@(ProjectToBuild)"
          Targets="IdentifyNuGetReferences"
          Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
-      <Output TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
+      <Output  TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
     </MSBuild>
 
     <!-- Update with file path -->

From b49ad5972d729086eabfe76afa7edda0f4552ffe Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Wed, 5 Feb 2020 17:20:09 -0800
Subject: [PATCH 5/5] Add
 `<UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>`
 to native projects. This is needed to prevent these projects from building
 multiple times parallel.

---
 eng/WpfArcadeSdk/tools/WpfProjectReference.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
index e8be855867a..4f3ac6aa0c0 100644
--- a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
+++ b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
@@ -58,22 +58,26 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
     </WpfProjectPath>
     <WpfProjectPath Include="WpfGfx_cor3" ProjectPath="$(WpfSourceDir)WpfGfx\core\dll\WpfGfx.vcxproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>    
     </WpfProjectPath>
     <WpfProjectPath Include="PenImc_cor3" ProjectPath="$(WpfSourceDir)PenImc\dll\PenImc.vcxproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
     </WpfProjectPath>
 
     <WpfProjectPath Include="bilinearspan" ProjectPath="$(WpfSourceDir)WpfGfx\core\sw\bilinearspan\bilinearspan.vcxproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
     </WpfProjectPath>
 
   </ItemGroup>