diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-04-04 20:38:30 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-04-04 20:38:30 +0400 |
| commit | cdab0bdf64ae9447ccf554bfbc1c2dff92f09a65 (patch) | |
| tree | e33eb4b2067ffd192c2ac82ceac4b8d3fc960058 /main/src/core/MonoDevelop.Core | |
| parent | 89fb810c508786734e72c30f9e23688531dbd184 (diff) | |
| parent | af406cd3d0ad3b8b333a67b3bd74f8e67219f33b (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
profiles/mac
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Core')
8 files changed, 14 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs index cabee1e34b..fcaee6f625 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs @@ -1651,6 +1651,11 @@ namespace MonoDevelop.Projects.Formats.MSBuild } } + IEnumerable<MSBuildExtension> GetMSBuildExtensions () + { + return AddinManager.GetExtensionObjects<MSBuildExtension> ("/MonoDevelop/ProjectModel/MSBuildExtensions"); + } + void ReadBuildItemMetadata (DataSerializer ser, MSBuildItem buildItem, object dataItem, Type extendedType) { DataItem ditem = new DataItem (); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs index f3c891fc88..fc0a9bf77b 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs @@ -79,7 +79,7 @@ namespace MonoDevelop.Projects { SolutionItemConfiguration conf = entry.GetConfiguration (configuration) as SolutionItemConfiguration; if (conf != null) { - ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory); + ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget); if (conf.CustomCommands.CanExecute (entry, CustomCommandType.BeforeExecute, localContext, configuration)) conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.BeforeExecute, localContext, configuration); @@ -91,7 +91,7 @@ namespace MonoDevelop.Projects base.Execute (monitor, entry, context, configuration); if (conf != null && !monitor.IsCancelRequested) { - ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory); + ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget); if (conf.CustomCommands.CanExecute (entry, CustomCommandType.AfterExecute, localContext, configuration)) conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.AfterExecute, localContext, configuration); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs index 110c88431c..3c9207fe3e 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs @@ -38,14 +38,14 @@ namespace MonoDevelop.Projects IConsoleFactory consoleFactory; ExecutionTarget executionTarget; - public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target = null) + public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target) { this.executionHandler = executionMode.ExecutionHandler; this.consoleFactory = consoleFactory; this.executionTarget = target; } - public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target = null) + public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target) { this.executionHandler = executionHandler; this.consoleFactory = consoleFactory; diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml index 8cc32a0d8f..a22df8a5f0 100644 --- a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml +++ b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml @@ -74,5 +74,6 @@ <Assembly name="Mono.Tasklets" version="2.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="Mono.Web" version="2.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="RabbitMQ.Client" version="2.0.0.0" publicKeyToken="b03f5f7f11d50a3a" /> + <Assembly name="FSharp.Core" /> </Assemblies> </TargetFramework>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml index 8527b2575c..f4bce761d7 100644 --- a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml +++ b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml @@ -54,5 +54,6 @@ <Assembly name="System.ServiceModel.Web" version="3.5.0.0" publicKeyToken="31bf3856ad364e35" /> <Assembly name="System.Windows.Presentation" version="3.5.0.0" publicKeyToken="b77a5c561934e089" /> <Assembly name="System.Xml.Linq" version="3.5.0.0" publicKeyToken="b77a5c561934e089" /> + <Assembly name="FSharp.Core" /> </Assemblies> </TargetFramework>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml index 9ab95c26e5..e6bf0f3da4 100644 --- a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml +++ b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml @@ -142,6 +142,7 @@ <Assembly name="Mono.Tasklets" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="Mono.Web" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="RabbitMQ.Client" version="4.0.0.0" publicKeyToken="b03f5f7f11d50a3a" /> + <Assembly name="FSharp.Core" /> <!-- the following assemblies were added by Mono, but don't seem to exist any more --> <Assembly name="Mono.WebServer" /> diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml index 32e286e8f8..5362de837a 100644 --- a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml +++ b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml @@ -80,5 +80,6 @@ <Assembly name="System.Device" version="4.0.0.0" publicKeyToken="b77a5c561934e089" /> <Assembly name="System.Speech" version="4.0.0.0" publicKeyToken="31bf3856ad364e35" /> <Assembly name="System.Windows.Input.Manipulations" version="4.0.0.0" publicKeyToken="b77a5c561934e089" /> + <Assembly name="FSharp.Core" /> </Assemblies> </TargetFramework> diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml index 6d059ba518..46e275dad5 100644 --- a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml +++ b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml @@ -158,6 +158,7 @@ <Assembly name="Mono.Tasklets" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="Mono.Web" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" /> <Assembly name="RabbitMQ.Client" version="4.0.0.0" publicKeyToken="b03f5f7f11d50a3a" /> + <Assembly name="FSharp.Core" /> <!-- the following assemblies were added by Mono, but don't seem to exist any more --> <Assembly name="Mono.WebServer" /> |