Skip to content

[release/6.0] Overbuild caused by PackageReference support (Remove WPF Arcade workaround) #5453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2021
Merged

[release/6.0] Overbuild caused by PackageReference support (Remove WPF Arcade workaround) #5453

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7a5f5
Remove WPF workaround that prevents collision with Arcade WPF tempora…
ryalanms Oct 5, 2021
8804eec
The fix is now in the Arcade SDK. Remove the property.
ryalanms Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...c/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down