From fc4649cc8e9b66933ea4613183b297890a78fc32 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <51839772+ThomasGoulet73@users.noreply.github.com>
Date: Tue, 8 Feb 2022 08:57:33 -0500
Subject: [PATCH] Pull release/6.0 into main (#6071)

---
 eng/WpfArcadeSdk/tools/ReferenceAssembly.targets            | 4 ++--
 global.json                                                 | 2 +-
 .../Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs  | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
index db2755f3d..f2698c7da 100644
--- a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
+++ b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
@@ -46,13 +46,13 @@
           Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
     <PropertyGroup>
       <!-- Also in global.json -->
-      <DotNetApiDocsNet50>0.0.0.3</DotNetApiDocsNet50>
+      <DotNetApiDocsNet60>0.0.0.4</DotNetApiDocsNet60>
 
       <!-- 
         This blob lives in Azure storage at https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/dotnet-api-docs_net6.0/
         Instructions for updating these artifacts are at https://github.com/dotnet/wpf/blob/master/docs/intellisense.md
       -->
-      <IntellisenseXmlDir>$(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net5.0\$(DotNetApiDocsNet50)\_intellisense\net-5.0\</IntellisenseXmlDir>
+      <IntellisenseXmlDir>$(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net6.0\$(DotNetApiDocsNet60)\_intellisense\net-6.0\</IntellisenseXmlDir>
     </PropertyGroup>
     
     <Error Condition="!Exists('$(IntellisenseXmlDir)')"
diff --git a/global.json b/global.json
index 9de7ee6a4..ff7e48767 100644
--- a/global.json
+++ b/global.json
@@ -21,6 +21,6 @@
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",
     "net-framework-48-ref-assemblies": "0.0.0.1",
-    "dotnet-api-docs_net5.0": "0.0.0.3"
+    "dotnet-api-docs_net6.0": "0.0.0.4"
   }
 }
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 ad650edd7..80a436dce 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)
-- 
GitLab