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

28 files changed, 70 insertions, 22 deletions

diff --git a/.gitmodules b/.gitmodules
index 40776800ba..92938050c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,6 +35,10 @@
 [submodule "main/external/guiunit"]
 	path = main/external/guiunit
 	url = git://github.com/mono/guiunit.git
+[submodule "main/external/fsharpbinding"]
+	path = main/external/fsharpbinding
+	url = git://github.com/fsharp/fsharpbinding.git
+	branch = vnext
 [submodule "main/external/raygun4net"]
 	path = main/external/raygun4net
 	url = git://github.com/mono/raygun4net.git
diff --git a/configure b/configure
index ddb13ecf35..e48c16c989 100755
--- a/configure
+++ b/configure
@@ -154,6 +154,15 @@ configure_packages ()
 		else
 			enable_tests=" "
 		fi
+
+		builddir=`pwd`/$path/build
+		for p in $ops ; do
+			arg=`echo $p | cut -d '=' -f 1`
+			if [ $arg == "--addins-dir" ] ; then
+				builddir=`pwd`/$path/`echo $p | cut -d '=' -f 2`
+			fi
+		done
+
 		title="Configuring package: $path"
 		nc=`echo $title | wc -m`
 		echo $title
@@ -164,6 +173,8 @@ configure_packages ()
 			sct="./autogen.sh $enable_tests"
 		elif test -a $path/configure; then
 			sct=./configure
+		elif test -a $path/configure.sh; then
+			sct=./configure.sh
 		else
 			echo Configuration script not found in directory: $p
 			exit 1
@@ -171,7 +182,7 @@ configure_packages ()
 		pushd $path > /dev/null
 		PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct --prefix=$prefix $ops || handle_config_error
 		popd > /dev/null
-		create_local_config $path
+		create_local_config $path $builddir
 		packages="$packages $path"
 	done
 	rm -f local-config/main.addins
@@ -189,14 +200,14 @@ create_local_config ()
 
 	# Copy the .pc file to local-config, and set the base lib directory
 	mkdir -p local-config
-	builddir=`pwd`/$path/build
+	builddir=$2
 	for f in `ls $1/*.pc.in 2>/dev/null`; do
 		pcfile=`echo $f | sed s,.*/,, | sed s/\.in$//`
 		sed -e s,libdir=.*,libdir=$builddir, -e s/@VERSION@/$ver/g $f> local-config/$pcfile
 	done
 	
 	# Generate the .addins file for the package
-	addins=local-config/`echo $path | sed s,/,_,`.addins
+	addins=local-config/`echo $path | sed s,/,_,g`.addins
 	echo "<Addins>" > $addins
 	echo "  <Directory include-subdirs=\"true\">$builddir</Directory>" >> $addins
 	echo "</Addins>" >> $addins
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am
index af39321da2..3f5c4805cd 100644
--- a/main/build/MacOSX/Makefile.am
+++ b/main/build/MacOSX/Makefile.am
@@ -51,6 +51,7 @@ app: monostub
 	@echo "Copying MonoDevelop into app bundle"
 	@echo ""
 	cp -pR ../AddIns $(MAC_APP_LIB_DIR)
+	cp -pR ../../external/fsharpbinding/monodevelop/bin/mac-linux/Debug $(MAC_APP_LIB_DIR)/AddIns/fsharpbinding
 	cp -pR ../data $(MAC_APP_LIB_DIR)
 	cp -pR ../bin $(MAC_APP_LIB_DIR)
 	cp -pR ../locale $(MAC_APP_DIR)/Contents/MacOS/share
diff --git a/main/external/fsharpbinding b/main/external/fsharpbinding
new file mode 160000
+Subproject b19b55a7d7146baa55f57f0a175f1eb3ae13e94
diff --git a/main/external/xwt b/main/external/xwt
-Subproject 75eedee6ab41417820f7f01db95ba3b52f8a0fc
+Subproject 6f9bfacdf76f992c1d998a2b1efe1065dc156e0
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
index 59e6bb0f3e..f1befb17f6 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
@@ -8,7 +8,7 @@
 		<_Name>Empty Web Application</_Name>
 		<_Category>ASP.NET</_Category>
 		<Icon>md-project-web</Icon>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates an empty ASP.NET Web Application project.</_Description>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
index 00668fc09a..665a936f5d 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
@@ -8,7 +8,7 @@
 		<_Name>Web Application</_Name>
 		<_Category>ASP.NET</_Category>
 		<Icon>md-project-web</Icon>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates a new ASP.NET Web Application project.</_Description>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
index 8fc9a58b6e..38cabf99c8 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
@@ -338,7 +338,7 @@ namespace MonoDevelop.Debugger.Win32
 				binfo.IncrementHitCount();

 				if (!binfo.HitCountReached)

 					return;

-				

+

 				if (!string.IsNullOrEmpty (bp.ConditionExpression)) {

 					string res = EvaluateExpression (e.Thread, bp.ConditionExpression);

 					if (bp.BreakIfConditionChanges) {

@@ -404,6 +404,7 @@ namespace MonoDevelop.Debugger.Win32
 			// If the main thread stopped, terminate the debugger session

 			if (e.Process.Id == process.Id) {

 				lock (terminateLock) {

+					process.Dispose ();

 					process = null;

 					ThreadPool.QueueUserWorkItem (delegate

 					{

diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs
index d46b7aca0b..212a1ca0fd 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs
@@ -62,6 +62,9 @@ namespace MonoDevelop.Debugger.Win32
 					catch (Exception ex) {

 						workError = ex;

 					}

+					finally {

+						workDelegate = null;

+					}

 					wordDoneEvent.Set ();

 				}

 				while (Monitor.Wait (threadLock, 60000));

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 7a94a17df9..462fa83152 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -272,7 +272,7 @@ namespace MonoDevelop.Debugger
 		public static DebuggerFeatures GetSupportedFeatures (IBuildTarget target)
 		{
 			var fc = new FeatureCheckerHandlerFactory ();
-			var ctx = new ExecutionContext (fc, null);
+			var ctx = new ExecutionContext (fc, null, IdeApp.Workspace.ActiveExecutionTarget);
 
 			target.CanExecute (ctx, IdeApp.Workspace.ActiveConfiguration);
 
@@ -378,6 +378,7 @@ namespace MonoDevelop.Debugger
 				busyStatusIcon = null;
 				session = null;
 				console = null;
+				pinnedWatches.InvalidateAll ();
 			}
 
 			if (oldLayout != null) {
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
index d230723907..12d1eb8c51 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.Debugger
 	{
 		public static bool CanDebug (this ProjectOperations opers, IBuildTarget entry)
 		{
-			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecute (entry, context);
 		}
 
@@ -56,13 +56,13 @@ namespace MonoDevelop.Debugger
 
 		public static bool CanDebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecuteFile (file, context);
 		}
 
 		public static IAsyncOperation DebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.ExecuteFile (file, context);
 		}
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index 673d76da8c..71bdf76c50 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -239,6 +239,10 @@ namespace MonoDevelop.Debugger
 			crtValue.Edited -= OnValueEdited;
 			crtValue.EditingCanceled -= OnEditingCancelled;
 
+			typeCol.RemoveNotification ("width", OnColumnWidthChanged);
+			valueCol.RemoveNotification ("width", OnColumnWidthChanged);
+			expCol.RemoveNotification ("width", OnColumnWidthChanged);
+
 			disposed = true;
 			cancellationTokenSource.Cancel ();
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
index 60e3a558e8..813a3ee258 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
@@ -66,8 +66,10 @@ namespace MonoDevelop.SourceEditor
 
 		void TargetProcessExited (object sender, EventArgs e)
 		{
-			if (tooltip != null)
-				tooltip.Hide ();
+			if (tooltip != null) {
+				tooltip.Destroy ();
+				tooltip = null;
+			}
 		}
 
 		#region ITooltipProvider implementation
diff --git a/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs b/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
index 8602b52b56..e0b23190c3 100644
--- a/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
+++ b/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
@@ -121,7 +121,7 @@ namespace MonoDevelop.NUnit.External
 			string tname = test.TestName.Name;
 			// Find the last index of the dot character that is not a part of the test parameters
 			int j = tname.IndexOf ('(');
-			int i = tname.LastIndexOf ('.', (j == -1) ? (tname.Length - 1) : j);
+			int i = tname.LastIndexOf ('.', (j == -1) ? 0 : j);
 			if (i != -1)
 				tname = tname.Substring (i + 1);
 			if (test.FixtureType != null) {
diff --git a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
index 60df0cf613..9a83ac6b23 100644
--- a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
+++ b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
@@ -7,7 +7,7 @@
 		<_Category>NUnit</_Category>
 		<Icon>md-project|res:project-nunit-overlay-light-32.png</Icon>
 		<_Description>Creates an NUnit library</_Description>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<DefaultFilename>NUnitProject</DefaultFilename>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml b/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml
index d3a261dc16..aaebb07b4e 100644
--- a/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml
+++ b/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml
@@ -5,7 +5,7 @@
 		<_Name>Test Fixture</_Name>
 		<Icon>md-file-unit-test</Icon>
 		<_Category>NUnit</_Category>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates a Test Fixture.</_Description>
 		<DefaultFilename>NUnitTestClass</DefaultFilename>
 	</TemplateConfiguration>
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
index 4661f6f7cd..e07dd87318 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
@@ -2800,6 +2800,7 @@ namespace Mono.TextEditor
 				}
 				tipWindow.Destroy ();
 				tipWindow = null;
+				tipItem = null;
 			}
 		}
 		
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" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs
index f59a5dcce6..49c15e72d6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs
@@ -55,7 +55,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 					bool matched = false;
 					foreach (IExecutionMode mode in mset.ExecutionModes) {
 						foreach (SolutionConfiguration sc in sol.Configurations) {
-							if (it.CanExecute (new ExecutionContext (mode, null), sc.Selector)) {
+							if (it.CanExecute (new ExecutionContext (mode, null, IdeApp.Workspace.ActiveExecutionTarget), sc.Selector)) {
 								startupItems.Add (it);
 								matched = true;
 								break;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 382744e253..ca0e25b600 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -1026,7 +1026,7 @@ namespace MonoDevelop.Ide
 		
 		public bool CanExecuteFile (string file, IExecutionHandler handler)
 		{
-			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return CanExecuteFile (file, context);
 		}
 		
@@ -1048,7 +1048,7 @@ namespace MonoDevelop.Ide
 		
 		public IAsyncOperation ExecuteFile (string file, IExecutionHandler handler)
 		{
-			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return ExecuteFile (file, context);
 		}
 		
diff --git a/profiles/mac b/profiles/mac
index ff852fb8f4..9e695ba066 100644
--- a/profiles/mac
+++ b/profiles/mac
@@ -1 +1,2 @@
 main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests
+main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug