Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595

mcs/class/System.ServiceModel.Discovery/Makefile

@@ -3,9 +3,11 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.ServiceModel.Discovery.dll
-LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll -r:System.Xml.Linq.dll
+LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core System.Xml.Linq
+LIB_MCS_FLAGS =
 
 ifneq (2.1, $(FRAMEWORK_VERSION))
+LIB_REFS += System.Configuration
 LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0 	\
 			-r:System.Configuration.dll
 endif

mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/AnnouncementClientTest.cs

@@ -79,7 +79,7 @@ namespace MonoTests.System.ServiceModel.Discovery
 
 		[Test]
 		// looks like EndpointAddress is *ignored*
-		[Category ("NotOnMac")]
+		[Category ("NotWorking")]
 		public void AnnonceOnlineOfflineAddressSchemeMismatch ()
 		{
 			var ac = new AnnouncementClient (new UdpAnnouncementEndpoint () { Address = new EndpointAddress ("http://localhost:37564")});