Imported Upstream version 5.10.0.140
Former-commit-id: bf0b1a031620c61ba2850f2b795e389ea58917e5
This commit is contained in:
parent
5b69a2693e
commit
ea8182f0a0
@ -1 +1 @@
|
|||||||
bda83dbed0a353d5c9aae1163f4b999e709735eb
|
02149cf6d31151e5284ab8174fcc7a2470547169
|
@ -1 +1 @@
|
|||||||
eba046d8b65fc42f0134cee4678b67368a542fac
|
be6c52a8eae88a84f4c2b9bf6f902b9d06c3ebfd
|
@ -217,6 +217,7 @@ namespace Microsoft.Build.Utilities
|
|||||||
public virtual string ToolExe { get { throw null; } set { } }
|
public virtual string ToolExe { get { throw null; } set { } }
|
||||||
protected abstract string ToolName { get; }
|
protected abstract string ToolName { get; }
|
||||||
public string ToolPath { get { throw null; } set { } }
|
public string ToolPath { get { throw null; } set { } }
|
||||||
|
public bool YieldDuringToolExecution { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
|
||||||
[System.MonoTODOAttribute]
|
[System.MonoTODOAttribute]
|
||||||
protected virtual bool CallHostObjectToExecute() { throw null; }
|
protected virtual bool CallHostObjectToExecute() { throw null; }
|
||||||
public virtual void Cancel() { }
|
public virtual void Cancel() { }
|
||||||
|
2
external/bockbuild/bockbuild/package.py
vendored
2
external/bockbuild/bockbuild/package.py
vendored
@ -286,7 +286,7 @@ class Package:
|
|||||||
curl_bin = which('curl')
|
curl_bin = which('curl')
|
||||||
if not curl_bin:
|
if not curl_bin:
|
||||||
error('curl not found in PATH')
|
error('curl not found in PATH')
|
||||||
run (curl_bin,['-L','-o', cache_dest, archive], None)
|
run (curl_bin,['--location','--fail','--output', cache_dest, archive], None)
|
||||||
|
|
||||||
def update_cache():
|
def update_cache():
|
||||||
pass
|
pass
|
||||||
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.10.0.137";
|
public const string MonoVersion = "5.10.0.140";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -59,6 +59,13 @@ namespace Microsoft.Build.Utilities
|
|||||||
bool typeLoadException;
|
bool typeLoadException;
|
||||||
ManualResetEvent canceled;
|
ManualResetEvent canceled;
|
||||||
|
|
||||||
|
/* dummy getter/setter for msbuild compability */
|
||||||
|
public bool YieldDuringToolExecution
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
protected ToolTask ()
|
protected ToolTask ()
|
||||||
: this (null, null)
|
: this (null, null)
|
||||||
{
|
{
|
||||||
|
@ -1 +1 @@
|
|||||||
044ae0ba30360ac8046e2a0e515420f95b288f46
|
7052e82aabeb75cea4f67af9f3675165eb2bccfd
|
@ -1 +1 @@
|
|||||||
cc673b22139b4cc71266e2ee597fe4e505845566
|
af237a121e503f39f801a5eef4b91454b0419e31
|
@ -1 +1 @@
|
|||||||
7751944281f48f2205099723e6efbfb26620a396
|
3241183dca138fbc6e9704e23d844c8bd57ee17a
|
@ -1 +1 @@
|
|||||||
de07b190ab40f5a096608c4d885bbd098152cd0b
|
25cbc886919ffb221a09a83a3989f7f576294a8a
|
@ -1 +1 @@
|
|||||||
edd8ee3d35b335e383a211e9b690fb94721f2abb
|
7b4afcfc50b64ca0c5c1ad45941be44c88b1fd94
|
@ -1 +1 @@
|
|||||||
f4927f8651f063086e19752ea214536075e84c1d
|
55949eca1569fc16331b9294d929bfc5a3004792
|
@ -1 +1 @@
|
|||||||
62aa938719e0ef286376395e6c8f851ecfd89337
|
4ee4613cab798b32cf23e0b68e642bbb82cdb29f
|
@ -1 +1 @@
|
|||||||
044ae0ba30360ac8046e2a0e515420f95b288f46
|
7052e82aabeb75cea4f67af9f3675165eb2bccfd
|
@ -1 +1 @@
|
|||||||
cc673b22139b4cc71266e2ee597fe4e505845566
|
af237a121e503f39f801a5eef4b91454b0419e31
|
@ -1 +1 @@
|
|||||||
7751944281f48f2205099723e6efbfb26620a396
|
3241183dca138fbc6e9704e23d844c8bd57ee17a
|
@ -1 +1 @@
|
|||||||
de07b190ab40f5a096608c4d885bbd098152cd0b
|
25cbc886919ffb221a09a83a3989f7f576294a8a
|
@ -1 +1 @@
|
|||||||
edd8ee3d35b335e383a211e9b690fb94721f2abb
|
7b4afcfc50b64ca0c5c1ad45941be44c88b1fd94
|
@ -1 +1 @@
|
|||||||
f4927f8651f063086e19752ea214536075e84c1d
|
55949eca1569fc16331b9294d929bfc5a3004792
|
@ -1 +1 @@
|
|||||||
62aa938719e0ef286376395e6c8f851ecfd89337
|
4ee4613cab798b32cf23e0b68e642bbb82cdb29f
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user