Merge branch 'upstream'

Former-commit-id: 207b82196c97cabdf120115037feb1527cbb842c
2018-02-16 19:23:07 +00:00
parent fd14c47559 132339e30c
commit 2786500938
35 changed files with 32 additions and 32 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-1ec1f13b23336e839dceed8ccd6731dd02720915
+5ea0274145c02531858c989f1ac0e5e14a153cf5
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-3d0bab926f5da4bfa2c3b38e7dad08f280c2228b
+60da131af7360f1dbc3a537f8ea11adc9cc7e997
--- 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.0.116";
+	public const string MonoVersion = "5.10.0.118";
 	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/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3528a4d084d9db2620ae927a78704f2fdc4dde09
+7805f334132a106e3aad5c3a8462675c3dab938c
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d09b9a3a1574069b1e574798dbd6483681665184
+d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-598dca2f70bb95b4532acc6da208566dc4893deb
+e1b875997af0ecb18c2560f766beb60f49ed92a7
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-38f717388041bdb3e62229118e44818753615a33
+7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-126bb76fe92fca40a38be6608587a58a3257b9a6
+320e1131777f12fc0d331c1396e8303948bd1c8d
--- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-6862f39b66c913f59d89f0548ee8df36a44c18ec
+505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
--- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-4d4451e4c348d6415ad163198098b22ccfc16145
+cc242a59836737c028571d639b1be8afe9fb8799
--- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3528a4d084d9db2620ae927a78704f2fdc4dde09
+7805f334132a106e3aad5c3a8462675c3dab938c
--- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d09b9a3a1574069b1e574798dbd6483681665184
+d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
--- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-598dca2f70bb95b4532acc6da208566dc4893deb
+e1b875997af0ecb18c2560f766beb60f49ed92a7
--- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-38f717388041bdb3e62229118e44818753615a33
+7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
--- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-126bb76fe92fca40a38be6608587a58a3257b9a6
+320e1131777f12fc0d331c1396e8303948bd1c8d
--- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-6862f39b66c913f59d89f0548ee8df36a44c18ec
+505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
--- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-4d4451e4c348d6415ad163198098b22ccfc16145
+cc242a59836737c028571d639b1be8afe9fb8799
--- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-3528a4d084d9db2620ae927a78704f2fdc4dde09
+7805f334132a106e3aad5c3a8462675c3dab938c
--- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-d09b9a3a1574069b1e574798dbd6483681665184
+d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
--- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-598dca2f70bb95b4532acc6da208566dc4893deb
+e1b875997af0ecb18c2560f766beb60f49ed92a7
--- a/Show More
+++ b/Show More
		`@@ -1 +1 @@`
			`1ec1f13b23336e839dceed8ccd6731dd02720915`				`5ea0274145c02531858c989f1ac0e5e14a153cf5`
		`@@ -1 +1 @@`
			`3d0bab926f5da4bfa2c3b38e7dad08f280c2228b`				`60da131af7360f1dbc3a537f8ea11adc9cc7e997`
		`@@ -1 +1 @@`
			`3528a4d084d9db2620ae927a78704f2fdc4dde09`				`7805f334132a106e3aad5c3a8462675c3dab938c`
		`@@ -1 +1 @@`
			`d09b9a3a1574069b1e574798dbd6483681665184`				`d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6`
		`@@ -1 +1 @@`
			`598dca2f70bb95b4532acc6da208566dc4893deb`				`e1b875997af0ecb18c2560f766beb60f49ed92a7`
		`@@ -1 +1 @@`
			`38f717388041bdb3e62229118e44818753615a33`				`7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b`
		`@@ -1 +1 @@`
			`126bb76fe92fca40a38be6608587a58a3257b9a6`				`320e1131777f12fc0d331c1396e8303948bd1c8d`
		`@@ -1 +1 @@`
			`6862f39b66c913f59d89f0548ee8df36a44c18ec`				`505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2`
		`@@ -1 +1 @@`
			`4d4451e4c348d6415ad163198098b22ccfc16145`				`cc242a59836737c028571d639b1be8afe9fb8799`