Merge branch 'upstream'

Former-commit-id: 48352d4579114a7577db362fbc3dec77c9f9bbe8
2018-04-19 09:26:31 +00:00 · 2018-04-19 09:26:31 +00:00 · c0610496f5
commit c0610496f5
parent adbaa14d3b b29acd44c3
34 changed files with 31 additions and 31 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-90dba7c7ee2e8ba3aef00486936d2a9722afa6b4
+fad0caa98c4cdfc899c119b745ac927d74fd8fc4
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-75ad532cc19ed5a646add0d0aca9fc2b5b037e9c
+470f8cd3e6e6e4b0ed429172eb3272fd3849d940
--- 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.10.1.47";
+	public const string MonoVersion = "5.10.1.48";
 	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-darwin/1051000004/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-443c454b06c3cbe97b681e3fee5dd54a2da877f9
+f69c9971d4d57ce361edfbd9e1132a9400c1e0e3
--- a/mcs/class/lib/monolite-darwin/1051000004/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-757922b94ca5932285bc1bf22db6a44d8f0f1e40
+583b45a1c56ae2f689bbf601ea953258152c2e3a
--- a/mcs/class/lib/monolite-darwin/1051000004/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-f22a9383da86e56792fedf7b82a6c7c32aa29b8b
+6662363ef129e70bb0d93627a9b7539dc0cadfc7
--- a/mcs/class/lib/monolite-darwin/1051000004/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-fd972d6d0bdc37c2d11794c84c9dcf95f2df6c35
+02d0b54359d3ecddd9fa7291f7c1045dcba9e7e9
--- a/mcs/class/lib/monolite-darwin/1051000004/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-a6ebb3035a0d784a417a77479c9d9ca867d17332
+8e6f76c607b56f9c3f925e8e87ee2beab172710a
--- a/mcs/class/lib/monolite-darwin/1051000004/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-42cc1851704e78f0865676858ddff0865f3a1cd0
+6fe5eee2d1c8087bb69be1431b4440cd55a75e88
--- a/mcs/class/lib/monolite-darwin/1051000004/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000004/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-c8f36fb4430db93058b7df262c1d4ce9ff9e67dc
+ae766614a0c379147a2a28303ac4a039931b3dfb
--- a/mcs/class/lib/monolite-linux/1051000004/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-443c454b06c3cbe97b681e3fee5dd54a2da877f9
+f69c9971d4d57ce361edfbd9e1132a9400c1e0e3
--- a/mcs/class/lib/monolite-linux/1051000004/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-757922b94ca5932285bc1bf22db6a44d8f0f1e40
+583b45a1c56ae2f689bbf601ea953258152c2e3a
--- a/mcs/class/lib/monolite-linux/1051000004/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-f22a9383da86e56792fedf7b82a6c7c32aa29b8b
+6662363ef129e70bb0d93627a9b7539dc0cadfc7
--- a/mcs/class/lib/monolite-linux/1051000004/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-fd972d6d0bdc37c2d11794c84c9dcf95f2df6c35
+02d0b54359d3ecddd9fa7291f7c1045dcba9e7e9
--- a/mcs/class/lib/monolite-linux/1051000004/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-a6ebb3035a0d784a417a77479c9d9ca867d17332
+8e6f76c607b56f9c3f925e8e87ee2beab172710a
--- a/mcs/class/lib/monolite-linux/1051000004/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-42cc1851704e78f0865676858ddff0865f3a1cd0
+6fe5eee2d1c8087bb69be1431b4440cd55a75e88
--- a/mcs/class/lib/monolite-linux/1051000004/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000004/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-c8f36fb4430db93058b7df262c1d4ce9ff9e67dc
+ae766614a0c379147a2a28303ac4a039931b3dfb
--- a/mcs/class/lib/monolite-win32/1051000004/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000004/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-443c454b06c3cbe97b681e3fee5dd54a2da877f9
+f69c9971d4d57ce361edfbd9e1132a9400c1e0e3
--- a/mcs/class/lib/monolite-win32/1051000004/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000004/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-757922b94ca5932285bc1bf22db6a44d8f0f1e40
+583b45a1c56ae2f689bbf601ea953258152c2e3a
--- a/mcs/class/lib/monolite-win32/1051000004/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000004/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-f22a9383da86e56792fedf7b82a6c7c32aa29b8b
+6662363ef129e70bb0d93627a9b7539dc0cadfc7
--- a/Show More
+++ b/Show More