From 9a7a5f5c2fb58d003a6082ee645c009bbf831c8c Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Tue, 5 Oct 2021 13:13:13 -0700
Subject: [PATCH 1/2] Remove WPF workaround that prevents collision with Arcade
 WPF temporary project workaround

---
 Directory.Build.props                                       | 6 ++++++
 .../Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs  | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e011dfe2e94..a6935f770f3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,6 +2,12 @@
   <PropertyGroup>
     <RepositoryName>wpf</RepositoryName>
     <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
+     <!-- WPF's new PackageReference support conflicts with the existing Arcade's WPF temp project 
+          workaround.  Disable IsWpfTempProject to prevent Arcade's WPF temp workaround from colliding 
+          with PackageReference support during WPF Framework compilation.  See 
+          https://github.com/dotnet/arcade/pull/1581.  This property can be removed when 1518 (the 
+          workaround in the Arcade SDK) is removed.  -->
+    <IsWpfTempProject>false</IsWpfTempProject>
   </PropertyGroup>
 
   <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
index e77e6a6efa4..500e15350a7 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
@@ -281,15 +281,11 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
                 // Save the xmlDocument content into the temporary project file.
                 xmlProjectDoc.Save(TemporaryTargetAssemblyProjectName);
 
-                // Disable conflicting Arcade SDK workaround that imports NuGet props/targets
-                Hashtable globalProperties = new Hashtable(1);
-                globalProperties["_WpfTempProjectNuGetFilePathNoExt"] = "";
-
                 //
                 //  Compile the temporary target assembly project
                 //
                 Dictionary<string, ITaskItem[]> targetOutputs = new Dictionary<string, ITaskItem[]>();
-                retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, globalProperties, targetOutputs);
+                retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, null, targetOutputs);
 
                 // If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
                 if (retValue)

From 8804eec22406c0275e5324298fd022d79dac1b8c Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Thu, 7 Oct 2021 10:17:16 -0700
Subject: [PATCH 2/2] The fix is now in the Arcade SDK. Remove the property.

---
 Directory.Build.props | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a6935f770f3..e011dfe2e94 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,12 +2,6 @@
   <PropertyGroup>
     <RepositoryName>wpf</RepositoryName>
     <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
-     <!-- WPF's new PackageReference support conflicts with the existing Arcade's WPF temp project 
-          workaround.  Disable IsWpfTempProject to prevent Arcade's WPF temp workaround from colliding 
-          with PackageReference support during WPF Framework compilation.  See 
-          https://github.com/dotnet/arcade/pull/1581.  This property can be removed when 1518 (the 
-          workaround in the Arcade SDK) is removed.  -->
-    <IsWpfTempProject>false</IsWpfTempProject>
   </PropertyGroup>
 
   <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->