Imported Upstream version 4.2.1.124

Former-commit-id: 3b6a300a4ce80578c93599ba6e26a8f66743cde0

mcs/class/corlib/System/TimeZoneInfo.cs

@@ -1318,7 +1318,8 @@ namespace System
 				else {
 					abbrevs.Add (abbrev_index, sb.ToString ());
 					//Adding all the substrings too, as it seems to be used, at least for Africa/Windhoek
-					for (int j = 1; j < sb.Length; j++)
+					//j == sb.Length empty substring also needs to be added #31432
+					for (int j = 1; j <= sb.Length; j++)
 						abbrevs.Add (abbrev_index + j, sb.ToString (j, sb.Length - j));
 					abbrev_index = i + 1;
 					sb = new StringBuilder ();

mcs/class/corlib/Test/System/TimeZoneInfoTest.cs

@@ -1076,5 +1076,30 @@ namespace MonoTests.System
 				}
 			}
 		}
+
+		[TestFixture]
+		public class ParseTZBuffer
+		{
+			MethodInfo parseTZBuffer;
+
+			[SetUp]
+			public void Setup()
+			{
+				var flags = BindingFlags.Static | BindingFlags.NonPublic;
+				parseTZBuffer = typeof (TimeZoneInfo).GetMethod ("ParseTZBuffer", flags);
+			}
+
+			[Test]
+			public void Bug31432 ()
+			{
+				// Europe/Moscow from failing device
+				var base64Data = "VFppZjIAAAAAAAAAAAAAAAAAAAAAAAAPAAAADwAAAAAAAABNAAAADwAAACKbXx7HnT7yeZ4q7vme9zlpn4RX+aDYbOmhABYJoTymQKQQbcCkPTKwpRVosKU9A8CnHkVQtaQZYBUnp9AWGNxAFwjbUBf6D8AY6g7QGdtDQBrMk9AbvKDwHKyR8B2cgvAejHPwH3xk8CBsVfAhXEbwIkw38CM8KPAkLBnwJRwK8CYL+/AnBSdwJ/UYcCjlF4ApeL+AKdTQQCrEszArtNxwLKTNcC2UvnAuhK9wL3SgcDBkkXAxXbzwMnKX8DM9nvA0UnnwNR2A8DYyW/A2/WLwOBt4cDjdRPA5+1pwOr0m8DvbPHA8pkNwPbsecD6GJXA/mwBwQGYHcEGEHPBCRelwQ2P+8EQly3BFQ+DwRgWtcEcjwvBH7snwSQOk8EnOq/BK44bwS66N8EzMo3BNjm/wVEwdYAIBAgMBAwUEBQYFBwgHCQcJBwkHCQoLCgsKCwoLCgsKCwoMDQoJBwsKCwoLCgsKCwoLCgsKCwoLCgsKCwoLCgsKCwoLCgsKCwoLCg4KAAAjOQAAAAAxhwEEAAAjdwAAAAA/lwEIAAAqMAADAAA4QAENAABGUAEPAAAqMAARAAAcIAAVAAA4QAEZAAAqMAARAAA4QAEZAAAqMAEdAAAcIAAVAAA4QAARTU1UAE1TVABNRFNUAFMATQBNU0sARUVUAE1TRABFRVNUAAAAAAAAAAAAAAABAQEBAQAAAAAAAAAAAAAAAAAAAFRaaWYyAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAATgAAABAAAAAm/////1a2wMf/////m18ex/////+dPvJ5/////54q7vn/////nvc5af////+fhFf5/////6DYbOn/////oQAWCf////+hPKZA/////6QQbcD/////pD0ysP////+lFWiw/////6U9A8D/////px5FUP////+1pBlgAAAAABUnp9AAAAAAFhjcQAAAAAAXCNtQAAAAABf6D8AAAAAAGOoO0AAAAAAZ20NAAAAAABrMk9AAAAAAG7yg8AAAAAAcrJHwAAAAAB2cgvAAAAAAHoxz8AAAAAAffGTwAAAAACBsVfAAAAAAIVxG8AAAAAAiTDfwAAAAACM8KPAAAAAAJCwZ8AAAAAAlHArwAAAAACYL+/AAAAAAJwUncAAAAAAn9RhwAAAAACjlF4AAAAAAKXi/gAAAAAAp1NBAAAAAACrEszAAAAAAK7TccAAAAAAspM1wAAAAAC2UvnAAAAAALoSvcAAAAAAvdKBwAAAAADBkkXAAAAAAMV288AAAAAAycpfwAAAAADM9nvAAAAAANFJ58AAAAAA1HYDwAAAAADYyW/AAAAAANv1i8AAAAAA4G3hwAAAAADjdRPAAAAAAOftacAAAAAA6vSbwAAAAADvbPHAAAAAAPKZDcAAAAAA9ux5wAAAAAD6GJXAAAAAAP5sAcAAAAABAZgdwAAAAAEGEHPAAAAAAQkXpcAAAAABDY/7wAAAAAEQly3AAAAAARUPg8AAAAABGBa1wAAAAAEcjwvAAAAAAR+7J8AAAAABJA6TwAAAAAEnOq/AAAAAASuOG8AAAAABLro3wAAAAAEzMo3AAAAAATY5v8AAAAABUTB1gAQMCAwQCBAYFBgcGCAkICggKCAoICgsMCwwLDAsMCwwLDAsNDgsKCAwLDAsMCwwLDAsMCwwLDAsMCwwLDAsMCwwLDAsMCwwLDAsMCw8LAAAjOQAAAAAjOQAEAAAxhwEIAAAjdwAEAAA/lwEMAAAqMAADAAA4QAERAABGUAETAAAqMAAVAAAcIAAZAAA4QAEdAAAqMAAVAAA4QAEdAAAqMAEhAAAcIAAZAAA4QAAVTE1UAE1NVABNU1QATURTVABTAE0ATVNLAEVFVABNU0QARUVTVAAAAAAAAAAAAAAAAAEBAQEBAAAAAAAAAAAAAAAAAAAAAApNU0stMwo=";
+
+				var data = Convert.FromBase64String (base64Data);
+
+				var tz = parseTZBuffer.Invoke (null, new object[] { "Test", data, data.Length});
+				Assert.IsTrue (tz != null);
+			}
+		}
 	}
 }

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

@@ -1 +1 @@
-f8f8e8e5ba7264993dba7738414a0123ab743cfe
+06f7fdab7429fe3c9ed22771dfe9380d208f037d

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

@@ -1 +1 @@
-4e690a5fc430b0f2617d1e6ef0c3f48c60c2acf2
+f41bbb4a396f59eec461720dfc065f676523d1c1

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

@@ -1 +1 @@
-3d129032906541b033f18089e67b70c7bfa0a13a
+ff03cd74a2624bd0a4a51658bb41e7d90f3144c9

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

@@ -1 +1 @@
-32e21a2c8d84ae3b6a90e4eafcfb933ce24d0350
+d8009a94148589526c8dc39f0e1c0ca9e77217e8

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

@@ -1 +1 @@
-ff1a5fc565b24ddfc0c76f0f19d1271343f59208
+22fc25a9bdf68807d3d57dc73d711bbd3bc8bc79

mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs

@@ -334,6 +334,9 @@ namespace Mono.Linker.Steps {
 					return;
 
 				MarkType (et);
+				if (argument.Value == null)
+					return;
+
 				foreach (var cac in (CustomAttributeArgument[]) argument.Value)
 					MarkWithResolvedScope ((TypeReference) cac.Value);
 			} else if (at.Namespace == "System" && at.Name == "Type") {
@@ -355,7 +358,6 @@ namespace Mono.Linker.Steps {
 			if ((git != null) && git.HasGenericArguments) {
 				foreach (var ga in git.GenericArguments)
 					MarkWithResolvedScope (ga);
-				return;
 			}
 			// we cannot set the Scope of a TypeSpecification but it's element type can be set
 			// e.g. System.String[] -> System.String

mcs/tools/linker/Mono.Linker.Steps/ResolveFromXmlStep.cs

@@ -129,15 +129,24 @@ namespace Mono.Linker.Steps {
 			return new Regex (pattern.Replace(".", @"\.").Replace("*", "(.*)"));
 		}
 
+		void MatchType (TypeDefinition type, Regex regex, XPathNavigator nav)
+		{
+			if (regex.Match (type.FullName).Success)
+				ProcessType (type, nav);
+
+			if (!type.HasNestedTypes)
+				return;
+
+			foreach (var nt in type.NestedTypes)
+				MatchType (nt, regex, nav);
+		}
+
 		void ProcessTypePattern (string fullname, AssemblyDefinition assembly, XPathNavigator nav)
 		{
 			Regex regex = CreateRegexFromPattern (fullname);
 
 			foreach (TypeDefinition type in assembly.MainModule.Types) {
-				if (!regex.Match (type.FullName).Success)
+				MatchType (type, regex, nav);
-					continue;
-
-				ProcessType (type, nav);
 			}
 		}
 

mono/metadata/domain.c

@@ -120,8 +120,6 @@ static const MonoRuntimeInfo *current_runtime = NULL;
  */
 static const MonoRuntimeInfo supported_runtimes[] = {
 	{"v4.0.30319","4.5", { {4,0,0,0}, {10,0,0,0}, {4,0,0,0}, {4,0,0,0} } },
-	{"v4.0.30128","4.0", { {4,0,0,0}, {10,0,0,0}, {4,0,0,0}, {4,0,0,0} } },
-	{"v4.0.20506","4.0", { {4,0,0,0}, {10,0,0,0}, {4,0,0,0}, {4,0,0,0} } },
 	{"mobile",    "2.1", { {2,0,5,0}, {10,0,0,0}, {2,0,5,0}, {2,0,5,0} } },
 	{"moonlight", "2.1", { {2,0,5,0}, { 9,0,0,0}, {3,5,0,0}, {3,0,0,0} } },
 };

mono/mini/Makefile.am

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in
 
 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.2.1.102/6dd2d0d\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.2.1.124/39edf24\"" > version.h
 
 # Utility target for patching libtool to speed up linking
 patch-libtool:

mono/mini/Makefile.am.in

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in
 
 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.2.1.102/6dd2d0d\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.2.1.124/39edf24\"" > version.h
 
 # Utility target for patching libtool to speed up linking
 patch-libtool:

mono/mini/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-93d782893e1caf2f8a1ed7b26a892c99955b11e1
+3cfd458f71bd744fd88bb6d83cb1577e532349ed

mono/mini/method-to-ir.c.REMOVED.git-id

@@ -1 +1 @@
-cb63252e0018b9aefb43fe181130006eafb121b8
+cfb7eed7bb4f48fe36aa3b8c99187b233fb8ed25

mono/mini/mini-amd64.c.REMOVED.git-id

@@ -1 +1 @@
-bf88f17bace11357a53f5ac7a00bdefc6a4588ee
+f71435042be76f9c1351b68ab479e824c9cd68f3

mono/mini/mini-generic-sharing.c

@@ -882,11 +882,11 @@ class_type_info (MonoDomain *domain, MonoClass *class, MonoRgctxInfoType info_ty
 			return GUINT_TO_POINTER (mono_class_value_size (class, NULL));
 	case MONO_RGCTX_INFO_CLASS_BOX_TYPE:
 		if (MONO_TYPE_IS_REFERENCE (&class->byval_arg))
-			return GUINT_TO_POINTER (1);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_REF);
 		else if (mono_class_is_nullable (class))
-			return GUINT_TO_POINTER (2);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_NULLABLE);
 		else
-			return GUINT_TO_POINTER (0);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_VTYPE);
 	case MONO_RGCTX_INFO_MEMCPY:
 	case MONO_RGCTX_INFO_BZERO: {
 		static MonoMethod *memcpy_method [17];
@@ -1236,11 +1236,11 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
 
 		impl_class = method->klass;
 		if (MONO_TYPE_IS_REFERENCE (&impl_class->byval_arg))
-			return GUINT_TO_POINTER (1);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_REF);
 		else if (mono_class_is_nullable (impl_class))
-			return GUINT_TO_POINTER (2);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_NULLABLE);
 		else
-			return GUINT_TO_POINTER (0);
+			return GUINT_TO_POINTER (MONO_GSHAREDVT_BOX_TYPE_VTYPE);
 	}
 #ifndef DISABLE_REMOTING
 	case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK:
@@ -1253,10 +1253,11 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
 	case MONO_RGCTX_INFO_FIELD_OFFSET: {
 		MonoClassField *field = data;
 
+		/* The value is offset by 1 */
 		if (field->parent->valuetype && !(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
-			return GUINT_TO_POINTER (field->offset - sizeof (MonoObject));
+			return GUINT_TO_POINTER (field->offset - sizeof (MonoObject) + 1);
 		else
-			return GUINT_TO_POINTER (field->offset);
+			return GUINT_TO_POINTER (field->offset + 1);
 	}
 	case MONO_RGCTX_INFO_METHOD_RGCTX: {
 		MonoMethodInflated *method = data;
@@ -1851,6 +1852,7 @@ fill_runtime_generic_context (MonoVTable *class_vtable, MonoRuntimeGenericContex
 										method_inst ? method_inst->type_argc : 0, slot, TRUE, TRUE, &do_free);
 	/* This might take the loader lock */
 	info = instantiate_info (domain, &oti, &context, class);
+	g_assert (info);
 
 	/*
 	if (method_inst)

mono/mini/mini.h.REMOVED.git-id

@@ -1 +1 @@
-7c01d8b67d92f0bebbdeff1c929e982a99b7d3bb
+2e5dc1ce3dbfe8e7af13b7ab7a5e73b37690cfdf

mono/mini/version.h

@@ -1 +1 @@
-#define FULL_VERSION "Stable 4.2.1.102/6dd2d0d"
+#define FULL_VERSION "Stable 4.2.1.124/39edf24"

mono/utils/networking-posix.c

@@ -76,11 +76,6 @@ mono_get_address_info (const char *hostname, int port, int flags, MonoAddressInf
 
 	while (res) {
 		cur = g_new0 (MonoAddressEntry, 1);
-		if (prev)
-			prev->next = cur;
-		else
-			addr_info->entries = cur;
-
 		cur->family = res->ai_family;
 		cur->socktype = res->ai_socktype;
 		cur->protocol = res->ai_protocol;
@@ -91,12 +86,20 @@ mono_get_address_info (const char *hostname, int port, int flags, MonoAddressInf
 			cur->address_len = sizeof (struct in6_addr);
 			cur->address.v6 = ((struct sockaddr_in6*)res->ai_addr)->sin6_addr;
 		} else {
-			g_error ("Cannot handle address family %d", cur->family);
+			g_warning ("Cannot handle address family %d", cur->family);
+			res = res->ai_next;
+			g_free (cur);
+			continue;
 		}
 
 		if (res->ai_canonname)
 			cur->canonical_name = g_strdup (res->ai_canonname);
 
+		if (prev)
+			prev->next = cur;
+		else
+			addr_info->entries = cur;
+			
 		prev = cur;
 		res = res->ai_next;
 	}

msvc/libmonoruntime.vcxproj

@@ -71,13 +71,11 @@
     <ClCompile Include="..\mono\metadata\mono-basic-block.c" />
     <ClCompile Include="..\mono\metadata\mono-config.c" />
     <ClCompile Include="..\mono\metadata\mono-config-dirs.c" />
-    <ClCompile Include="..\mono\metadata\mono-cq.c" />
     <ClCompile Include="..\mono\metadata\mono-debug.c" />
     <ClCompile Include="..\mono\metadata\mono-endian.c" />
     <ClCompile Include="..\mono\metadata\mono-hash.c" />
     <ClCompile Include="..\mono\metadata\mono-mlist.c" />
     <ClCompile Include="..\mono\metadata\mono-perfcounters.c" />
-    <ClCompile Include="..\mono\metadata\mono-wsq.c" />
     <ClCompile Include="..\mono\metadata\nacl-stub.c" />
     <ClCompile Include="..\mono\metadata\null-gc.c" />
     <ClCompile Include="..\mono\metadata\number-ms.c" />
@@ -129,8 +127,6 @@
     <ClCompile Include="..\mono\metadata\socket-io.c" />
     <ClCompile Include="..\mono\metadata\string-icalls.c" />
     <ClCompile Include="..\mono\metadata\sysmath.c" />
-    <ClCompile Include="..\mono\metadata\threadpool.c" />
-    <ClCompile Include="..\mono\metadata\tpool-poll.c" />
     <ClCompile Include="..\mono\metadata\threads.c" />
     <ClCompile Include="..\mono\metadata\verify.c" />
     <ClCompile Include="..\mono\mini\mini-cross-helpers.c" />
@@ -178,7 +174,6 @@
     <ClInclude Include="..\mono\metadata\mono-basic-block.h" />
     <ClInclude Include="..\mono\metadata\mono-config.h" />
     <ClInclude Include="..\mono\metadata\mono-config-dirs.h" />
-    <ClInclude Include="..\mono\metadata\mono-cq.h" />
     <ClInclude Include="..\mono\metadata\mono-debug-debugger.h" />
     <ClInclude Include="..\mono\metadata\mono-debug.h" />
     <ClInclude Include="..\mono\metadata\mono-endian.h" />
@@ -187,7 +182,6 @@
     <ClInclude Include="..\mono\metadata\mono-perfcounters-def.h" />
     <ClInclude Include="..\mono\metadata\mono-perfcounters.h" />
     <ClInclude Include="..\mono\metadata\mono-ptr-array.h" />
-    <ClInclude Include="..\mono\metadata\mono-wsq.h" />
     <ClInclude Include="..\mono\metadata\normalization-tables.h" />
     <ClInclude Include="..\mono\metadata\number-formatter.h" />
     <ClInclude Include="..\mono\metadata\object-internals.h" />
@@ -226,8 +220,6 @@
     <ClInclude Include="..\mono\metadata\string-icalls.h" />
     <ClInclude Include="..\mono\metadata\sysmath.h" />
     <ClInclude Include="..\mono\metadata\tabledefs.h" />
-    <ClInclude Include="..\mono\metadata\threadpool-internals.h" />
-    <ClInclude Include="..\mono\metadata\threadpool.h" />
     <ClInclude Include="..\mono\metadata\threads-types.h" />
     <ClInclude Include="..\mono\metadata\verify-internals.h" />
     <ClInclude Include="..\mono\metadata\verify.h" />

msvc/libmonoutils.vcxproj

@@ -180,7 +180,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+    <Import Project=".\masm.fixed.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

msvc/mono.def

@@ -472,8 +472,6 @@ mono_install_assembly_refonly_preload_hook
 mono_install_assembly_refonly_search_hook
 mono_install_assembly_search_hook
 mono_install_runtime_cleanup
-mono_install_threadpool_item_hooks
-mono_install_threadpool_thread_hooks
 mono_install_unhandled_exception_hook
 mono_invoke_unhandled_exception_hook
 mono_is_debugger_attached

msvc/mono.sln

@@ -51,12 +51,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-logging", "profile
 		{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-cov", "profiler-cov.vcxproj", "{83D4D926-2983-4770-BA92-EB9CB8828C95}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
-		{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jay", "..\mcs\jay\jay.vcxproj", "{5D485D32-3B9F-4287-AB24-C8DA5B89F537}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-codeanalyst", "profiler-codeanalyst.vcxproj", "{8FEF7F9E-F5F3-470E-91F4-404B7D6BC1BB}"
@@ -273,21 +267,6 @@ Global
 		{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release_SGen|x64.ActiveCfg = Release|x64
 		{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release|Win32.ActiveCfg = Release|Win32
 		{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release|x64.ActiveCfg = Release|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|x64.ActiveCfg = Debug|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|x64.Build.0 = Debug|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|Win32.Build.0 = Debug|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|x64.ActiveCfg = Debug|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|x64.Build.0 = Debug|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|Win32.ActiveCfg = Release|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|Win32.Build.0 = Release|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|x64.ActiveCfg = Release|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|x64.Build.0 = Release|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|Win32.ActiveCfg = Release|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|Win32.Build.0 = Release|Win32
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|x64.ActiveCfg = Release|x64
-		{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|x64.Build.0 = Release|x64
 		{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
 		{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|Win32.Build.0 = Debug|Win32
 		{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|x64.ActiveCfg = Debug|Win32
@@ -371,7 +350,6 @@ Global
 		{C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1}
 		{80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}
 		{5A435710-E6D2-4DD4-9B3F-A7239A32C6F4} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}
-		{83D4D926-2983-4770-BA92-EB9CB8828C95} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
 		{8FEF7F9E-F5F3-470E-91F4-404B7D6BC1BB} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
 		{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
 		{F51017F9-B7FB-4F87-B7B5-12799D965783} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}

po/mcs/de.po.REMOVED.git-id

@@ -1 +1 @@
-e7b21acf1b731dab907fa74c866f3a9a00dff138
+3e835f3bc1a499969b1ba8432073eaf96cfe1005

po/mcs/es.po.REMOVED.git-id

@@ -1 +1 @@
-ef9b981f4526138490b1d7175ccad48955f0ed45
+28b44b354af0dba167d05874ae1a09d29417eda7

po/mcs/ja.po.REMOVED.git-id

@@ -1 +1 @@
-4e574e85c25d7f241b0ce797209cb93228f37b71
+c6e4de5919e4185763e2cde8f71db3c462da5e53

po/mcs/mcs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mono 4.2.1\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2015-11-12 04:10-0500\n"
+"POT-Creation-Date: 2015-12-08 12:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

po/mcs/pt_BR.po.REMOVED.git-id

@@ -1 +1 @@
-145b56bc366f6249798efa5b0c3c010549423bf3
+64d8a39b13e9397974c8baea2aa9b3cad380c1b4

winconfig.h

@@ -636,5 +636,5 @@
 /* #undef USE_MONO_MUTEX */
 
 /* Version number of package */
-#define VERSION "4.1.0"
+#define VERSION "4.2.1"
 #endif