mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 13d0b6421e196c2c1e9f136ed0580e408ab95baa
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-23 09:29:47 +00:00
commit 2766946df9
42 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
0e5069804c3d90814f4f68a89510b58148390a78
bda83dbed0a353d5c9aae1163f4b999e709735eb

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
e4efeac42335109229714144733b3091f80ae170
eba046d8b65fc42f0134cee4678b67368a542fac

18
external/bockbuild/bockbuild/package.py vendored
View File

@ -12,15 +12,6 @@ from util.util import *
import functools
# FancyURLopener is incorrectly documented; this working handler was
# copied from
# https://mail.python.org/pipermail/python-bugs-list/2006-February/032155.html
class MyUrlOpener(urllib.FancyURLopener):
def http_error_default(*args, **kwargs):
return urllib.URLopener.http_error_default(*args, **kwargs)
class Package:
def __init__(self, name, version=None, organization=None, configure_flags=None, sources=None, revision=None, git_branch=None, source_dir_name=None, override_properties=None, configure=None):
@ -292,11 +283,10 @@ class Package:
def checkout_archive(archive, cache_dest, workspace_dir):
def create_cache():
progress('Downloading: %s' % archive)
try:
filename, message = MyUrlOpener().retrieve(archive, cache_dest)
except IOError as e:
raise CommandException(
'%s error downloading %s' % (e[1], archive))
curl_bin = which('curl')
if not curl_bin:
error('curl not found in PATH')
run (curl_bin,['-L','-o', cache_dest, archive], None)
def update_cache():
pass

2
external/bockbuild/bockbuild/util/util.py vendored
View File

@ -674,7 +674,7 @@ def run(cmd, args, cwd, env=None):
proc = subprocess.Popen(cmd_list, shell=False, cwd=cwd,
env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except Exception as e:
error(e)
error(str(e))
stdout, stderr = proc.communicate()
exit_code = proc.returncode

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.132";
public const string MonoVersion = "5.10.0.137";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

7
mcs/class/System.XML/ReferenceSources/BinaryCompatibility.cs Normal file
View File

@ -0,0 +1,7 @@
namespace System.Xml
{
static class BinaryCompatibility
{
public static bool TargetsAtLeast_Desktop_V4_5_2 => true;
}
}

2
mcs/class/System.XML/System.Xml.dll.sources
View File

@ -5,6 +5,7 @@ Assembly/AssemblyInfo.cs
ReferenceSources/Res.cs
ReferenceSources/LocalAppContextSwitches.cs
ReferenceSources/ThisAssembly.cs
ReferenceSources/BinaryCompatibility.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs
../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs
@ -237,7 +238,6 @@ ReferenceSources/ThisAssembly.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeView.cs
../referencesource/System.Xml/System/Xml/Cache/XPathNodeViewPropertyDescriptor.cs
../referencesource/System.Xml/System/Xml/Core/BinaryCompatibility.cs
../referencesource/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs
../referencesource/System.Xml/System/Xml/Core/ConformanceLevel.cs
../referencesource/System.Xml/System/Xml/Core/DtdProcessing.cs

2
mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
ce18802ab9fddeab8c3df4d80d4920c0078beb8a
044ae0ba30360ac8046e2a0e515420f95b288f46

2
mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
70bd018a65dbc16d9249e9f89aeb73904e06ae5a
cc673b22139b4cc71266e2ee597fe4e505845566

2
mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d66447f952feb4ec5829e5829e3d25dd8af939e4
7751944281f48f2205099723e6efbfb26620a396

2
mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
bc2df173bcd5877ac4b9a0147065291f7090ede0
de07b190ab40f5a096608c4d885bbd098152cd0b

2
mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a
edd8ee3d35b335e383a211e9b690fb94721f2abb

2
mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
73f330f118271340beadba9943f025f51326505b
f4927f8651f063086e19752ea214536075e84c1d

2
mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
90445e4b34c276c86330ebdab580339e96320d17
62aa938719e0ef286376395e6c8f851ecfd89337

2
mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
ce18802ab9fddeab8c3df4d80d4920c0078beb8a
044ae0ba30360ac8046e2a0e515420f95b288f46

2
mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
70bd018a65dbc16d9249e9f89aeb73904e06ae5a
cc673b22139b4cc71266e2ee597fe4e505845566

2
mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d66447f952feb4ec5829e5829e3d25dd8af939e4
7751944281f48f2205099723e6efbfb26620a396

2
mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
bc2df173bcd5877ac4b9a0147065291f7090ede0
de07b190ab40f5a096608c4d885bbd098152cd0b

2
mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a
edd8ee3d35b335e383a211e9b690fb94721f2abb

2
mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
73f330f118271340beadba9943f025f51326505b
f4927f8651f063086e19752ea214536075e84c1d

Some files were not shown because too many files have changed in this diff Show More