Skip to content

[XHarness] Ensure we do not crash if the framework node is missing. #5792

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
mandel-macaque merged 2 commits into from
Mar 20, 2019
Merged

[XHarness] Ensure we do not crash if the framework node is missing. #5792

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76009f4
[XHarness] Ensure we do not crash if the framework node is missing.
mandel-macaque Mar 20, 2019
5917fb4
Ensure we do not crash when Info.plist is missing.
mandel-macaque Mar 20, 2019
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
20 changes: 13 additions & 7 deletions tests/xharness/ProjectFileExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@ public static void SetTopLevelPropertyGroupValue (this XmlDocument csproj, strin

public static void RemoveTargetFrameworkIdentifier (this XmlDocument csproj)
{
RemoveNode (csproj, "TargetFrameworkIdentifier");
try {
RemoveNode (csproj, "TargetFrameworkIdentifier");
} catch {
// ignore exceptions, if not present, we are not worried
}
}

public static void SetAssemblyName (this XmlDocument csproj, string value)
Expand Down Expand Up @@ -549,13 +553,15 @@ static void FindAndReplace (XmlNodeList nodes, string find, string replace)
public static void FixInfoPListInclude (this XmlDocument csproj, string suffix)
{
var import = csproj.SelectSingleNode ("/*/*/*[local-name() = 'None' and contains(@Include ,'Info.plist')]");
import.Attributes ["Include"].Value = import.Attributes ["Include"].Value.Replace("Info.plist", $"Info{suffix}.plist");
var logicalName = import.SelectSingleNode ("./*[local-name() = 'LogicalName']");
if (logicalName == null) {
logicalName = csproj.CreateElement ("LogicalName", MSBuild_Namespace);
import.AppendChild (logicalName);
if (import != null) {
import.Attributes ["Include"].Value = import.Attributes ["Include"].Value.Replace ("Info.plist", $"Info{suffix}.plist");
var logicalName = import.SelectSingleNode ("./*[local-name() = 'LogicalName']");
if (logicalName == null) {
logicalName = csproj.CreateElement ("LogicalName", MSBuild_Namespace);
import.AppendChild (logicalName);
}
logicalName.InnerText = "Info.plist";
}
logicalName.InnerText = "Info.plist";
}

public static string GetInfoPListInclude (this XmlDocument csproj)
Expand Down