Merge branch 'upstream'

Former-commit-id: 10a90921e5dd8ebfdf2de2bce65fe3d8a63685e6
2018-06-17 08:24:14 +00:00 · 2018-06-17 08:24:14 +00:00 · 22bb5e7acb
commit 22bb5e7acb
parent e76308f571 be71a71334
41 changed files with 37 additions and 65 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-d4eb8520ea86245b6c9dfeb83ac67a150e203d68
+dc3d238eb5b32f3b9d95af57d0add50dae0ea152
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-627ee29fcdc157195f80e189e7a08055bb955d15
+82861fc1f4a9dedd06e51008d67c6b3b7b3ba1dd
--- a/external/bockbuild/bockbuild/environment.py
+++ b/external/bockbuild/bockbuild/environment.py
@ -12,7 +12,7 @@ class EnvironmentItem:
        self.values = values

    def __str__(self):
-        return self.joinchar.join(self.values)
+        return os.path.expandvars(self.joinchar.join(self.values))


 class Environment:
--- 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.14.0.125";
+	public const string MonoVersion = "5.14.0.134";
 	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/System.ServiceProcess/System.ServiceProcess_test.dll.sources
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess_test.dll.sources
@ -1,5 +1,4 @@
 ../../test-helpers/NunitHelpers.cs
 System.ServiceProcess/ServiceBaseTest.cs
-System.ServiceProcess/ServiceControllerTest.cs
 System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
 System.ServiceProcess/ServiceControllerPermissionTest.cs
--- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerTest.cs.REMOVED.git-id
+++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerTest.cs.REMOVED.git-id
@ -1 +0,0 @@
-786fbd93e02b369570d1c9a004f41e495e59062b
--- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-893f2ad93ea2470cc59e4960b51fe683c870f49b
+638ba91f5fe73ff64471b71454b5168427471d68
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-f35ac4fce686918e2e987e8acbcdc46d6a97764a
+ade73dcbf855d754472d484a4ffd634eba1bbced
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-0e330bafa63f8bd145c7143962d19fd926e7fde0
+0810625454c66e829c0287a87039095562557bf5
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-03cb6ca187d31ea32322a164856c6a02753270c2
+18f7c9a48f6ace23980e9438f0c214c2e26cff8c
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-898a55885e4afcd1a4e9fccdc675db59b5f3127a
+f58f2f6586fa5c670a5bdb6ceb1808300e9df869
--- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-0ee1bb501f0a53864ed03f061a829816b728d2a0
+3d3486576cfdc1a7d9ac757b762b06d61a075109
--- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-d0608d70a50226633cb2626c45365c7ec8d987f1
+c110a47d73cb9303e73d4edc4d8ddee657846219
--- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-893f2ad93ea2470cc59e4960b51fe683c870f49b
+638ba91f5fe73ff64471b71454b5168427471d68
--- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-f35ac4fce686918e2e987e8acbcdc46d6a97764a
+ade73dcbf855d754472d484a4ffd634eba1bbced
--- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-0e330bafa63f8bd145c7143962d19fd926e7fde0
+0810625454c66e829c0287a87039095562557bf5
--- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-03cb6ca187d31ea32322a164856c6a02753270c2
+18f7c9a48f6ace23980e9438f0c214c2e26cff8c
--- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-898a55885e4afcd1a4e9fccdc675db59b5f3127a
+f58f2f6586fa5c670a5bdb6ceb1808300e9df869
--- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-0ee1bb501f0a53864ed03f061a829816b728d2a0
+3d3486576cfdc1a7d9ac757b762b06d61a075109
--- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-d0608d70a50226633cb2626c45365c7ec8d987f1
+c110a47d73cb9303e73d4edc4d8ddee657846219
--- a/Show More
+++ b/Show More