Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2015-03-11 15:32:45 +0300
committerMarek Safar <marek.safar@gmail.com>2015-03-11 15:33:38 +0300
commitdb7f9b7be741f7bf19041232409d560e67e70a30 (patch)
treeb85879207e56d9f293c0363a6e5284753cba36bc /mcs/class/Microsoft.Build.Engine
parent7c260b6c8798303aa474b3b9b6306c9f2084f4b4 (diff)
[Microsoft.Build.Engine] Fix invocation flags not to contain both CreateInstance and Invoke
Diffstat (limited to 'mcs/class/Microsoft.Build.Engine')
-rw-r--r--mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
index e97c4c75b31..c2383e50253 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/MemberInvocationReference.cs
@@ -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)