Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-08-23 16:15:51 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2016-08-23 16:15:51 +0300
commitc4a5b6b5c3ce17a8d0a9e62dc77ff61ffa24f4b1 (patch)
treefbed20e5b09c3ac735d8046129469fcc64cfd436 /mcs/class/System.XML
parent0d1db0362d4256d5bb7fbbf05f53658431e3ac9d (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/System.XML')
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs4
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs2
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs2
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs2
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs4
-rw-r--r--mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs4
6 files changed, 0 insertions, 18 deletions
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
index 16c46b496f4..26f461aeb30 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
@@ -15,10 +15,8 @@ using System.Text;
using System.Xml;
using System.Xml.Schema;
using System.Xml.XPath;
-#if NET_4_5
using System.Threading;
using System.Threading.Tasks;
-#endif
using NUnit.Framework;
@@ -2298,7 +2296,6 @@ namespace MonoTests.System.Xml
Assert.AreEqual ((UInt64) 1, xr.ReadContentAs (typeof (UInt64), null), "#8");
}
-#if NET_4_5
[Test]
[ExpectedException(typeof(InvalidOperationException))]
public void MustSetAsyncFlag ()
@@ -2347,6 +2344,5 @@ namespace MonoTests.System.Xml
if (task.Result != null)
throw task.Result;
}
-#endif
}
}
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
index effd9df94fe..768cd5671da 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
@@ -419,7 +419,6 @@ namespace MonoTests.System.Xml
Assert.AreEqual ("urn:foo", r.BaseURI);
}
-#if NET_4_5
[Test]
[ExpectedException (typeof (XmlException))]
public void ReadonlyAsync ()
@@ -444,6 +443,5 @@ namespace MonoTests.System.Xml
var r2 = XmlReader.Create (r, c);
Assert.IsTrue (r2.Settings.Async);
}
-#endif
}
}
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
index df9756ee8f1..15b20974487 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
@@ -103,7 +103,6 @@ namespace MonoTests.System.Xml {
Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/file");
}
-#if NET_4_5
class AsyncXmlResolver : XmlResolver
{
public override object GetEntity (Uri absoluteUri, string role, Type ofObjectToReturn)
@@ -121,6 +120,5 @@ namespace MonoTests.System.Xml {
var uri = new Uri ("http://www.mono-project.com");
ar.GetEntityAsync (uri, null, typeof(string));
}
-#endif
}
}
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
index 8f2de60a838..493bc6a8ad0 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
@@ -124,7 +124,6 @@ namespace MonoTests.System.Xml
Assert.IsTrue (site, "Site-2");
}
-#if NET_4_5
[Test]
[Category("Async")]
public void TestAsync ()
@@ -139,7 +138,6 @@ namespace MonoTests.System.Xml
Assert.That (task.Wait (3000));
Assert.IsInstanceOfType (typeof (Stream), task.Result);
}
-#endif
}
}
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
index e62e8cebad0..f637e8cc326 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
@@ -10,9 +10,7 @@ using System;
using System.IO;
using System.Xml;
using NUnit.Framework;
-#if NET_4_5
using System.Reflection;
-#endif
namespace MonoTests.System.Xml
{
@@ -98,7 +96,6 @@ namespace MonoTests.System.Xml
Assert.AreEqual ("view:Standard.xslt", uri.AbsoluteUri, "#2");
}
-#if NET_4_5
[Test]
public void TestAsync ()
{
@@ -126,6 +123,5 @@ namespace MonoTests.System.Xml
Assert.IsTrue (ex is XmlException);
}
}
-#endif
}
}
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
index f70d43bd46d..3ee725dff25 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
@@ -40,9 +40,7 @@ namespace MonoTests.System.Xml
Assert.AreEqual (false, s.NewLineOnAttributes);
Assert.AreEqual (false, s.OmitXmlDeclaration);
Assert.AreEqual (NewLineHandling.Replace, s.NewLineHandling);
-#if NET_4_5
Assert.IsFalse (s.Async);
-#endif
}
[Test]
@@ -381,7 +379,6 @@ namespace MonoTests.System.Xml
Assert.AreEqual (xml, sw.ToString ());
}
-#if NET_4_5
[Test]
[ExpectedException (typeof (XmlException))]
public void ReadonlyAsync ()
@@ -408,7 +405,6 @@ namespace MonoTests.System.Xml
var w2 = XmlWriter.Create (w, c);
Assert.IsTrue (w2.Settings.Async);
}
-#endif
}
}