Imported Upstream version 6.4.0.198

Former-commit-id: f50ce77ce335da6ab5b5bf46a0e6a38aa599ee47
2019-09-19 08:43:50 +00:00
parent 3871dbaeeb
commit e4f7c9bcf1
88 changed files with 1783 additions and 1786 deletions
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "6.4.0.196";
+	public const string MonoVersion = "6.4.0.198";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/build/tests.make
+++ b/mcs/build/tests.make
@@ -128,7 +128,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
 	@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi

 $(topdir)/build/deps/nunit-$(PROFILE).stamp:
-	cd ${topdir}/tools/nunit-lite && $(MAKE)
+	$(MAKE) -C ${topdir}/tools/nunit-lite
 	echo "stamp" >$@

 tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
@@ -378,5 +378,3 @@ $(xtest_makefrag): $(xtest_response)

 endif

-
-.PHONY: patch-nunitlite-appconfig
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -232,7 +232,7 @@ TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
 satellite_assembly1 = $(test_lib_dir)/es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
 satellite_assembly2 = $(test_lib_dir)/nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))

-$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) $(test_lib_dir)
+$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) | $(test_lib_dir)

 mscorlib_for_profile = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll

@@ -298,11 +298,8 @@ NO_VTS_TEST = yes
 endif

 ifndef NO_VTS_TEST
-test: test-vts
-run-test: run-test-vts
-else
-test:
-run-test:
+test-local: test-vts
+run-test-local: run-test-vts
 endif

 EXTRA_DISTFILES += \
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-defb30ebe68510ef624f201b78a1028b8900ef49
+45c50045e75dd4480779db3db23bb0a99f7a7b4d
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
+b7600bfa57ee348aba573d4944bc2c33628c9bf8
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-89d2a7ab3c828aafc9a2b9e7581db77940064b96
+d3b99f8ef215d2b9fd0d260ae329fbafdf379340
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-234254303adeba4b9f394653c1c63ef3c7dd2a46
+3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-7fb14ac8cefe2fd4034726a9372a63bf49c75ded
+8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-8368316fc81d4e3991f72833420dd97a2eab4207
+399540d6327a1fc163eee88584e1c4b56237a604
--- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-42ba836f633e19bc4b970cc91d11d5eb3eb75e28
+ea56a79f899249fb36db4b4243d5bdcfaa726093
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-defb30ebe68510ef624f201b78a1028b8900ef49
+45c50045e75dd4480779db3db23bb0a99f7a7b4d
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
+b7600bfa57ee348aba573d4944bc2c33628c9bf8
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-89d2a7ab3c828aafc9a2b9e7581db77940064b96
+d3b99f8ef215d2b9fd0d260ae329fbafdf379340
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-234254303adeba4b9f394653c1c63ef3c7dd2a46
+3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-7fb14ac8cefe2fd4034726a9372a63bf49c75ded
+8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-8368316fc81d4e3991f72833420dd97a2eab4207
+399540d6327a1fc163eee88584e1c4b56237a604
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-d09d094feed27b627df1d39f7213d3a63e13d0f9
+13a1d38086cdc582aa0408e10b3191a7e155c40f
--- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-42ba836f633e19bc4b970cc91d11d5eb3eb75e28
+ea56a79f899249fb36db4b4243d5bdcfaa726093
--- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-defb30ebe68510ef624f201b78a1028b8900ef49
+45c50045e75dd4480779db3db23bb0a99f7a7b4d
--- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
+b7600bfa57ee348aba573d4944bc2c33628c9bf8
--- a/Show More
+++ b/Show More