Imported Upstream version 4.0.3.13

Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29

mcs/class/System.Web.Services/Makefile

@@ -20,13 +20,16 @@ LIB_MCS_FLAGS = \
 	-r:System.dll				\
 	-r:System.EnterpriseServices.dll	\
 	-r:System.Xml.dll			\
-	-r:System.Web.dll
 
+ifndef NO_SYSTEM_WEB_DEPENDENCY
+LIB_MCS_FLAGS += -r:System.Web.dll
 plainweb_dir = $(the_libdir_base)plainweb
 LOCAL_MCS_FLAGS = -lib:$(plainweb_dir)
 
 plainweb = $(plainweb_dir)/System.Web.dll
 system_web_services_deps = $(plainweb)
+LOCAL_MCS_FLAGS += -lib:$(plainweb_dir)
+endif
 
 ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += \
@@ -53,4 +56,4 @@ $(the_libdir_base)$(LIBRARY): $(system_web_services_deps)
 $(plainweb):
 	(cd ../System.Web; $(MAKE) $@)
 
-.NOTPARALLEL: $(plainweb)
+.NOTPARALLEL: $(plainweb)

mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs

@@ -71,7 +71,7 @@ namespace System.Web.Services.Description
 			RegisterExtensionType (typeof (Soap12HeaderBinding));
 			RegisterExtensionType (typeof (Soap12OperationBinding));
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 			/*
 			 * Currently, the mobile profile has not support for
 			 * System.Configuration, so there are no external modules
@@ -164,7 +164,7 @@ namespace System.Web.Services.Description
 		/*
 		 * The mobile profile lacks support for configuration
 		 */
-#if MOBILE
+#if MOBILE || XAMMAC_4_5
 		public static ArrayList BuildExtensionImporters ()
 		{
 			return new ArrayList (0);

mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs

@@ -142,7 +142,7 @@ namespace System.Web.Services.Description {
 				schemas.Add (serviceDescription.Types.Schemas);
 		}
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 		public ServiceDescriptionImportWarnings Import (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)
 		{
 			foreach (ProtocolImporter importer in GetSupportedImporters ()) {
@@ -163,9 +163,6 @@ namespace System.Web.Services.Description {
 			list.Add (new HttpPostProtocolImporter ());
 			return list;
 		}
-#endif
-		
-#if !MOBILE
 
 		[MonoTODO] // where to use Verbose and Extensions in options?
 		public static StringCollection GenerateWebReferences (

mcs/class/System.Web.Services/System.Web.Services.Protocols/Methods.cs

@@ -487,7 +487,7 @@ namespace System.Web.Services.Protocols {
 			xmlImporter.IncludeTypes (Type);
 			soapImporter.IncludeTypes (Type);
 
-#if MOBILE
+#if MOBILE || XAMMAC_4_5
 			SoapExtensions = new SoapExtensionRuntimeConfig [2][];
 #else
 			SoapExtensions = SoapExtension.GetTypeExtensions (Type);

mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs

@@ -207,7 +207,7 @@ namespace System.Web.Services.Protocols
 						soap12Protocol.Initialize ();
 					}
 					return soap12Protocol;
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 				case "HttpGet":
 					if (httpGetProtocol == null){
 						httpGetProtocol = new HttpGetTypeStubInfo (this);

mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs

@@ -100,7 +100,7 @@ namespace System.Web.Services.Protocols {
 			return pos;
 		}
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 		static void InitializeGlobalExtensions ()
 		{
 			globalExtensions = new ArrayList[2];

mcs/class/System.Web.Services/xammac_net_4_5_System.Web.Services.dll.sources

@@ -0,0 +1,3 @@
+#include mobile_System.Web.Services.dll.sources
+System.Web.Services.Description/ServiceDescription.cs
+System.Web.Services.Description/ServiceDescriptionImportWarnings.cs