Skip to content

[release/6.0] WPF projects that use a versioned custom SDK fail to build #5536

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 19, 2021
Merged

[release/6.0] WPF projects that use a versioned custom SDK fail to build #5536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e64f89
Port changes from https://github.com/dotnet/wpf/pull/5426 to release/6.0
ryalanms Oct 18, 2021
c46bf66
WPF projects that use a versioned custom SDK fail to build (#5426)
ThomasGoulet73 Oct 18, 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
66 changes: 48 additions & 18 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 @@ -757,52 +757,82 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
}

XmlNode root = xmlProjectDoc.DocumentElement;

for (int i = 0; i < root.Attributes.Count; i++)
{
XmlAttribute xmlAttribute = root.Attributes[i] as XmlAttribute;

if (xmlAttribute.Name.Equals("Sdk", StringComparison.OrdinalIgnoreCase))
{
// <Project Sdk="Microsoft.NET.Sdk">
// <Project Sdk="Microsoft.NET.Sdk">
// <Project Sdk="My.Custom.Sdk/1.0.0">
// <Project Sdk="My.Custom.Sdk/min=1.0.0">

string sdkValue = xmlAttribute.Value;

if (!SdkReference.TryParse(sdkValue, out SdkReference sdkReference))
return;

// Remove Sdk attribute
var sdkValue = xmlAttribute.Value;
root.Attributes.Remove(xmlAttribute);

//
// Add explicit top import
//
// <Import Project = "Sdk.props" Sdk="Microsoft.NET.Sdk" />
// <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
// <Import Project="Sdk.props" Sdk="My.Custom.Sdk" Version="1.0.0" />
// <Import Project="Sdk.props" Sdk="My.Custom.Sdk" MinimumVersion="1.0.0" />
//
XmlNode nodeImportProps = xmlProjectDoc.CreateElement("Import", root.NamespaceURI);
XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project");
projectAttribute.Value = "Sdk.props";
nodeImportProps.Attributes.Append(projectAttribute);
nodeImportProps.Attributes.Append(xmlAttribute);
XmlNode nodeImportProps = CreateImportProjectSdkNode(xmlProjectDoc, "Sdk.props", sdkReference);

// Prepend this Import to the root of the XML document
root.PrependChild(nodeImportProps);

//
// Add explicit bottom import
//
// <Import Project = "Sdk.targets" Sdk="Microsoft.NET.Sdk"
//
XmlNode nodeImportTargets = xmlProjectDoc.CreateElement("Import", root.NamespaceURI);
XmlAttribute projectAttribute2 = xmlProjectDoc.CreateAttribute("Project");
projectAttribute2.Value = "Sdk.targets";
XmlAttribute projectAttribute3 = xmlProjectDoc.CreateAttribute("Sdk");
projectAttribute3.Value = sdkValue;
nodeImportTargets.Attributes.Append(projectAttribute2);
nodeImportTargets.Attributes.Append(projectAttribute3);
// <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
// <Import Project="Sdk.targets" Sdk="My.Custom.Sdk" Version="1.0.0" />
// <Import Project="Sdk.targets" Sdk="My.Custom.Sdk" MinimumVersion="1.0.0" />
//
XmlNode nodeImportTargets = CreateImportProjectSdkNode(xmlProjectDoc, "Sdk.targets", sdkReference);

// Append this Import to the end of the XML document
root.AppendChild(nodeImportTargets);
}
}
}

// Creates an XmlNode that contains an Import Project element
//
// <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
static XmlNode CreateImportProjectSdkNode(XmlDocument xmlProjectDoc, string projectAttributeValue, SdkReference sdkReference)
{
XmlNode nodeImport = xmlProjectDoc.CreateElement("Import", xmlProjectDoc.DocumentElement.NamespaceURI);
XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project");
projectAttribute.Value = projectAttributeValue;
XmlAttribute sdkAttributeProps = xmlProjectDoc.CreateAttribute("Sdk");
sdkAttributeProps.Value = sdkReference.Name;
nodeImport.Attributes.Append(projectAttribute);
nodeImport.Attributes.Append(sdkAttributeProps);

if (!string.IsNullOrEmpty(sdkReference.Version))
{
XmlAttribute sdkVersionAttributeProps = xmlProjectDoc.CreateAttribute("Version");
sdkVersionAttributeProps.Value = sdkReference.Version;
nodeImport.Attributes.Append(sdkVersionAttributeProps);
}

if (!string.IsNullOrEmpty(sdkReference.MinimumVersion))
{
XmlAttribute sdkVersionAttributeProps = xmlProjectDoc.CreateAttribute("MinimumVersion");
sdkVersionAttributeProps.Value = sdkReference.MinimumVersion;
nodeImport.Attributes.Append(sdkVersionAttributeProps);
}

return nodeImport;
}

#endregion Private Methods


Expand Down