Merge branch 'upstream'

Former-commit-id: c8cacad34952d555c4281b36aedb944efd1d0d5d
2018-10-13 08:28:12 +00:00
parent 80cef0a071 c0d0d7dce1
commit bfd8a53471
46 changed files with 39 additions and 39 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-cce5e33dc38ebad040da83df2779c694f7680b59
+9ffa50bee09618535f852043e12554736b12a21c
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-c2d34136f2b94200202e79854696d70ce63ed982
+7ac1a61c38d3ab88f8aebba9fbaae9c9a7cc6958
--- a/llvm/SUBMODULES.json
+++ b/llvm/SUBMODULES.json
@ -2,7 +2,7 @@
  {
      "name": "llvm", 
      "url": "git://github.com/mono/llvm.git",
-      "rev": "fc854b8ec5873d294b80afa3e6cf6a88c5c48886",
+      "rev": "81376d161cb6c2230834b2dc096ccbdae8d93020",
      "remote-branch": "origin/release_60", 
      "branch": "release_60", 
      "directory": "llvm"
--- 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.145";
+	public const string MonoVersion = "5.18.0.147";
 	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 @@
-15269d01a05d3caa564c2ffe35a3a00b7a95b3da
+ff963de41b794060c47ab2adbf50cfbd3a80edef
--- 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 @@
-c2e980d09ba5a6da432f4436c784362c02ce6a93
+0dd7cb3b4f02c995e612c7da661371327826abad
--- 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 @@
-0d438ca1236e6943b1725f5e1709e5e682a1bdb2
+cca6b05aa5091b549e08a32f09ab5bd374301520
--- 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 @@
-450f3df6c2138585fa237079e99cce6a637f2cc1
+1270e324e0061f4714ddc9e187394b9dbfbb9edd
--- 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 @@
-d67c2397239dcb552cef2a890ccfc4239f4e46cf
+785b67a448239235fdab9d2a42d07fcc85f2d8e1
--- 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 @@
-2d8b274900a46e7d97e782b7c4450901063791d0
+a54156a0419544fea7dccb9902e738c01cba81a8
--- 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 @@
-9a467eeb8038dac9e9d0ad323626f597f0a2c124
+3e51ba43af607410d6a3b034da7096a102577b1a
--- 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 @@
-15269d01a05d3caa564c2ffe35a3a00b7a95b3da
+ff963de41b794060c47ab2adbf50cfbd3a80edef
--- 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 @@
-c2e980d09ba5a6da432f4436c784362c02ce6a93
+0dd7cb3b4f02c995e612c7da661371327826abad
--- 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 @@
-0d438ca1236e6943b1725f5e1709e5e682a1bdb2
+cca6b05aa5091b549e08a32f09ab5bd374301520
--- 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 @@
-450f3df6c2138585fa237079e99cce6a637f2cc1
+1270e324e0061f4714ddc9e187394b9dbfbb9edd
--- 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 @@
-d67c2397239dcb552cef2a890ccfc4239f4e46cf
+785b67a448239235fdab9d2a42d07fcc85f2d8e1
--- 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 @@
-2d8b274900a46e7d97e782b7c4450901063791d0
+a54156a0419544fea7dccb9902e738c01cba81a8
--- 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 @@
-9a467eeb8038dac9e9d0ad323626f597f0a2c124
+3e51ba43af607410d6a3b034da7096a102577b1a
--- a/Show More
+++ b/Show More