Skip to content
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

Jump to bottom

[xharness] Add support for adding PropertyGroups if none are applicable when adding a property. #9616

Merged
merged 1 commit into from
Sep 10, 2020
Merged

[xharness] Add support for adding PropertyGroups if none are applicable when adding a property. #9616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 37 additions & 27 deletions tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Utilities/ProjectFileExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,30 +351,25 @@ public static void AddMonoBundlingExtraArgs (this XmlDocument csproj, string val
public static void AddToNode (this XmlDocument csproj, string node, string value, string platform, string configuration)
{
var nodes = csproj.SelectNodes ($"//*[local-name() = '{node}']");
var found = false;
foreach (XmlNode mea in nodes) {
if (!IsNodeApplicable (mea, platform, configuration))
continue;

if (mea.InnerText.Length > 0 && mea.InnerText [mea.InnerText.Length - 1] != ' ')
mea.InnerText += " ";
mea.InnerText += value;
found = true;
}

if (found)
return;
}

// The project might not have this node, so create one of none was found.
var propertyGroups = csproj.SelectNodes ("//*[local-name() = 'PropertyGroup' and @Condition]");
foreach (XmlNode pg in propertyGroups) {
if (!EvaluateCondition (pg, platform, configuration))
continue;
var propertyGroups = csproj.SelectNodes ("//*[local-name() = 'PropertyGroup' and @Condition]").Cast<XmlNode> ();
var propertyGroup = propertyGroups.FirstOrDefault (v => EvaluateCondition (v, platform, configuration));
if (propertyGroup == null)
propertyGroup = csproj.AddPropertyGroup (platform, configuration);

var mea = csproj.CreateElement (node, csproj.GetNamespace ());
mea.InnerText = value;
pg.AppendChild (mea);
}
var newNode = csproj.CreateElement (node, csproj.GetNamespace ());
newNode.InnerText = value;
propertyGroup.AppendChild (newNode);
}

public static string GetMtouchLink (this XmlDocument csproj, string platform, string configuration)
Expand Down Expand Up @@ -827,25 +822,40 @@ public static void AddAdditionalDefines (this XmlDocument csproj, string value,
return;
}

var newPropertyGroup = csproj.AddPropertyGroup (platform, configuration);
var defineConstantsElement = csproj.CreateElement ("DefineConstants", csproj.GetNamespace ());
defineConstantsElement.InnerText = "$(DefineConstants);" + value;
newPropertyGroup.AppendChild (defineConstantsElement);
}

static XmlNode AddPropertyGroup (this XmlDocument csproj, string platform, string configuration)
{
// Create a new PropertyGroup with the desired condition, and add it just after the last PropertyGroup in the csproj.
var projectNode = csproj.SelectSingleNode ("//*[local-name() = 'Project']");
var lastPropertyGroup = csproj.SelectNodes ("//*[local-name() = 'PropertyGroup']").Cast<XmlNode> ().Last ();
var lastPropertyGroup = csproj.SelectNodes ("/*[local-name() = 'Project']/*[local-name() = 'PropertyGroup']").Cast<XmlNode> ().Last ();
var newPropertyGroup = csproj.CreateElement ("PropertyGroup", csproj.GetNamespace ());
var conditionAttribute = csproj.CreateAttribute ("Condition");
var condition = "";
if (!string.IsNullOrEmpty (platform))
condition = $"'$(Platform)' == '{platform}'";
if (!string.IsNullOrEmpty (configuration)) {
if (!string.IsNullOrEmpty (condition))
condition += " And ";
condition += $"'$(Configuration)' == '{configuration}'";
if (!string.IsNullOrEmpty (platform) || !string.IsNullOrEmpty (configuration)) {
// Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "
var conditionAttribute = csproj.CreateAttribute ("Condition");
var left = string.Empty;
var right = string.Empty;
if (!string.IsNullOrEmpty (configuration)) {
left = "$(Configuration)";
right = configuration;
}
if (!string.IsNullOrEmpty (platform)) {
if (!string.IsNullOrEmpty (left)) {
left += "|";
right += "|";
}
left += "$(Platform)";
right += platform;
}
conditionAttribute.Value = $"'{left}' == '{right}'";
newPropertyGroup.Attributes.Append (conditionAttribute);
}
conditionAttribute.Value = condition;
newPropertyGroup.Attributes.Append (conditionAttribute);
var defineConstantsElement = csproj.CreateElement ("DefineConstants", csproj.GetNamespace ());
defineConstantsElement.InnerText = "$(DefineConstants);" + value;
newPropertyGroup.AppendChild (defineConstantsElement);
projectNode.InsertAfter (newPropertyGroup, lastPropertyGroup);
return newPropertyGroup;
}

public static void AddTopLevelProperty (this XmlDocument csproj, string property, string value)
Expand Down