diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
index 7d5e1c1f16..8e9cee4b11 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
@@ -22,7 +22,7 @@
+ resource = "FS-Mode.xshd" />
diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
index ffc8d8dfe5..5c83959723 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
@@ -1,69 +1,41 @@
-
+
+
- {99BAE3A2-C40D-40D2-A7B4-EBB4798F36E4}
Debug
AnyCPU
+ 8.0.30703
+ 2.0
+ {a7e6c2fe-6933-44a2-a420-aa6a38d421e9}
Library
- FSharpBindings
+ FSharpBinding
FSharpBinding
- True
- True
- True
+ v3.5
+ 512
+ FShapBinding
-
- ..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding\
- True
- Full
- False
+
+ true
+ full
+ false
+ ..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding
+ DEBUG;TRACE
+ prompt
+ 3
-
- ..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding\
- False
- None
- True
+
+ pdbonly
+ true
+ ..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding
+ TRACE
+ prompt
+ 3
-
-
- ..\..\RequiredLibraries\FSharp.Build.Tasks.dll
-
-
- ..\..\..\..\..\Libraries\log4net\log4net.dll
- False
-
-
- 3.5
- False
-
-
- 3.5
- False
-
-
- ..\..\..\..\..\Libraries\Mono.Cecil\Mono.Cecil.dll
- False
-
-
- False
-
-
- 3.5
- False
-
-
- False
-
-
-
-
- SharpDevelop.Build.Fsc.targets
- Always
-
Always
@@ -75,50 +47,72 @@
-
- {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}
- WinFormsUI
- False
-
+
+ Microsoft.Build.Engine
+ Microsoft.Build.Engine.dll
+
+
+
+ System.Configuration
+ System.configuration.dll
+
+
+ 3.5
+
+
+ System.Drawing
+ System.Drawing.dll
+
+
+ System.Windows.Forms
+ System.Windows.Forms.dll
+
+
+ System.Xml
+ System.XML.dll
+
- {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}
ICSharpCode.TextEditor
- False
+ {2d18be89-d210-49eb-a9dd-2246fbb3df6d}
+ True
- {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}
NRefactory
- False
+ {3a9ae6aa-bc07-4a2f-972c-581e3ae2f195}
+ True
- {2748AD25-9C63-4E12-877B-4DCE96FBED54}
ICSharpCode.SharpDevelop
- False
+ {2748ad25-9c63-4e12-877b-4dce96fbed54}
+ True
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
ICSharpCode.Core
- False
-
-
- {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}
- ICSharpCode.Core.WinForms
- False
+ {35cef10f-2d4c-45f2-9dd1-161e0fec583c}
+ True
- {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}
ICSharpCode.SharpDevelop.BuildWorker
- False
+ {c3cbc8e3-81d8-4c5b-9941-dccd12d50b1f}
+ True
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}
ICSharpCode.SharpDevelop.Dom
- False
+ {924ee450-603d-49c1-a8e5-4afaa31ce6f3}
+ True
- {8035765F-D51F-4A0C-A746-2FD100E19419}
ICSharpCode.SharpDevelop.Widgets
- False
+ {8035765f-d51f-4a0c-a746-2fd100e19419}
+ True
+
+
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
index 3cdf71d353..628514f621 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
@@ -31,7 +31,7 @@ open ICSharpCode.SharpDevelop.Gui
open ICSharpCode.SharpDevelop.Gui.OptionPanels
type FSharpProject = class
- inherit CompilableProject as base
+ inherit CompilableProject
new (engineProvider : IMSBuildEngineProvider, fileName : string, projectName : string ) as x =
{ inherit CompilableProject(engineProvider) } then
base.Name <- projectName
@@ -41,9 +41,9 @@ type FSharpProject = class
x.Create(info)
base.AddImport(@"$(FSharpBuildTasksPath)\SharpDevelop.Build.Fsc.Targets", null)
override x.GetDefaultItemType(fileName : string) =
- if string.Equals(".fs", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
+ if String.Equals(".fs", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
ItemType.Compile
- else if string.Equals(".fsi", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
+ else if String.Equals(".fsi", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
ItemType.Compile
else
base.GetDefaultItemType(fileName)
@@ -61,7 +61,7 @@ type FSharpProjectNode = class
{ inherit ProjectNode(project) }
member x.AddParentFolder((virtualName : string), (relativeDirectoryPath : string), (directoryNodeList :Dictionary)) =
if (relativeDirectoryPath.Length = 0
- || string.Compare(virtualName, 0, relativeDirectoryPath, 0, relativeDirectoryPath.Length, StringComparison.InvariantCultureIgnoreCase) = 0) then
+ || String.Compare(virtualName, 0, relativeDirectoryPath, 0, relativeDirectoryPath.Length, StringComparison.InvariantCultureIgnoreCase) = 0) then
let pos = virtualName.IndexOf('/', relativeDirectoryPath.Length + 1)
if (pos > 0) then
let subFolderName = virtualName.Substring(relativeDirectoryPath.Length, pos - relativeDirectoryPath.Length);
@@ -83,7 +83,7 @@ type FSharpProjectNode = class
if (x.RelativePath.Length > 0) then
(x.RelativePath.Replace('\\', '/')) + "/"
else
- string.Empty
+ String.Empty
for item in x.Project.Items do
match item with
@@ -95,7 +95,7 @@ type FSharpProjectNode = class
else
virtualName
let fileName = Path.GetFileName(virtualName)
- if (not (string.Equals(virtualName, relativeDirectoryPath + fileName, StringComparison.InvariantCultureIgnoreCase))) then
+ if (not (String.Equals(virtualName, relativeDirectoryPath + fileName, StringComparison.InvariantCultureIgnoreCase))) then
x.AddParentFolder(virtualName, relativeDirectoryPath, directoryNodeList);
//continue;
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 832960f1ca..5b15b0f80d 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1310,18 +1310,12 @@
-
-
-
-
-
-
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index b62563c360..2f14c8b7fc 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -429,8 +429,6 @@
-
-