From 723be3871fdbf03e7c2d7022fcf34802a360a0ac Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 2 Jul 2019 08:43:34 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.311 Former-commit-id: 345dd3f106985ed97a93ada1859ac75084d86c14 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/bockbuild/package.py | 16 +++++++++++++--- 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 +- 47 files changed, 53 insertions(+), 43 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 3d60c76a78..9f28cf3cad 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -74b9f93bfedcdd2c965b8b0bf314618e8e19d771 \ No newline at end of file +084195687ddc7dd4048f9b2c604bb03a37c620ed \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 37d24cf76a..8f138dc30d 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -81afb4f21a9c222ab3e329deb7de7f25e370eca6 \ No newline at end of file +2d00c0223998ca8b8589ca54b3d207eb5fcd9df8 \ No newline at end of file diff --git a/external/bockbuild/bockbuild/package.py b/external/bockbuild/bockbuild/package.py index 84a66b1aa2..08a388db5e 100644 --- a/external/bockbuild/bockbuild/package.py +++ b/external/bockbuild/bockbuild/package.py @@ -337,8 +337,18 @@ class Package: return clean_archive - def get_download_dest(url): - return os.path.join(source_cache_dir, os.path.basename(url)) + def get_download_dest(url,version): + if version is not None: + dest_dir = '%s-%s' % (self.name, version) + else: + dest_dir = self.name + try: + os.makedirs (os.path.join(source_cache_dir, dest_dir)) + except OSError, e: + if e.errno != os.errno.EEXIST: + raise + pass + return os.path.join(source_cache_dir, dest_dir, os.path.basename(url)) def get_git_cache_path(): if self.organization is None: @@ -370,7 +380,7 @@ class Package: # raise Exception ('HTTP downloads are no longer allowed: %s', source) if source.startswith(('http://', 'https://', 'ftp://')): - cache = get_download_dest(source) + cache = get_download_dest(source, self.version) if self.profile.cache_host is not None: cached_source = os.path.join( self.profile.cache_host, os.path.basename(source)) diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 09f48c9755..fc71284095 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.310"; + public const string MonoVersion = "6.0.0.311"; 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 0eaaf80e32..dc9beefe2d 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 @@ -436cd54aa59ef12d83c181f3d1b238e80ae1b43a \ No newline at end of file +80e579fd992ef82df5e59d94a2d778fb731082fb \ 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 6ff28b86be..00509ebb6e 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 @@ -2e2f5cc4ad8225d1d3874aadeb050777c745bb6f \ No newline at end of file +fcdae2f4574bf8b726570d38ca6e929941e4bdf9 \ 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 beb23b56bf..420f81f0a9 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 @@ -29329048737e825912df6bbaf196c9078526ba4a \ No newline at end of file +4086e7ec5e22612eeceeec7c20769bd55770118d \ 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 9f85ee12586cfcbc1482946ec181974b4e2ad80d..d2f068134f4a4aaeb2741a4e61fda5d3e526f671 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZNAw1XfsD0`0W1s<76GRE88{kEwkhv^cBqa6x5x|uv<3q) Q04kTDeE}-BsS^QLaCrO_!T~Qp0}Crd\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 7434d2efc585da56ebd70fc22d9e323986ebc4d5..6ab9f9e8b1a184a632c6d32f07bc0139cafc1308 100644 GIT binary patch delta 25 hcmaF1gXP%{mJQKUxy*G9j1&wktPG7er%q*T2LOb%2@n7P delta 25 hcmaF1gXP%{mJQKUxy*EpEEEhZtPD*yr%q*T2LOc*2^atX diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index e20a6ce031..c8f3e590c0 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -dde47bb2dcf8b4c9aec32544c63e465595b44961 \ No newline at end of file +8f1af855a9769e26fcb298b8a8f35556250e4fb1 \ No newline at end of file