Merge branch 'upstream'

Former-commit-id: 56bc963aee9747656d1589096525c2113ebe2f8a
2020-01-13 09:24:14 +00:00
parent f97b27f9f1 d94e79959b
commit a4a01700a1
46 changed files with 44 additions and 44 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-cbbc8cbbdd0d8f33f327e39d59e267d63ec43436
+de3e24c05b4a999f066e347afb03569254b27184
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-18c90a85a208f0899ccd35e437481a76934ca350
+00398559330cf6eba61d24e026aceb55046393df
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
-	public const string MonoVersion = "6.8.0.95";
+	public const string MonoVersion = "6.8.0.96";
 	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/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
+4542cfb9c7aa4c1597bbe8196095cc82987acb37
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f6f8d0b05ebac65dbd253511d88708db62560880
+da0009f4f4683e6a844a961675727bc1d588d8e7
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-334a143b5e7ccd8e120b3ceeb20460aba527bd92
+60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-c46287bc4da9298130e80bec9c7ea258fb0ae0e9
+6326316802802f69b378f2e8d4143f4e31661f8d
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-5fc58a69d67cfd5f621cdf71146508cd165cd069
+8661e2f4ee10982f2e6156d41460ab94127e54a6
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-72da64886b1e1b7be52cfce60e1d5d76c9302efe
+8042cadf0fb06dce7232e20226536fe1ed05905b
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-51c742b93e604e3680f39bb5f52a43e3dde60565
+1216afb95b0eecf5f9ae83b3e13de752b258fc0b
--- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-e37511b1871a2ff62b8a917600e19c71a9ba0457
+453ee7ac8fb766c5acfb7c4fcf142887f2e933c6
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
+4542cfb9c7aa4c1597bbe8196095cc82987acb37
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f6f8d0b05ebac65dbd253511d88708db62560880
+da0009f4f4683e6a844a961675727bc1d588d8e7
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-334a143b5e7ccd8e120b3ceeb20460aba527bd92
+60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-c46287bc4da9298130e80bec9c7ea258fb0ae0e9
+6326316802802f69b378f2e8d4143f4e31661f8d
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-5fc58a69d67cfd5f621cdf71146508cd165cd069
+8661e2f4ee10982f2e6156d41460ab94127e54a6
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-72da64886b1e1b7be52cfce60e1d5d76c9302efe
+8042cadf0fb06dce7232e20226536fe1ed05905b
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-51c742b93e604e3680f39bb5f52a43e3dde60565
+1216afb95b0eecf5f9ae83b3e13de752b258fc0b
--- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-e37511b1871a2ff62b8a917600e19c71a9ba0457
+453ee7ac8fb766c5acfb7c4fcf142887f2e933c6
--- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0
+4542cfb9c7aa4c1597bbe8196095cc82987acb37
--- a/Show More
+++ b/Show More
		`@@ -1 +1 @@`
			`cbbc8cbbdd0d8f33f327e39d59e267d63ec43436`				`de3e24c05b4a999f066e347afb03569254b27184`
		`@@ -1 +1 @@`
			`18c90a85a208f0899ccd35e437481a76934ca350`				`00398559330cf6eba61d24e026aceb55046393df`
		`@@ -1 +1 @@`
			`b18e8f8fc808314f0bd5d9db4efbe8b9ac4d21a0`				`4542cfb9c7aa4c1597bbe8196095cc82987acb37`
		`@@ -1 +1 @@`
			`f6f8d0b05ebac65dbd253511d88708db62560880`				`da0009f4f4683e6a844a961675727bc1d588d8e7`
		`@@ -1 +1 @@`
			`334a143b5e7ccd8e120b3ceeb20460aba527bd92`				`60c4297f86b8bbaf88f05ce0f5f9187a1a0fb110`
		`@@ -1 +1 @@`
			`c46287bc4da9298130e80bec9c7ea258fb0ae0e9`				`6326316802802f69b378f2e8d4143f4e31661f8d`
		`@@ -1 +1 @@`
			`5fc58a69d67cfd5f621cdf71146508cd165cd069`				`8661e2f4ee10982f2e6156d41460ab94127e54a6`
		`@@ -1 +1 @@`
			`72da64886b1e1b7be52cfce60e1d5d76c9302efe`				`8042cadf0fb06dce7232e20226536fe1ed05905b`
		`@@ -1 +1 @@`
			`51c742b93e604e3680f39bb5f52a43e3dde60565`				`1216afb95b0eecf5f9ae83b3e13de752b258fc0b`
		`@@ -1 +1 @@`
			`e37511b1871a2ff62b8a917600e19c71a9ba0457`				`453ee7ac8fb766c5acfb7c4fcf142887f2e933c6`