Merge branch 'upstream'
Former-commit-id: 1a4f417afe405fac2625ad54f0bdc42a624ade1b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
3146b1dd74
@ -1 +1 @@
|
||||
8f9d105af4a9f68eed64521e407923df5dcd59d2
|
||||
fd1b8031ff8b41243f129122c0ed6261c5af46f6
|
||||
@ -1 +1 @@
|
||||
e1da4e425ca881ed9b3045f7c232af35f998c0b1
|
||||
bb385e0b28d887340c81438e4a1718099c7721ae
|
||||
@ -1 +1 @@
|
||||
6e6d55fa6d4563c2ddecff090b26326917348ee8
|
||||
2f3a0a269516161cf0c1c068ede37d582066b993
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d3a0d2895d543df718c1dd8091fd295179af0716
|
||||
f10654379c9f8c1ded91fafb333406075b370713
|
||||
@ -1 +1 @@
|
||||
4b5c6518a0432f48b1f5b33a7a60179fb7c92f59
|
||||
ee7438011f35265e69c71ff4b51fe4ea71cf08cb
|
||||
@ -1 +1 @@
|
||||
6655ed33fc7ab0841ddc1d568523d5e939a9cdb8
|
||||
eb647c7c2862ae76b6456f73e918ee5c85608d1c
|
||||
@ -1 +1 @@
|
||||
5e168fa3218ec251c4329e301b60e3bf226fb236
|
||||
32289bf324fb4ea7107cc227d79948830378f0b1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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";
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -1 +1 @@
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
||||
45c50045e75dd4480779db3db23bb0a99f7a7b4d
|
||||
@ -1 +1 @@
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
||||
b7600bfa57ee348aba573d4944bc2c33628c9bf8
|
||||
@ -1 +1 @@
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
||||
d3b99f8ef215d2b9fd0d260ae329fbafdf379340
|
||||
@ -1 +1 @@
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
||||
3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
|
||||
@ -1 +1 @@
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
||||
8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
|
||||
@ -1 +1 @@
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
||||
399540d6327a1fc163eee88584e1c4b56237a604
|
||||
@ -1 +1 @@
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
||||
ea56a79f899249fb36db4b4243d5bdcfaa726093
|
||||
@ -1 +1 @@
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
||||
45c50045e75dd4480779db3db23bb0a99f7a7b4d
|
||||
@ -1 +1 @@
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
||||
b7600bfa57ee348aba573d4944bc2c33628c9bf8
|
||||
@ -1 +1 @@
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
||||
d3b99f8ef215d2b9fd0d260ae329fbafdf379340
|
||||
@ -1 +1 @@
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
||||
3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
|
||||
@ -1 +1 @@
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
||||
8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
|
||||
@ -1 +1 @@
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
||||
399540d6327a1fc163eee88584e1c4b56237a604
|
||||
@ -1 +1 @@
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
||||
13a1d38086cdc582aa0408e10b3191a7e155c40f
|
||||
@ -1 +1 @@
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
||||
ea56a79f899249fb36db4b4243d5bdcfaa726093
|
||||
@ -1 +1 @@
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
||||
45c50045e75dd4480779db3db23bb0a99f7a7b4d
|
||||
@ -1 +1 @@
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
||||
b7600bfa57ee348aba573d4944bc2c33628c9bf8
|
||||
@ -1 +1 @@
|
||||
89d2a7ab3c828aafc9a2b9e7581db77940064b96
|
||||
d3b99f8ef215d2b9fd0d260ae329fbafdf379340
|
||||
@ -1 +1 @@
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
||||
3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
|
||||
@ -1 +1 @@
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
||||
8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
|
||||
@ -1 +1 @@
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
||||
399540d6327a1fc163eee88584e1c4b56237a604
|
||||
@ -1 +1 @@
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
||||
13a1d38086cdc582aa0408e10b3191a7e155c40f
|
||||
@ -1 +1 @@
|
||||
42ba836f633e19bc4b970cc91d11d5eb3eb75e28
|
||||
ea56a79f899249fb36db4b4243d5bdcfaa726093
|
||||
@ -1 +1 @@
|
||||
defb30ebe68510ef624f201b78a1028b8900ef49
|
||||
45c50045e75dd4480779db3db23bb0a99f7a7b4d
|
||||
@ -1 +1 @@
|
||||
86bef9eafbbf4ee5cfbc43f0f8fb7b371415fa91
|
||||
b7600bfa57ee348aba573d4944bc2c33628c9bf8
|
||||
@ -1 +1 @@
|
||||
75f6c4135c7af76cb351857ec1d84ab54ac6465e
|
||||
dcf4ff01b1f09f48598d3b46f416adb2b2ec665d
|
||||
@ -1 +1 @@
|
||||
234254303adeba4b9f394653c1c63ef3c7dd2a46
|
||||
3e51bb7a3cbd10b1fd945cf2c7d9cca7627e429e
|
||||
@ -1 +1 @@
|
||||
7fb14ac8cefe2fd4034726a9372a63bf49c75ded
|
||||
8b25a5ac750045c15e7e07b5ea0f3875a0da25ac
|
||||
@ -1 +1 @@
|
||||
8368316fc81d4e3991f72833420dd97a2eab4207
|
||||
399540d6327a1fc163eee88584e1c4b56237a604
|
||||
@ -1 +1 @@
|
||||
d09d094feed27b627df1d39f7213d3a63e13d0f9
|
||||
13a1d38086cdc582aa0408e10b3191a7e155c40f
|
||||
@ -1 +1 @@
|
||||
dae7dc2a54ac5939b1ff8f5369b320d0c1010510
|
||||
3e630fb8f749f7685b6aefaf94a48afe31cde73d
|
||||
@ -1 +1 @@
|
||||
6e6d55fa6d4563c2ddecff090b26326917348ee8
|
||||
2f3a0a269516161cf0c1c068ede37d582066b993
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d3a0d2895d543df718c1dd8091fd295179af0716
|
||||
f10654379c9f8c1ded91fafb333406075b370713
|
||||
@ -1 +1 @@
|
||||
4b5c6518a0432f48b1f5b33a7a60179fb7c92f59
|
||||
ee7438011f35265e69c71ff4b51fe4ea71cf08cb
|
||||
@ -1 +1 @@
|
||||
6655ed33fc7ab0841ddc1d568523d5e939a9cdb8
|
||||
eb647c7c2862ae76b6456f73e918ee5c85608d1c
|
||||
@ -1 +1 @@
|
||||
5e168fa3218ec251c4329e301b60e3bf226fb236
|
||||
32289bf324fb4ea7107cc227d79948830378f0b1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -60,6 +60,8 @@ monotouch_tv_SUBDIRS = nunit-lite
|
||||
monotouch_watch_SUBDIRS = nunit-lite
|
||||
monotouch_tools_SUBDIRS =
|
||||
monotouch_tools_PARALLEL_SUBDIRS = corcompare mono-api-html
|
||||
xammac_SUBDIRS = nunit-lite
|
||||
xammac_net_4_5_SUBDIRS = nunit-lite
|
||||
net_4_x_SUBDIRS =
|
||||
net_4_x_PARALLEL_SUBDIRS = $(net_4_5_dirs)
|
||||
wasm_tools_SUBDIRS =
|
||||
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/1648e88"
|
||||
#define FULL_VERSION "explicit/fe64a47"
|
||||
|
||||
@ -1491,10 +1491,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
cc5ce0347705822f704f71709145aaeaef6263cb
|
||||
35ff64fd1385fd6b18029d9bba32c208d7fd1202
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
ccd71281ed0ab4bf1a00015ee18fbddaee02f1a2
|
||||
a424cd0bc5f06179c3e772c8fb52d997116a70da
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
972921399c1759b0f9eb365fb36c103229b565bd
|
||||
fb79a9a10f29def7b8517e092fdaecb376edc5b1
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.4.0.196\n"
|
||||
"Project-Id-Version: mono 6.4.0.198\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-09-18 08:07+0000\n"
|
||||
"POT-Creation-Date: 2019-09-19 08:12+0000\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"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
08a4e805bbc1dc8ab14f832760736e62c43dbacb
|
||||
0448bfdd5e6fb16b08f498ec0094d4663eada906
|
||||
Loading…
x
Reference in New Issue
Block a user