Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3

mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs

@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
 
 	[assembly: CLSCompliant (true)]
 	[assembly: AssemblyDelaySign (true)]
-	[assembly: AssemblyKeyFile("../msfinal.pub")]
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]

mcs/class/System.Web.Services/Makefile

@@ -3,6 +3,7 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Web.Services.dll
+KEYFILE = ../msfinal.pub
 ifdef MOBILE_PROFILE
 LIB_REFS = System System.Xml
 LIB_MCS_FLAGS = \

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

@@ -208,9 +208,12 @@ namespace System.Web.Services.Protocols
 			WebRequest request = GetWebRequest (uri);
 			request.Method = "POST";
 			WebHeaderCollection headers = request.Headers;
-			if (!message.IsSoap12)
-				headers.Add ("SOAPAction", "\"" + message.Action + "\"");
 			request.ContentType = message.ContentType + "; charset=utf-8";
+			if (!message.IsSoap12) {
+				headers.Add ("SOAPAction", "\"" + message.Action + "\"");
+			} else {
+				request.ContentType += "; action=\"" + message.Action + "\"";
+			}
 			return request;
 		}
 

mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/DiscoveryClientProtocolTest.cs

@@ -18,7 +18,7 @@ namespace MonoTests.System.Web.Services.Discovery {
 	public class DiscoveryClientProtocolTest {
 
 		[Test] // Covers #36116
-		[Category ("InetAccess")]
+		[Category ("NotWorking")]
 		public void ReadWriteTest ()
 		{
 			string directory = Path.Combine (Path.GetTempPath (), Path.GetRandomFileName ());

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

@@ -0,0 +1 @@
+#include mobile_System.Web.Services.dll.sources