From ab838b47d9318beb91cdd5ab13a1bad2b3d9c0aa Mon Sep 17 00:00:00 2001 From: gekka <10055381+gekka@users.noreply.github.com> Date: Sun, 28 Sep 2025 16:08:21 +0900 Subject: [PATCH] Fix: reordered import in temporary project to ensure correct property override --- .../Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 812f9116dbc..3d3787cd230 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 @@ -264,9 +264,6 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport() // Add Analyzers to Analyzer item list. AddNewItems(xmlProjectDoc, AnalyzerTypeName, Analyzers); - // Replace implicit SDK imports with explicit SDK imports - ReplaceImplicitImports(xmlProjectDoc); - // Add properties required for temporary assembly compilation var properties = new List<(string PropertyName, string PropertyValue)> { @@ -283,6 +280,10 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport() AddNewProperties(xmlProjectDoc, properties); + // Replace implicit SDK imports with explicit SDK imports + // In this temorary project file, the SDK import must be inserted before the added PropertyGroup. + ReplaceImplicitImports(xmlProjectDoc); + // Save the xmlDocument content into the temporary project file. xmlProjectDoc.Save(TemporaryTargetAssemblyProjectName);