diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 83dbae418c..bf3b79eea0 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e01cc2bb9e61cf2533ccbd873e22f71e768156f9 \ No newline at end of file +5cddb32e13af11623b2e96384461a2595fae2237 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 0148053cfd..f5c719e40b 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -08b1b5c5cb881e8662aada9959378c6c4b2b4ecf \ No newline at end of file +c29bc5931daf65abd230d8b4ff4469ff74250676 \ No newline at end of file diff --git a/external/bockbuild/bb b/external/bockbuild/bb index a3b0cfec33..691060b9c3 100755 --- a/external/bockbuild/bb +++ b/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 diff --git a/external/bockbuild/bockbuild.py b/external/bockbuild/bockbuild.py index a3b0cfec33..691060b9c3 100755 --- a/external/bockbuild/bockbuild.py +++ b/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 diff --git a/external/bockbuild/bockbuild/darwinprofile.py b/external/bockbuild/bockbuild/darwinprofile.py index 716b2272b2..6f156802c3 100644 --- a/external/bockbuild/bockbuild/darwinprofile.py +++ b/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) diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 299de3da8f..09946146d7 100644 --- 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.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"; diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 896c5cdd64..d549967dc1 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -9d771de1e37e20223e1515ceef3c51a607dd9676 \ No newline at end of file +c2958acd9b794fb9864a0467a32a12abd1e4e443 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 68188cb3d3..d679da431e 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -24c5db848db083a50471562a8dccdfe73d378e89 \ No newline at end of file +5096249101c7fbf0781b6c1e53d23c7f8f5152f6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 5b3c8bfcab..fb79156aba 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -136b6eadba8d83e14a6350119be4f54efba244a0 \ No newline at end of file +714c883658daf608a92d5fdf5837f71e351ddc25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 5652719d1b..c54150bd38 100644 Binary files a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 20334a895c..a420086f25 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d5646d0db41586dd9927ee301c3aeb260b7e4502 \ No newline at end of file +41000e60d4f033eab3cff5382413fc5537c29bb2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3c5bdfa311..900d266358 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -78685d6eac6a519b046f0f678549cd9176063501 \ No newline at end of file +95a60d8f09db096c54333130fe0c4a3b452e3fe3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 8894bf54f8..382dd8de18 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -cc9d470d93be56d6cf6f0f58a28a4b305435f279 \ No newline at end of file +704a687baf43f44b0d589607ac669498e8247dba \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 00b6b3b195..3c4b2d137e 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3 \ No newline at end of file +265131681fd06dbf97777cd54967d7bdb59cb6f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 896c5cdd64..d549967dc1 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -9d771de1e37e20223e1515ceef3c51a607dd9676 \ No newline at end of file +c2958acd9b794fb9864a0467a32a12abd1e4e443 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 68188cb3d3..d679da431e 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -24c5db848db083a50471562a8dccdfe73d378e89 \ No newline at end of file +5096249101c7fbf0781b6c1e53d23c7f8f5152f6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 5b3c8bfcab..fb79156aba 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -136b6eadba8d83e14a6350119be4f54efba244a0 \ No newline at end of file +714c883658daf608a92d5fdf5837f71e351ddc25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 5652719d1b..c54150bd38 100644 Binary files a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll and b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 20334a895c..a420086f25 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d5646d0db41586dd9927ee301c3aeb260b7e4502 \ No newline at end of file +41000e60d4f033eab3cff5382413fc5537c29bb2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3c5bdfa311..900d266358 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -78685d6eac6a519b046f0f678549cd9176063501 \ No newline at end of file +95a60d8f09db096c54333130fe0c4a3b452e3fe3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 8894bf54f8..382dd8de18 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -cc9d470d93be56d6cf6f0f58a28a4b305435f279 \ No newline at end of file +704a687baf43f44b0d589607ac669498e8247dba \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 00b6b3b195..3c4b2d137e 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3 \ No newline at end of file +265131681fd06dbf97777cd54967d7bdb59cb6f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 896c5cdd64..d549967dc1 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -9d771de1e37e20223e1515ceef3c51a607dd9676 \ No newline at end of file +c2958acd9b794fb9864a0467a32a12abd1e4e443 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 68188cb3d3..d679da431e 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -24c5db848db083a50471562a8dccdfe73d378e89 \ No newline at end of file +5096249101c7fbf0781b6c1e53d23c7f8f5152f6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 5b3c8bfcab..fb79156aba 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -136b6eadba8d83e14a6350119be4f54efba244a0 \ No newline at end of file +714c883658daf608a92d5fdf5837f71e351ddc25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 5652719d1b..c54150bd38 100644 Binary files a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll and b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 20334a895c..a420086f25 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d5646d0db41586dd9927ee301c3aeb260b7e4502 \ No newline at end of file +41000e60d4f033eab3cff5382413fc5537c29bb2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3c5bdfa311..900d266358 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -78685d6eac6a519b046f0f678549cd9176063501 \ No newline at end of file +95a60d8f09db096c54333130fe0c4a3b452e3fe3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 8894bf54f8..382dd8de18 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -cc9d470d93be56d6cf6f0f58a28a4b305435f279 \ No newline at end of file +704a687baf43f44b0d589607ac669498e8247dba \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 00b6b3b195..3c4b2d137e 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3 \ No newline at end of file +265131681fd06dbf97777cd54967d7bdb59cb6f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 896c5cdd64..d549967dc1 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -9d771de1e37e20223e1515ceef3c51a607dd9676 \ No newline at end of file +c2958acd9b794fb9864a0467a32a12abd1e4e443 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 68188cb3d3..d679da431e 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -24c5db848db083a50471562a8dccdfe73d378e89 \ No newline at end of file +5096249101c7fbf0781b6c1e53d23c7f8f5152f6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 96b1ea48a0..bcb0cd66e6 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -05d89078335562b19acb24b89da84d08e15e6255 \ No newline at end of file +e118d53d7414286fbe9ac45352cdb72d905b86ad \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 5652719d1b..c54150bd38 100644 Binary files a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 20334a895c..a420086f25 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d5646d0db41586dd9927ee301c3aeb260b7e4502 \ No newline at end of file +41000e60d4f033eab3cff5382413fc5537c29bb2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index 3c5bdfa311..900d266358 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -78685d6eac6a519b046f0f678549cd9176063501 \ No newline at end of file +95a60d8f09db096c54333130fe0c4a3b452e3fe3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index 8894bf54f8..382dd8de18 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -cc9d470d93be56d6cf6f0f58a28a4b305435f279 \ No newline at end of file +704a687baf43f44b0d589607ac669498e8247dba \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index 7b855058a1..06311624df 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d9a6e09a1accd139fdd621166ed24ec9dae2a315 \ No newline at end of file +f2b746fa0b9fe2ce34ce37e0574e43666282456e \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index e383381be6..dfc8c59f8a 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/9d7bbcf" +#define FULL_VERSION "explicit/5e7b960" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 47ebd13f51..c76614316c 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1443,10 +1443,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@test-local: -@HOST_WIN32_TRUE@test-local: @CROSS_COMPILE_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local: +@CROSS_COMPILE_TRUE@test-local: +@HOST_WIN32_TRUE@test-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 0c58b9c9e1..553910797d 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index bd126b15f6..a0ff611450 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -bad0c7ed7214fd1358a507fa335357ac13f09664 \ No newline at end of file +6428d884003d6f6ebc19c4e7cc3f5052b06f777d \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index e55bfd1a75..7e51091b94 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 41d9266578..69c11c4cc7 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -b4d6d19760e7de51684e5435cc8fdf06cf35d232 \ No newline at end of file +d3cf7ad6244ba16f67c3358e674e901cdf366a40 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 253560e7d8..f6a03d5303 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index a234f698cc..d13bdf0340 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -a6b7453411a7bab3b78eab6660ea0f066fbd68c5 \ No newline at end of file +8a3a2eb5153d7a937491b52e02627411b84a7c08 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 92864c491c..815ed3c325 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.313\n" +"Project-Id-Version: mono 6.0.0.316\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-07-12 08:14+0000\n" +"POT-Creation-Date: 2019-07-26 08:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 64c8a018d0..53d6535225 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index dfa4895419..50aa5aecad 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -cb9a929c98d33d57aa976405ee989d01d4502ffa \ No newline at end of file +37ccdbf3930dfc000b9b985432b1679875b40986 \ No newline at end of file