Imported Upstream version 4.0.1

Former-commit-id: 757121caeaad523350be5330f0a3ecc891c70fb8

mcs/Makefile

@@ -12,7 +12,7 @@ monotouch_runtime_SUBDIRS := build class
 xammac_SUBDIRS := build class
 mobile_SUBDIRS := build class
 mobile_static_SUBDIRS := build class
-net_4_0_SUBDIRS := build class
+binary_reference_assemblies_SUBDIRS := build class
 net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 xbuild_12_SUBDIRS := build class tools/xbuild
 xbuild_14_SUBDIRS := build class tools/xbuild
@@ -30,7 +30,7 @@ dir-check:
 
 # fun specialty targets
 
-PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
+PROFILES = net_4_5 binary_reference_assemblies xbuild_12 xbuild_14
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -51,7 +51,7 @@ profiles-do--run-test:
 _boot_ = all clean install
 $(_boot_:%=profile-do--xbuild_14--%):         profile-do--xbuild_14--%:         profile-do--net_4_5--%
 $(_boot_:%=profile-do--xbuild_12--%):         profile-do--xbuild_12--%:         profile-do--net_4_5--%
-$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--build--%
+$(_boot_:%=profile-do--binary_reference_assemblies--%):           profile-do--binary_reference_assemblies--%:           profile-do--build--%
 $(_boot_:%=profile-do--net_4_5--%):           profile-do--net_4_5--%:           profile-do--build--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%

mcs/build/Makefile

@@ -18,7 +18,7 @@ PLATFORMS = darwin linux win32
 PROFILES = \
 	basic \
 	build \
-	net_4_0 \
+	binary_reference_assemblies \
 	net_4_5 \
 	xbuild_12 \
 	xbuild_14

mcs/build/common/Consts.cs

@@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "4.0.0.0";
+	public const string MonoVersion = "4.0.1.0";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/build/profiles/binary_reference_assemblies.make

@@ -0,0 +1,7 @@
+# -*- makefile -*-
+
+profile-check:
+	@:
+
+NO_BUILD = yes
+NO_TEST = yes

mcs/build/profiles/net_4_0.make

@@ -1,12 +0,0 @@
-# -*- makefile -*-
-
-profile-check:
-	@:
-
-FRAMEWORK_VERSION = 4.0
-XBUILD_VERSION = 4.0
-
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-
-NO_BUILD = yes
-NO_TEST = yes

mcs/class/Makefile

@@ -217,7 +217,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
-net_4_0_SUBDIRS := reference-assemblies
+binary_reference_assemblies_SUBDIRS := reference-assemblies
 net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)

mcs/class/System.Net.Http/System.Net.Http.Headers/HttpHeaders.cs

@@ -350,10 +350,17 @@ namespace System.Net.Http.Headers
 				sb.Append (entry.Key);
 				sb.Append (": ");
 
+				string separator = ",";
+				HeaderInfo headerInfo;
+				if (known_headers.TryGetValue (entry.Key, out headerInfo) && headerInfo.AllowsMany)
+					separator = headerInfo.Separator;
+
 				bool first = true;
 				foreach (var v in entry.Value) {
-					if (!first)
-						sb.Append (", ");
+					if (!first) {
+						sb.Append (separator);
+						sb.Append (" ");
+					}
 
 					sb.Append (v);
 					first = false;

mcs/class/System.Net.Http/Test/System.Net.Http.Headers/HttpHeadersTest.cs

@@ -147,5 +147,13 @@ namespace MonoTests.System.Net.Http.Headers
 
 			Assert.AreEqual ("aa: v, v\r\nx: v\r\n", headers.ToString ());
 		}
+
+		[Test]
+		public void ToString_DifferentSeparator ()
+		{
+			headers.Add ("User-Agent", "MyApp/1.0.0.0 (iOS; 7.1.2; fr_FR) (Apple; iPhone3,1)");
+
+			Assert.AreEqual ("User-Agent: MyApp/1.0.0.0 (iOS; 7.1.2; fr_FR) (Apple; iPhone3,1)\r\n", headers.ToString ());
+		}
 	}
 }

mcs/class/corlib/System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs

@@ -0,0 +1,42 @@
+//
+// DefaultDllImportSearchPathsAttribute.cs
+//
+// Authors:
+//	Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2015 Xamarin Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+//
+
+namespace System.Runtime.InteropServices
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Method, AllowMultiple = false)]
+	[System.Runtime.InteropServices.ComVisible (false)]
+	public sealed class DefaultDllImportSearchPathsAttribute : Attribute
+	{
+		public DefaultDllImportSearchPathsAttribute(DllImportSearchPath paths)
+		{
+			Paths = paths;
+		}
+
+		public DllImportSearchPath Paths { get; private set; }
+	}
+}

mcs/class/corlib/System.Runtime.InteropServices/DllImportSearchPath.cs

@@ -0,0 +1,42 @@
+//
+// DllImportSearchPath.cs
+//
+// Authors:
+//	Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright (C) 2015 Xamarin Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+//
+
+namespace System.Runtime.InteropServices
+{
+	[Flags]
+	public enum DllImportSearchPath
+	{
+		UseDllDirectoryForDependencies = 0x100,
+		ApplicationDirectory = 0x200,
+		UserDirectories = 0x400,
+		System32 = 0x800,
+		SafeDirectories = 0x1000,
+		AssemblyDirectory = 0x2,
+		LegacyBehavior = 0x0
+	}
+}

mcs/class/corlib/Test/System.Threading/ManualResetEventSlimTests.cs

@@ -54,7 +54,7 @@ namespace MonoTests.System.Threading
 		public void Constructor_Defaults ()
 		{
 			Assert.IsFalse (mre.IsSet, "#1");
-			Assert.AreEqual (10, mre.SpinCount, "#2");
+			Assert.AreEqual (Environment.ProcessorCount == 1 ? 1 : 10, mre.SpinCount, "#2");
 		}
 
 		[Test]

mcs/class/corlib/corlib.dll.sources

@@ -607,6 +607,8 @@ System.Runtime.InteropServices/CONNECTDATA.cs
 System.Runtime.InteropServices/CriticalHandle.cs
 System.Runtime.InteropServices/CurrencyWrapper.cs
 System.Runtime.InteropServices/DefaultCharSetAttribute.cs
+System.Runtime.InteropServices/DllImportSearchPath.cs
+System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs
 System.Runtime.InteropServices/DESCKIND.cs
 System.Runtime.InteropServices/DispatchWrapper.cs
 System.Runtime.InteropServices/DISPPARAMS.cs

mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-49f816213be165022e8677532601a760171cde7a
+4816a33a1117da3f621fc172ae972cb88e983fe0

mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-b0b5eee6071ded2ebd95521972c0df2c88e50deb
+d56b0642b5e7cef07830b8435781e7decd5a3c88

mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-f5fb66b0084a9b19caf40eb6af8006e3ad5d086f
+f812e116ea4476a6400787d291a6c33982351043

mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-6914d5a4219e0c744f39061819064a11992c8c0d
+d5baf4466182688805ba46006f24dee0f2a58a7f

mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-5904d2521471bbf55b59d880c2c2db4f8541eaf2
+e634a26a89825c34d9fa548f211a6b2e1968da66

mcs/class/lib/monolite/System.dll.REMOVED.git-id

@@ -1 +1 @@
-918c2fe1f59932f25345576015dcb4587da4e712
+45516bac994827703522453286f3a1c1b8d75b1b

mcs/class/lib/monolite/basic.exe.REMOVED.git-id

@@ -1 +1 @@
-324b4f1564f360d9036eb9db709bd652ed7456e5
+340def76e208dadff3d94c971334b503dee1dc4c