Imported Upstream version 6.0.0.255

Former-commit-id: a809b61efe270682042e308f31b142c7df27f1ca
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-24 08:31:04 +00:00
parent 08f368abd7
commit 03112dc19c
50 changed files with 60 additions and 45 deletions

View File

@ -1 +1 @@
b7a19436bc6ba92737945e204fbddc95ba281d6e
74abfccb776ba324a0275fcc0ddb2897bdf001d5

View File

@ -1 +1 @@
2fb685bad934e0f5daf1a4afa62c5447831979d1
445ee57c4662662a46c91f4416ed9da910fad8c3

View File

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

View File

@ -329,7 +329,7 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
endif
check: run-xunit-test-local
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll $(test_lib_dir)/xunit.execution.dotnet.dll
run-xunit-test-local: run-xunit-test-lib
$(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
@ -338,14 +338,15 @@ $(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
$(test_lib_dir)/Xunit.NetCore.Extensions.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll | $(test_lib_dir)
@cp -f $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll $@
$(test_lib_dir)/xunit.execution.dotnet.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll | $(test_lib_dir)
@cp -f $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll $@
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
run-xunit-test-lib: xunit-test-local
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll
ok=:; \
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \
$$ok
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)

View File

@ -1 +1 @@
bba1f46f4aa1a182adb7fae0ad835d43103205be
1645b18a9d8dda6529e3cdae726e1c21a2227ba7

View File

@ -1 +1 @@
9c57ec0f725aa176ef4cf96f981fad5a05dea602
7a576bb41bd21859526feae7b08e48e9b31fa50c

View File

@ -1 +1 @@
e3114509056352eca32bb98052f87ff63ed78cfc
be39720ce0c5b32ef632aa70f2e4559d7c10b573

View File

@ -1 +1 @@
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
5594789749490508283bf82b09672da5f4310d25

View File

@ -1 +1 @@
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
3793ea7f306407ceac890e0dc1f0048946374e59

View File

@ -1 +1 @@
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
5dcca253494d6da57816a6e9c9702b3a3a4723e4

View File

@ -1 +1 @@
c46338c204644399b8e25c5f868445c74c51965c
042d381ea6d1a6bc1d3ca453f46804a982a2bdbf

View File

@ -1 +1 @@
bba1f46f4aa1a182adb7fae0ad835d43103205be
1645b18a9d8dda6529e3cdae726e1c21a2227ba7

View File

@ -1 +1 @@
9c57ec0f725aa176ef4cf96f981fad5a05dea602
7a576bb41bd21859526feae7b08e48e9b31fa50c

View File

@ -1 +1 @@
e3114509056352eca32bb98052f87ff63ed78cfc
be39720ce0c5b32ef632aa70f2e4559d7c10b573

View File

@ -1 +1 @@
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
5594789749490508283bf82b09672da5f4310d25

View File

@ -1 +1 @@
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
3793ea7f306407ceac890e0dc1f0048946374e59

View File

@ -1 +1 @@
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
5dcca253494d6da57816a6e9c9702b3a3a4723e4

View File

@ -1 +1 @@
c46338c204644399b8e25c5f868445c74c51965c
042d381ea6d1a6bc1d3ca453f46804a982a2bdbf

View File

@ -1 +1 @@
bba1f46f4aa1a182adb7fae0ad835d43103205be
1645b18a9d8dda6529e3cdae726e1c21a2227ba7

View File

@ -1 +1 @@
9c57ec0f725aa176ef4cf96f981fad5a05dea602
7a576bb41bd21859526feae7b08e48e9b31fa50c

View File

@ -1 +1 @@
e3114509056352eca32bb98052f87ff63ed78cfc
be39720ce0c5b32ef632aa70f2e4559d7c10b573

View File

@ -1 +1 @@
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
5594789749490508283bf82b09672da5f4310d25

View File

@ -1 +1 @@
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
3793ea7f306407ceac890e0dc1f0048946374e59

View File

@ -1 +1 @@
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
5dcca253494d6da57816a6e9c9702b3a3a4723e4

View File

@ -1 +1 @@
c46338c204644399b8e25c5f868445c74c51965c
042d381ea6d1a6bc1d3ca453f46804a982a2bdbf

View File

@ -1 +1 @@
bba1f46f4aa1a182adb7fae0ad835d43103205be
1645b18a9d8dda6529e3cdae726e1c21a2227ba7

View File

@ -1 +1 @@
9c57ec0f725aa176ef4cf96f981fad5a05dea602
7a576bb41bd21859526feae7b08e48e9b31fa50c

View File

@ -1 +1 @@
a02d6fdb948a5fb6664bf1838df101b48446e3ab
83238e18a66e32663b31dfe6d990d92ee6e3315b

View File

@ -1 +1 @@
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
5594789749490508283bf82b09672da5f4310d25

View File

@ -1 +1 @@
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
3793ea7f306407ceac890e0dc1f0048946374e59

View File

@ -1 +1 @@
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
5dcca253494d6da57816a6e9c9702b3a3a4723e4

View File

@ -1 +1 @@
b10645ffc16347748b34c442ecaaac3b6ad5381f
f7c944f681aba0e422c9307d78ccf79af7486a16

View File

@ -980,15 +980,19 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu
mono_property_set_value_handle (prop, attr, pparams, error);
goto_if_nok (error, fail);
}
g_free (name);
name = NULL;
}
goto exit;
fail:
g_free (name);
name = NULL;
attr = mono_new_null ();
exit:
if (field && !type_is_reference (field->type))
g_free (val);
g_free (name);
if (prop_type && !type_is_reference (prop_type))
g_free (pparams [0]);
if (params) {

View File

@ -1382,8 +1382,20 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
base = g_path_get_dirname (resolvedname);
newbase = g_path_get_dirname(base);
mdirname = g_strdup_printf ("%s/lib", newbase);
// On Android the executable for the application is going to be /system/bin/app_process{32,64} depending on
// the application's architecture. However, libraries for the different architectures live in different
// subdirectories of `/system`: `lib` for 32-bit apps and `lib64` for 64-bit ones. Thus appending `/lib` below
// will fail to load the DSO for a 64-bit app, even if it exists there, because it will have a different
// architecture. This is the cause of https://github.com/xamarin/xamarin-android/issues/2780 and the ifdef
// below is the fix.
mdirname = g_strdup_printf (
#if defined(TARGET_ANDROID) && (defined(TARGET_ARM64) || defined(TARGET_AMD64))
"%s/lib64",
#else
"%s/lib",
#endif
newbase);
g_free (resolvedname);
g_free (base);
g_free (newbase);

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/f7ad4b2"
#define FULL_VERSION "explicit/3dc72cf"

Binary file not shown.

View File

@ -1 +1 @@
b53812eacfd987d781ffdd4fbc6d8dcb29839e82
47c5a3a0dc1ec2a89eef681d8673760a7de8b2e9

Binary file not shown.

View File

@ -1 +1 @@
574d892128f6da2b8a7240c7968cb0c29c3ed6ad
b01c6bed94f3c20d2d50a14aa169f1f0d426960b

Binary file not shown.

View File

@ -1 +1 @@
8da70e9a9cc41ab7eebadb274e5413617d1e7193
9f73d81c97f48dac3ba0b234a9b334ceef540bee

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.0.0.250\n"
"Project-Id-Version: mono 6.0.0.255\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-05-23 08:02+0000\n"
"POT-Creation-Date: 2019-05-24 08:03+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"

Binary file not shown.

View File

@ -1 +1 @@
98a02b68f4306d15ac19f263c93fb9fcd0ef8771
167beee473f717211b3d25f8f73968c2fbe1cba1

View File

@ -170,7 +170,6 @@ test-bundle-local:
cp -L -R $(mcs_topdir)/class/lib/$$profile $(TEST_BUNDLE_PATH); \
done
cp -L $(top_srcdir)/external/xunit-binaries/*.dll $(top_srcdir)/external/xunit-binaries/*.exe $(top_srcdir)/external/xunit-binaries/*.config $(TEST_BUNDLE_PATH)/net_4_x/
cp -L $(top_srcdir)/external/xunit-binaries/xunit.execution.dotnet.dll $(TEST_BUNDLE_PATH)/net_4_x/tests/
$(MAKE) -C $(mcs_topdir)/tests test-bundle
$(MAKE) -C $(mcs_topdir)/errors test-bundle
$(MAKE) -C $(mcs_topdir)/packages test-bundle

View File

@ -718,7 +718,6 @@ test-bundle-local:
cp -L -R $(mcs_topdir)/class/lib/$$profile $(TEST_BUNDLE_PATH); \
done
cp -L $(top_srcdir)/external/xunit-binaries/*.dll $(top_srcdir)/external/xunit-binaries/*.exe $(top_srcdir)/external/xunit-binaries/*.config $(TEST_BUNDLE_PATH)/net_4_x/
cp -L $(top_srcdir)/external/xunit-binaries/xunit.execution.dotnet.dll $(TEST_BUNDLE_PATH)/net_4_x/tests/
$(MAKE) -C $(mcs_topdir)/tests test-bundle
$(MAKE) -C $(mcs_topdir)/errors test-bundle
$(MAKE) -C $(mcs_topdir)/packages test-bundle