Merge branch 'upstream'

Former-commit-id: 56b168b24f81502c50037dc0e77df19b343a61b5
2018-10-12 08:30:28 +00:00 · 2018-10-12 08:30:28 +00:00 · 75f3fb09e2
commit 75f3fb09e2
parent cd1949fa47 16db2c6290
46 changed files with 39 additions and 39 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-1d1a992d5d686e5e5a56a2b642a4ff4fb51b4572
+cce5e33dc38ebad040da83df2779c694f7680b59
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-3d010c3c72782d1747bbaf1811af2abd135789c7
+c2d34136f2b94200202e79854696d70ce63ed982
--- a/external/xunit-binaries/README.md
+++ b/external/xunit-binaries/README.md
@ -1,5 +1,5 @@
 # xunit-binaries

-Extracted xUnit nuget packages targetting netstandard 2.0 (or 1.1 when not available)
+Extracted xUnit nuget packages targetting netstandard 1.x

 Xunit.NetCore.Extensions.dll were extracted from https://dotnet.myget.org/feed/dotnet-buildtools/package/nuget/Microsoft.xunit.netcore.extensions/2.1.0-rc1-03006-01
--- 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.18.0.143";
+	public const string MonoVersion = "5.18.0.145";
 	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/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-802f26e849d2fc0c518a08551c06344ae8cf7d6e
+15269d01a05d3caa564c2ffe35a3a00b7a95b3da
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
+c2e980d09ba5a6da432f4436c784362c02ce6a93
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-17a35b9e6d8a06b7edb722425c155310f85db0da
+0d438ca1236e6943b1725f5e1709e5e682a1bdb2
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f938aeefd3cfc658764d0385e2181e6ac575cb2
+450f3df6c2138585fa237079e99cce6a637f2cc1
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-299a0f7a03122cba58b13178572d5e4d16475bc2
+d67c2397239dcb552cef2a890ccfc4239f4e46cf
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-03321a8395d80950b148ecb656024bdbb889bc4c
+2d8b274900a46e7d97e782b7c4450901063791d0
--- a/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-b08364e80d951757ca9729410a9ad44a06b05431
+9a467eeb8038dac9e9d0ad323626f597f0a2c124
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-802f26e849d2fc0c518a08551c06344ae8cf7d6e
+15269d01a05d3caa564c2ffe35a3a00b7a95b3da
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
+c2e980d09ba5a6da432f4436c784362c02ce6a93
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-17a35b9e6d8a06b7edb722425c155310f85db0da
+0d438ca1236e6943b1725f5e1709e5e682a1bdb2
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f938aeefd3cfc658764d0385e2181e6ac575cb2
+450f3df6c2138585fa237079e99cce6a637f2cc1
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-299a0f7a03122cba58b13178572d5e4d16475bc2
+d67c2397239dcb552cef2a890ccfc4239f4e46cf
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-03321a8395d80950b148ecb656024bdbb889bc4c
+2d8b274900a46e7d97e782b7c4450901063791d0
--- a/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/72078E96-4A71-4CCD-83BC-B7CC78873FC0/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-b08364e80d951757ca9729410a9ad44a06b05431
+9a467eeb8038dac9e9d0ad323626f597f0a2c124
--- a/Show More
+++ b/Show More