Imported Upstream version 5.14.0.156

Former-commit-id: ce0a73a36728a56d19f47892a92fda2d0d642f64
2018-06-30 08:22:57 +00:00
parent 01c08d50e8
commit e747ac1590
45 changed files with 271 additions and 59 deletions
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.14.0.148";
+	public const string MonoVersion = "5.14.0.156";
 	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
@@ -27,11 +27,16 @@ xunit_src  := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttri
 ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
 XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.exe
 xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
-$(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
 $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
-$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs \
 $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
 $(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs
+
+ifeq ($(PROFILE),monodroid)
+xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
+else
+xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
+$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
+endif
 endif

 xunit_class_deps := 
--- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b81e5105b4a226b866e9d4b525c04d6024ed558b
+6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d562da103406d82c4e5700336bbb136672c0b595
+7cd4ce8794c209e26f59d0c354d93fb9ae1f95db
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-8e12b0c40d4b90a82ade721f380a924720127548
+40ab52f347643403188c38498f42091ef9f00d9c
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-1f42617e7b8e00a04125fc85967729855b0bbd3c
+14839a10498c41b5b2bc637ff264e816bd2d87d0
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-fda09093e5973afedf30878b4b04bcdb9ce7302f
+79b791d700de0970735b209e0d091d1a21787896
--- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-6cd85b1ade15d3d15c5d45f15729344bfc58f191
+03f9e0b46c10b5712398a929c279cd9654a0393d
--- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-9aca22f64e9b0800a2247930d7d53ddb4570059f
+9a030f23563302ff603ffee74a0dd6f89a4f8b15
--- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b81e5105b4a226b866e9d4b525c04d6024ed558b
+6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6
--- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d562da103406d82c4e5700336bbb136672c0b595
+7cd4ce8794c209e26f59d0c354d93fb9ae1f95db
--- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-8e12b0c40d4b90a82ade721f380a924720127548
+40ab52f347643403188c38498f42091ef9f00d9c
--- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-1f42617e7b8e00a04125fc85967729855b0bbd3c
+14839a10498c41b5b2bc637ff264e816bd2d87d0
--- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-fda09093e5973afedf30878b4b04bcdb9ce7302f
+79b791d700de0970735b209e0d091d1a21787896
--- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-6cd85b1ade15d3d15c5d45f15729344bfc58f191
+03f9e0b46c10b5712398a929c279cd9654a0393d
--- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-9aca22f64e9b0800a2247930d7d53ddb4570059f
+9a030f23563302ff603ffee74a0dd6f89a4f8b15
--- a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b81e5105b4a226b866e9d4b525c04d6024ed558b
+6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6
--- a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d562da103406d82c4e5700336bbb136672c0b595
+7cd4ce8794c209e26f59d0c354d93fb9ae1f95db
--- a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-8e12b0c40d4b90a82ade721f380a924720127548
+40ab52f347643403188c38498f42091ef9f00d9c
--- a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-1f42617e7b8e00a04125fc85967729855b0bbd3c
+14839a10498c41b5b2bc637ff264e816bd2d87d0
--- a/Show More
+++ b/Show More