From e9207cf623dfef2c301990dd32c554d2cb5e09e7 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 26 Jul 2019 08:33:24 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.316 Former-commit-id: 08a23473ec9c2cd4b2662fe9c269eb7c7319b266 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/bb | 4 ++-- external/bockbuild/bockbuild.py | 4 ++-- external/bockbuild/bockbuild/darwinprofile.py | 4 ++-- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 49 files changed, 46 insertions(+), 46 deletions(-) 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 5652719d1b50d6e5439d1e2d405ac679f3ba5c55..c54150bd3824e72d6ee3a5da8d26d3796a735771 100644 GIT binary patch delta 57 zcmV-90LK4-hz5X&29SsYUgDR5i?xdZEesIT>!{B79h60>y-j;eR!>5=$P59r1_L$# PDwm*r0V=nt69HFn#sL=V delta 57 zcmZqZU~A}Lo6y1B)*aH=y|tTBmq#Ep{X*w&yBP0omjAi?8U!{B79h60>y-j;eR!>5=$P59r1_L$# PDwm*r0V=nt69HFn#sL=V delta 57 zcmZqZU~A}Lo6y1B)*aH=y|tTBmq#Ep{X*w&yBP0omjAi?8U!{B79h60>y-j;eR!>5=$P59r1_L$# PDwm*r0V=nt69HFn#sL=V delta 57 zcmZqZU~A}Lo6y1B)*aH=y|tTBmq#Ep{X*w&yBP0omjAi?8U!{B79h60>y-j;eR!>5=$P59r1_L$# PDwm*r0V=nt69HFn#sL=V delta 57 zcmZqZU~A}Lo6y1B)*aH=y|tTBmq#Ep{X*w&yBP0omjAi?8U_%n^1{PKZoB7lWwE$r52L}KE delta 22 dcmeyri1Gg-#trQ1?1n}P1{PL^oB7lWwE$qe2Lk{A 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 64c8a018d038840a8b42eb1525ced7d2f2e37e45..53d65352259009b506079e78f3a9f67436a2b1a0 100644 GIT binary patch delta 22 ecmaF1gXP%{mJP8}*^SH;3@oe+Hm6KwY6k#qXTxY6k#qvj}+r 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