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/System.ServiceModel.Web | |
| 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/System.ServiceModel.Web')
4 files changed, 4 insertions, 6 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs index 9857450eded..dfec47afe0e 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs @@ -111,7 +111,7 @@ namespace System.ServiceModel.Web // do nothing } -#if NET_4_0 && !MOBILE +#if !MOBILE static readonly XmlWriterSettings settings = new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = false }; XmlSerializer document_serializer, feed_serializer, item_serializer; diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs index 84c076d475b..b5b64fd295e 100644 --- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs +++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs @@ -59,11 +59,9 @@ namespace MonoTests.System.ServiceModel.Description Assert.AreEqual (WebMessageBodyStyle.Bare, b.DefaultBodyStyle, "#1"); Assert.AreEqual (WebMessageFormat.Xml, b.DefaultOutgoingRequestFormat, "#2"); Assert.AreEqual (WebMessageFormat.Xml, b.DefaultOutgoingResponseFormat, "#3"); -#if NET_4_0 Assert.IsFalse (b.AutomaticFormatSelectionEnabled, "#11"); Assert.IsFalse (b.FaultExceptionEnabled, "#12"); Assert.IsFalse (b.HelpEnabled, "#13"); -#endif } [Test] diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs index 401f1a1f20d..a8423ad3f11 100644 --- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs +++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs @@ -1,4 +1,4 @@ -#if NET_4_0 && !MOBILE +#if !MOBILE using System; using System.IO; using System.Runtime.Serialization; diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs index a87a5fd32a4..6ab2d8b4621 100644 --- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs +++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs @@ -72,7 +72,7 @@ namespace MonoTests.System.ServiceModel.Web ch.Close (); } -#if NET_4_0 && !MOBILE +#if !MOBILE [Test] public void CreateAtom10Response () { @@ -138,7 +138,7 @@ namespace MonoTests.System.ServiceModel.Web string TestJson3 (string s1, string s2); } -#if NET_4_0 && !MOBILE +#if !MOBILE public class HogeService : IHogeService { static XmlWriterSettings settings = new XmlWriterSettings () { OmitXmlDeclaration = true }; |