diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-08-23 16:15:51 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-08-23 16:15:51 +0300 |
commit | c4a5b6b5c3ce17a8d0a9e62dc77ff61ffa24f4b1 (patch) | |
tree | fbed20e5b09c3ac735d8046129469fcc64cfd436 /mcs/class/Microsoft.Build | |
parent | 0d1db0362d4256d5bb7fbbf05f53658431e3ac9d (diff) |
[mcs] Remove NET_4_5 ifdef from the source files
It is always set in all profiles that we support so we can remove it.
Diffstat (limited to 'mcs/class/Microsoft.Build')
5 files changed, 0 insertions, 12 deletions
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs index e864f4dfb39..2fbb9f18587 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs @@ -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 } } diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs index 970240fa74b..700a41663d3 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs @@ -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] diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ToolsetTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ToolsetTest.cs index ac4e2d6610e..81392010d79 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ToolsetTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ToolsetTest.cs @@ -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"); } diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTargetInstanceTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTargetInstanceTest.cs index ce13ce36469..5b24db55b27 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTargetInstanceTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTargetInstanceTest.cs @@ -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"); } diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTaskInstanceTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTaskInstanceTest.cs index c94bef7d695..1663f71c682 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTaskInstanceTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/ProjectTaskInstanceTest.cs @@ -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 } } |