Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpBinaryFrameManager.cs

@@ -73,7 +73,7 @@ namespace System.ServiceModel.Channels.NetTcp
 			{
 				int x = 0;
 				do {
-					value /= 0x100;
+					value /= 0x80;
 					x++;
 				} while (value != 0);
 				return x;

mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs

@@ -44,7 +44,9 @@ namespace System.ServiceModel.Channels
 	{
 		internal SecurityBindingElement ()
 		{
+#if !XAMMAC_4_5
 			MessageSecurityVersion = MessageSecurityVersion.Default;
+#endif
 			endpoint = new SupportingTokenParameters ();
 #if !MOBILE && !XAMMAC_4_5
 			DefaultAlgorithmSuite = SecurityAlgorithmSuite.Default;

mcs/class/System.ServiceModel/System.ServiceModel.Channels/TextMessageEncodingBindingElement.cs

@@ -105,7 +105,7 @@ namespace System.ServiceModel.Channels
 			return base.BuildChannelFactory<TChannel> (context);
 		}
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 		public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
 			BindingContext context)
 		{

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Contracts/AsyncCallTester.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.ServiceModel;
@@ -22,3 +23,4 @@ namespace MonoTests.Features.Contracts
 	}
 
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Contracts/FaultsTester.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.ServiceModel;
@@ -37,3 +38,4 @@ namespace MonoTests.Features.Contracts
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/AsyncCallTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
@@ -49,3 +50,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/AsyncPatternTester.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -18,4 +19,5 @@ namespace MonoTests.Features.Serialization
 			Assert.AreEqual (ClientProxy.AsyncMethod (), 3, "Called method with AsyncPattern=true");
 		}
 	}
-}
+}
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/DataContractSerializerTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.ServiceModel;
@@ -101,3 +102,4 @@ namespace NS1.NS3 {
 		public NS2.Type2 AType {get; set; }
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/DualContractTester.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -27,4 +28,5 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 
-}
+}
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/ExitProcessHelper.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -12,4 +13,5 @@ namespace MonoTests.Features.Serialization
 	public class ExitProcessHelper : TestFixtureBase<Proxy.MonoTests.Features.Client.ExitProcessHelperClient, ExitProcessHelperServer, MonoTests.Features.Contracts.IExitProcessHelper>
 	{
 	}
-}
+}
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/FaultsTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -41,3 +42,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/KnownTypeTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
@@ -33,3 +34,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/MessageContractTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -23,3 +24,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/OperationContractTester.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Proxy.MonoTests.Features.Client;
@@ -42,4 +43,5 @@ namespace MonoTests.Features.Serialization
 			CheckWsdlImpl ();
 		}
 	}
-}
+}
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/PrimitiveTesterTest.cs

@@ -1,5 +1,5 @@
 
-
+#if !MOBILE && !XAMMAC_4_5
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -118,3 +118,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/Features.Serialization/UntypedMessageTest.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
@@ -30,3 +31,4 @@ namespace MonoTests.Features.Serialization
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/FeatureBased/TestFixtureBase.cs

@@ -1,4 +1,5 @@
-using System;
+#if !MOBILE && !XAMMAC_4_5
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.ServiceModel;
@@ -214,3 +215,4 @@ namespace MonoTests.Features
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs

@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
+#if !MOBILE && !XAMMAC_4_5
 using System;
 using System.Net;
 using System.Net.Security;
@@ -859,3 +859,5 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
 		}
 	}
 }
+#endif
+

mcs/class/System.ServiceModel/Test/MetadataTests/ExportTests.cs

@@ -23,6 +23,8 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+#if !MOBILE && !XAMMAC_4_5
+
 using System;
 using System.Net;
 using System.Xml;
@@ -239,4 +241,5 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
 		}
 	}
 }
+#endif
 

mcs/class/System.ServiceModel/Test/MetadataTests/ImportTests.cs

@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
+#if !MOBILE && !XAMMAC_4_5
 using System;
 using System.Net;
 using System.Xml;
@@ -320,4 +320,5 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
 	}
 
 }
+#endif