mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
View File

@ -131,17 +131,17 @@ namespace Microsoft.Build.BuildEngine {
}
[MonoTODO ("Not tested")]
public void AddNewImport (string importLocation,
string importCondition)
public void AddNewImport (string projectFile,
string condition)
{
if (importLocation == null)
throw new ArgumentNullException ("importLocation");
if (projectFile == null)
throw new ArgumentNullException ("projectFile");
XmlElement importElement = xmlDocument.CreateElement ("Import", XmlNamespace);
xmlDocument.DocumentElement.AppendChild (importElement);
importElement.SetAttribute ("Project", importLocation);
if (!String.IsNullOrEmpty (importCondition))
importElement.SetAttribute ("Condition", importCondition);
importElement.SetAttribute ("Project", projectFile);
if (!String.IsNullOrEmpty (condition))
importElement.SetAttribute ("Condition", condition);
AddImport (importElement, null, false);
MarkProjectAsDirty ();
@ -506,9 +506,9 @@ namespace Microsoft.Build.BuildEngine {
Load (projectFileName, ProjectLoadSettings.None);
}
public void Load (string projectFileName, ProjectLoadSettings settings)
public void Load (string projectFileName, ProjectLoadSettings projectLoadSettings)
{
project_load_settings = settings;
project_load_settings = projectLoadSettings;
if (String.IsNullOrEmpty (projectFileName))
throw new ArgumentNullException ("projectFileName");
@ -644,7 +644,7 @@ namespace Microsoft.Build.BuildEngine {
[MonoTODO]
// NOTE: does not modify imported projects
public void RemoveItemGroupsWithMatchingCondition (string matchingCondition)
public void RemoveItemGroupsWithMatchingCondition (string matchCondition)
{
throw new NotImplementedException ();
}
@ -697,9 +697,9 @@ namespace Microsoft.Build.BuildEngine {
isDirty = false;
}
public void Save (TextWriter outTextWriter)
public void Save (TextWriter textWriter)
{
xmlDocument.Save (outTextWriter);
xmlDocument.Save (textWriter);
isDirty = false;
}
@ -733,12 +733,12 @@ namespace Microsoft.Build.BuildEngine {
throw new NotImplementedException ();
}
public void SetProjectExtensions (string id, string xmlText)
public void SetProjectExtensions (string id, string content)
{
if (id == null)
throw new ArgumentNullException ("id");
if (xmlText == null)
throw new ArgumentNullException ("xmlText");
if (content == null)
throw new ArgumentNullException ("content");
XmlNode projectExtensions, node;
@ -749,7 +749,7 @@ namespace Microsoft.Build.BuildEngine {
xmlDocument.DocumentElement.AppendChild (projectExtensions);
node = xmlDocument.CreateElement (id, XmlNamespace);
node.InnerXml = xmlText;
node.InnerXml = content;
projectExtensions.AppendChild (node);
} else {
node = xmlDocument.SelectSingleNode (String.Format ("/tns:Project/tns:ProjectExtensions/tns:{0}", id), XmlNamespaceManager);
@ -759,7 +759,7 @@ namespace Microsoft.Build.BuildEngine {
projectExtensions.AppendChild (node);
}
node.InnerXml = xmlText;
node.InnerXml = content;
}