From adff7b48bfd8a3974fc0961c677ec8a123b29b21 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Thu, 22 Jan 2009 22:13:40 +0000
Subject: [PATCH] Project options now working for F# projects.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3776 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../FSharp/FSharpBinding/Project/FSharpBinding.addin            | 2 ++
 .../BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
index 8e9cee4b11..3f87ffbcdf 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
@@ -5,12 +5,14 @@
 	
 	<Manifest>
 		<Identity name = "ICSharpCode.FSharpBinding"/>
+		<Dependency addin = "ICSharpCode.CSharpBinding" requirePreload = "true"/>
 	</Manifest>
 	
 	<Runtime>
 		<Import assembly = "FSharpBinding.dll"/>
 		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 		<Import assembly = ":ICSharpCode.SharpDevelop.Dom"/>
+		<Import assembly = "$ICSharpCode.CSharpBinding/CSharpBinding.dll"/>
 	</Runtime>
  	
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
index ba2af047f3..144ac511d3 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
@@ -221,7 +221,7 @@ type FsOptions() =
     override x.LoadPanelContents() =
         let this = (typeof<FsOptions>)
         let caller = this.Assembly
-        x.SetupFromXmlStream(caller.GetManifestResourceStream("FSharpBindings.Resources.FsOptions.xfrm"))
+        x.SetupFromXmlStream(caller.GetManifestResourceStream("FsOptions.xfrm"))
         x.InitializeHelper()
         x.helper.BindBoolean(x.Get<CheckBox>("standalone"), "Standalone", false) |> ignore
         x.helper.BindBoolean(x.Get<CheckBox>("nomllib"), "NoMLLib", false) |> ignore