Imported Upstream version 6.4.0.198

Former-commit-id: f50ce77ce335da6ab5b5bf46a0e6a38aa599ee47
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-19 08:43:50 +00:00
parent 3871dbaeeb
commit e4f7c9bcf1
88 changed files with 1783 additions and 1786 deletions

View File

@ -1 +1 @@
8f9d105af4a9f68eed64521e407923df5dcd59d2 fd1b8031ff8b41243f129122c0ed6261c5af46f6

View File

@ -1 +1 @@
e1da4e425ca881ed9b3045f7c232af35f998c0b1 bb385e0b28d887340c81438e4a1718099c7721ae

View File

@ -1 +1 @@
6e6d55fa6d4563c2ddecff090b26326917348ee8 2f3a0a269516161cf0c1c068ede37d582066b993

View File

@ -1 +1 @@
d3a0d2895d543df718c1dd8091fd295179af0716 f10654379c9f8c1ded91fafb333406075b370713

View File

@ -1 +1 @@
4b5c6518a0432f48b1f5b33a7a60179fb7c92f59 ee7438011f35265e69c71ff4b51fe4ea71cf08cb

View File

@ -1 +1 @@
6655ed33fc7ab0841ddc1d568523d5e939a9cdb8 eb647c7c2862ae76b6456f73e918ee5c85608d1c

View File

@ -1 +1 @@
5e168fa3218ec251c4329e301b60e3bf226fb236 32289bf324fb4ea7107cc227d79948830378f0b1

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // 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 MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -128,7 +128,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi @if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
$(topdir)/build/deps/nunit-$(PROFILE).stamp: $(topdir)/build/deps/nunit-$(PROFILE).stamp:
cd ${topdir}/tools/nunit-lite && $(MAKE) $(MAKE) -C ${topdir}/tools/nunit-lite
echo "stamp" >$@ echo "stamp" >$@
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
@ -378,5 +378,3 @@ $(xtest_makefrag): $(xtest_response)
endif endif
.PHONY: patch-nunitlite-appconfig

View File

@ -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_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)) 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 mscorlib_for_profile = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll
@ -298,11 +298,8 @@ NO_VTS_TEST = yes
endif endif
ifndef NO_VTS_TEST ifndef NO_VTS_TEST
test: test-vts test-local: test-vts
run-test: run-test-vts run-test-local: run-test-vts
else
test:
run-test:
endif endif
EXTRA_DISTFILES += \ EXTRA_DISTFILES += \

View File

@ -1 +1 @@
defb30ebe68510ef624f201b78a1028b8900ef49 45c50045e75dd4480779db3db23bb0a99f7a7b4d

View File

@ -1 +1 @@
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91 b7600bfa57ee348aba573d4944bc2c33628c9bf8

View File

@ -1 +1 @@
89d2a7ab3c828aafc9a2b9e7581db77940064b96 d3b99f8ef215d2b9fd0d260ae329fbafdf379340

View File

@ -1 +1 @@
234254303adeba4b9f394653c1c63ef3c7dd2a46 3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e

View File

@ -1 +1 @@
7fb14ac8cefe2fd4034726a9372a63bf49c75ded 8b25a5ac750045c15e7e07b5ea0f3875a0da25ac

Some files were not shown because too many files have changed in this diff Show More