diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2016-07-13 16:39:30 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2016-07-13 16:39:30 +0300 |
commit | d04e8a42146c183fae438a196bd7213517ce9de7 (patch) | |
tree | e3a86c18e2817d67075523e8f34fdce9c8605f23 /main/src/addins/MonoDevelop.Autotools | |
parent | 2b0cf79be1c546ec18129188aecde7e3bcd3821d (diff) | |
parent | 7446a7c8606c95180d7f2c89461ee3d3d44ec05d (diff) |
Merge remote-tracking branch 'origin/run-configurations'
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
-rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs index 7c39600a08..72acdcfaeb 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs @@ -367,18 +367,18 @@ namespace MonoDevelop.Autotools return BuildResult.CreateSuccess (); } - protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector configuration) + protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector configuration, SolutionItemRunConfiguration runConfiguration) { if (data != null && data.SupportsIntegration && !String.IsNullOrEmpty (data.ExecuteTargetName)) return true; - return base.OnGetCanExecute (context, configuration); + return base.OnGetCanExecute (context, configuration, runConfiguration); } - protected async override Task OnExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration) + protected async override Task OnExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration, SolutionItemRunConfiguration runConfiguration) { if (data == null || !data.SupportsIntegration || String.IsNullOrEmpty (data.ExecuteTargetName)) { - await base.OnExecute (monitor, context, configuration); + await base.OnExecute (monitor, context, configuration, runConfiguration); return; } |