Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -92,10 +92,12 @@ namespace Microsoft.Build.BuildEngine
object[] args;
if (Arguments == null) {
flags |= BindingFlags.GetProperty;
if ((flags & BindingFlags.CreateInstance) == 0)
flags |= BindingFlags.GetProperty;
args = null;
} else {
flags |= BindingFlags.InvokeMethod;
if ((flags & BindingFlags.CreateInstance) == 0)
flags |= BindingFlags.InvokeMethod;
ExpandArguments (project, options);
args = PrepareMethodArguments (member_name, flags);
if (args == null)
@ -105,7 +107,7 @@ namespace Microsoft.Build.BuildEngine
object value;
try {
value = type.InvokeMember (member_name, flags, null, target, args, CultureInfo.InvariantCulture);
} catch (MissingFieldException) {
} catch (MissingMethodException) {
//
// It can be field/constant instead of a property
//