Merge branch 'upstream'

Former-commit-id: c3f8db450305e7310584dda8daf37b0201337649

configure.REMOVED.git-id

@@ -1 +1 @@
-e01cc2bb9e61cf2533ccbd873e22f71e768156f9
+5cddb32e13af11623b2e96384461a2595fae2237

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-08b1b5c5cb881e8662aada9959378c6c4b2b4ecf
+c29bc5931daf65abd230d8b4ff4469ff74250676

external/bockbuild/bb

@@ -194,8 +194,6 @@ class Bockbuild:
                 self.artifact_root, '%s-%s' % (package.name, arch))
             package.buildstring_file = package.build_artifact + '.buildstring'
             package.log = os.path.join(self.logs, package.name + '.log')
-            if os.path.exists(package.log):
-                delete(package.log)
 
             package.source_dir_name = expand_macros(package.source_dir_name, package)
             workspace_path = os.path.join(self.build_root, package.source_dir_name)
@@ -226,6 +224,8 @@ class Bockbuild:
                 package.deploy_requests.append (stage)
 
         for package in packages.values():
+            if os.path.exists(package.log):
+                delete(package.log)
             package.start_build(arch, dest, stage)
             # make artifact in scratch
             # delete artifact + buildstring

external/bockbuild/bockbuild.py

@@ -194,8 +194,6 @@ class Bockbuild:
                 self.artifact_root, '%s-%s' % (package.name, arch))
             package.buildstring_file = package.build_artifact + '.buildstring'
             package.log = os.path.join(self.logs, package.name + '.log')
-            if os.path.exists(package.log):
-                delete(package.log)
 
             package.source_dir_name = expand_macros(package.source_dir_name, package)
             workspace_path = os.path.join(self.build_root, package.source_dir_name)
@@ -226,6 +224,8 @@ class Bockbuild:
                 package.deploy_requests.append (stage)
 
         for package in packages.values():
+            if os.path.exists(package.log):
+                delete(package.log)
             package.start_build(arch, dest, stage)
             # make artifact in scratch
             # delete artifact + buildstring

external/bockbuild/bockbuild/darwinprofile.py

@@ -139,12 +139,12 @@ class DarwinProfile (UnixProfile):
             package.local_ld_flags = ['-arch i386', '-m32']
             package.local_gcc_flags = ['-arch i386', '-m32']
             package.local_configure_flags = [
-                '--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
+                '--build=i386-apple-darwin13.0.0', '--host=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
         elif arch == 'darwin-64':
             package.local_ld_flags = ['-arch x86_64 -m64']
             package.local_gcc_flags = ['-arch x86_64 -m64']
             package.local_configure_flags = [
-                '--build=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
+                '--build=x86_64-apple-darwin13.0.0', '--host=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
         else:
             error('Unknown arch %s' % arch)
 

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.0.0.313";
+	public const string MonoVersion = "6.0.0.316";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9d771de1e37e20223e1515ceef3c51a607dd9676
+c2958acd9b794fb9864a0467a32a12abd1e4e443

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-24c5db848db083a50471562a8dccdfe73d378e89
+5096249101c7fbf0781b6c1e53d23c7f8f5152f6

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-136b6eadba8d83e14a6350119be4f54efba244a0
+714c883658daf608a92d5fdf5837f71e351ddc25

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-d5646d0db41586dd9927ee301c3aeb260b7e4502
+41000e60d4f033eab3cff5382413fc5537c29bb2

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-78685d6eac6a519b046f0f678549cd9176063501
+95a60d8f09db096c54333130fe0c4a3b452e3fe3

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-cc9d470d93be56d6cf6f0f58a28a4b305435f279
+704a687baf43f44b0d589607ac669498e8247dba

mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3
+265131681fd06dbf97777cd54967d7bdb59cb6f1

mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9d771de1e37e20223e1515ceef3c51a607dd9676
+c2958acd9b794fb9864a0467a32a12abd1e4e443

mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-24c5db848db083a50471562a8dccdfe73d378e89
+5096249101c7fbf0781b6c1e53d23c7f8f5152f6

mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-136b6eadba8d83e14a6350119be4f54efba244a0
+714c883658daf608a92d5fdf5837f71e351ddc25

mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-d5646d0db41586dd9927ee301c3aeb260b7e4502
+41000e60d4f033eab3cff5382413fc5537c29bb2

mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-78685d6eac6a519b046f0f678549cd9176063501
+95a60d8f09db096c54333130fe0c4a3b452e3fe3