diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-07-26 04:42:01 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-07-26 16:01:49 +0300 |
commit | 98cf04084aab9bd6eef5e4e37cc92117fdac2cf0 (patch) | |
tree | 7184eb93c2e195e48e4f2adb79a68ba80a4f80c0 /mcs/class/WindowsBase | |
parent | a8990aca6ca4e698953effee868c2abe38d7295c (diff) |
[bcl] Remove NET_4_0 defines from class libs
NET_4_0 is always defined now, so the ifdefs are redundant.
I verified the libs are exactly the same after this change, so this is effectively a no-op.
Diffstat (limited to 'mcs/class/WindowsBase')
-rw-r--r-- | mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs | 4 | ||||
-rw-r--r-- | mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs b/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs index 6a77804eb48..c859a9f207b 100644 --- a/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs +++ b/mcs/class/WindowsBase/Test/System.Windows.Markup/DateTimeValueSerializerTest.cs @@ -88,13 +88,11 @@ namespace MonoTests.System.Windows.Markup { } [Test] -#if NET_4_0 [NUnit.Framework.CategoryAttribute ("NotWorking")] // Since ValueSerializer has moved to System.Xaml.dll while the type // this test expects is in WindowsBase, there should be some additional // support code in this assembly. Until someone does that job, this // test won't pass. -#endif public void CanConvertFromString () { Context context = new Context (); @@ -107,13 +105,11 @@ namespace MonoTests.System.Windows.Markup { Assert.IsTrue (serializer.CanConvertFromString ("2008-01-.106426-08:00", context), "4"); } -#if NET_4_0 [NUnit.Framework.CategoryAttribute ("NotWorking")] // Since ValueSerializer has moved to System.Xaml.dll while the type // this test expects is in WindowsBase, there should be some additional // support code in this assembly. Until someone does that job, this // test won't pass. -#endif [Test] [ExpectedException (typeof (ArgumentException))] // Expected object of type 'DateTime'. public void CanConvertToString1 () diff --git a/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs b/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs index eda87c17d9f..7c898702a95 100644 --- a/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs +++ b/mcs/class/WindowsBase/Test/System.Windows.Markup/ValueSerializerTest.cs @@ -76,13 +76,11 @@ namespace MonoTests.System.Windows.Markup { } [Test] -#if NET_4_0 [NUnit.Framework.CategoryAttribute ("NotWorking")] // Since ValueSerializer has moved to System.Xaml.dll while the type // this test expects is in WindowsBase, there should be some additional // support code in this assembly. Until someone does that job, this // test won't pass. -#endif public void GetSerializerForType () { Assert.IsNull (ValueSerializer.GetSerializerFor (typeof (DependencyObject))); |