Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

mcs/class/System.ServiceModel/Test/System.ServiceModel/BasicHttpBindingTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.Net;
@@ -326,3 +327,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/Bug36080Test.cs

@@ -21,6 +21,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 !FEATURE_NO_BSD_SOCKETS
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -53,7 +54,7 @@ namespace MonoTests.System.ServiceModel
 					element
 				});
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 			// Init service
 			ServiceHost serviceHost = new ServiceHost (typeof (HelloWorldServiceImpl), new Uri (url));
 			serviceHost.AddServiceEndpoint (typeof (IHelloWorldService), binding, string.Empty);
@@ -82,7 +83,7 @@ namespace MonoTests.System.ServiceModel
 				client.SayHelloToAsync(str);
 
 				Assert.IsTrue (wait.WaitOne (TimeSpan.FromSeconds (20)), "timeout");
-#if MOBILE
+#if MOBILE || XAMMAC_4_5
 				if (error.GetType() == typeof(EndpointNotFoundException))
 					return;
 #endif
@@ -90,7 +91,7 @@ namespace MonoTests.System.ServiceModel
 				Assert.IsNull (error, "#1, inner exception: {0}", error);
 				Assert.AreEqual (str, result, "#2");
 			}  finally {
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 				serviceHost.Close ();
 #endif
 			}
@@ -583,3 +584,4 @@ public partial class HelloWorldServiceClient : System.ServiceModel.ClientBase<IH
         }
     }
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/CallbackBehaviorAttributeTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.IO;
@@ -365,3 +366,4 @@ namespace MonoTests.System.ServiceModel
 		#endregion
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactoryTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.ServiceModel;
@@ -195,3 +196,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/ChannelFactory_1Test.cs

@@ -25,7 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.Runtime.Serialization;
@@ -662,3 +662,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBaseTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.IO;
@@ -586,3 +587,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientBase_InteractiveChannelInitializerTest.cs

@@ -25,6 +25,7 @@
 // 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 !FEATURE_NO_BSD_SOCKETS
 using System;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -149,3 +150,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs

@@ -25,6 +25,7 @@
 // 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.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
@@ -825,3 +826,4 @@ Assert.IsFalse (new MyManager (new MyClientCredentials ()).IsIssued (r), "premis
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/EndpointAddress10Test.cs

@@ -25,6 +25,7 @@
 // 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
 using System;
 using System.IO;
 using System.ServiceModel;
@@ -119,3 +120,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/EndpointAddressBuilderTest.cs

@@ -25,6 +25,7 @@
 // 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
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -63,3 +64,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/EndpointAddressTest.cs

@@ -26,6 +26,7 @@
 // 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
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -434,4 +435,6 @@ namespace MonoTests.System.ServiceModel
 */
 	}
 }
+#endif
+
 

mcs/class/System.ServiceModel/Test/System.ServiceModel/EndpointIdentityTest.cs

@@ -25,6 +25,7 @@
 // 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
 using System;
 using System.IO;
 using System.IdentityModel.Claims;
@@ -71,3 +72,5 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif
+

mcs/class/System.ServiceModel/Test/System.ServiceModel/IntegratedConnectionTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.IO;
@@ -330,3 +331,4 @@ namespace MonoTests.System.ServiceModel
 
 	#endregion
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/MessageSecurityVersionTest.cs

@@ -25,7 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.ServiceModel;
@@ -95,3 +95,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/MsmqTransportSecurityTest.cs

@@ -25,7 +25,7 @@
 // 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.Security;
 using System.ServiceModel;
@@ -50,4 +50,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
-
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/NetMsmqBindingTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.Net.Security;
@@ -108,3 +109,4 @@ namespace MonoTests.System.ServiceModel
 */
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/NetPeerTcpBindingTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.Net.Security;
@@ -117,3 +118,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs

@@ -25,6 +25,7 @@
 // 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.Collections.ObjectModel;
 using System.Net.Sockets;
@@ -253,3 +254,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif

mcs/class/System.ServiceModel/Test/System.ServiceModel/OperationContextTest.cs

@@ -25,6 +25,7 @@
 // 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.IO;
 using System.IdentityModel.Claims;
@@ -104,3 +105,5 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif
+

mcs/class/System.ServiceModel/Test/System.ServiceModel/PeerNodeAddressTest.cs

@@ -25,6 +25,7 @@
 // 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.IO;
 using System.Runtime.Serialization;
@@ -52,3 +53,4 @@ namespace MonoTests.System.ServiceModel
 		}
 	}
 }
+#endif