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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
View File

@@ -58,11 +58,9 @@ namespace MonoTests.Microsoft.Build.Construction
ProjectRootElement.Create (XmlReader.Create (new StringReader (" <root/>")));
Assert.Fail ("should throw InvalidProjectFileException");
} catch (InvalidProjectFileException ex) {
#if NET_4_5
Assert.AreEqual (1, ex.LineNumber, "#1");
// it is very interesting, but unlike XmlReader.LinePosition it returns the position for '<'.
Assert.AreEqual (2, ex.ColumnNumber, "#2");
#endif
}
}
@@ -102,11 +100,9 @@ namespace MonoTests.Microsoft.Build.Construction
ProjectRootElement.Create (xml);
Assert.Fail ("should throw InvalidProjectFileException");
} catch (InvalidProjectFileException ex) {
#if NET_4_5
Assert.AreEqual (1, ex.LineNumber, "#1");
// unlike unexpected element case which returned the position for '<', it does return the name start char...
Assert.AreEqual (70, ex.ColumnNumber, "#2");
#endif
}
}

2
mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs
View File

@@ -44,9 +44,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
{
var g = ProjectCollection.GlobalProjectCollection;
Assert.AreEqual (0, g.GlobalProperties.Count, "#1");
#if NET_4_5
Assert.IsTrue (g.GlobalProperties.IsReadOnly, "#2");
#endif
}
[Test]

2
mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ToolsetTest.cs
View File

@@ -40,11 +40,9 @@ namespace MonoTests.Microsoft.Build.Evaluation
var ts = new Toolset ("4.3", "c:\\", ProjectCollection.GlobalProjectCollection, null);
Assert.IsNotNull (ts.Properties, "#1");
Assert.AreEqual (0, ts.Properties.Count, "#2");
#if NET_4_5
Assert.IsNull (ts.DefaultSubToolsetVersion, "#3");
Assert.IsNotNull (ts.SubToolsets, "#4");
Assert.AreEqual (0, ts.SubToolsets.Count, "#5");
#endif
Assert.AreEqual ("c:\\", ts.ToolsPath, "#6");
Assert.AreEqual ("4.3", ts.ToolsVersion, "#7");
}

2
mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTargetInstanceTest.cs
View File

@@ -143,9 +143,7 @@ namespace MonoTests.Microsoft.Build.Execution
var root = ProjectRootElement.Create (xml);
root.FullPath = "ProjectInstanceTest.DependsOnTargets.proj";
var proj = new ProjectInstance (root);
#if NET_4_5
Assert.AreEqual (2, proj.Targets.Count, "#1");
#endif
Assert.IsFalse (proj.Build ("Bar", new ILogger [0]), "#2");
}

2
mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTaskInstanceTest.cs
View File

@@ -42,7 +42,6 @@ namespace MonoTests.Microsoft.Build.Execution
[TestFixture]
public class ProjectTaskInstanceTest
{
#if NET_4_5
[Test]
public void OutputPropertyExists ()
{
@@ -78,7 +77,6 @@ namespace MonoTests.Microsoft.Build.Execution
Assert.AreEqual (string.Empty, foo.Outputs, "#6");
Assert.AreEqual ("True", proj.GetPropertyValue ("C"), "#7");
}
#endif
}
}