From 08f14241df292c20a6f404de5842fcf7dad922e8 Mon Sep 17 00:00:00 2001 From: Robert Pickering Date: Wed, 3 Dec 2008 19:38:27 +0000 Subject: [PATCH] Upgrade F# binding to use version 1.9.6.2 (which comes with a msbuild provider so the custom one is no longer needed). git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3649 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Configuration/AssemblyInfo.cs | 25 -- .../Project/FSharp.Build.Tasks.csproj | 67 ------ .../Project/SharpDevelop.Build.Fsc.targets | 161 ------------- .../Project/Src/CompilerCommandLineBuilder.cs | 41 ---- .../FSharp.Build.Tasks/Project/Src/Fsc.cs | 220 ------------------ .../Project/Src/FscToolLocationHelper.cs | 62 ----- .../Project/Src/IsFscInstalled.cs | 36 --- .../FSharpBinding/Project/FSharpBinding.addin | 2 +- .../Project/FSharpBinding.fsproj | 186 ++++++--------- .../FSharpBinding/Project/Src/project.fs | 12 +- .../RequiredLibraries/FSharp.Build.Tasks.dll | Bin 24576 -> 0 bytes .../SharpDevelop.Build.Fsc.targets | 159 ------------- 12 files changed, 75 insertions(+), 896 deletions(-) delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Configuration/AssemblyInfo.cs delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/FSharp.Build.Tasks.csproj delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/SharpDevelop.Build.Fsc.targets delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/CompilerCommandLineBuilder.cs delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/Fsc.cs delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/FscToolLocationHelper.cs delete mode 100644 src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/IsFscInstalled.cs delete mode 100755 src/AddIns/BackendBindings/FSharp/RequiredLibraries/FSharp.Build.Tasks.dll delete mode 100644 src/AddIns/BackendBindings/FSharp/RequiredLibraries/SharpDevelop.Build.Fsc.targets diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Configuration/AssemblyInfo.cs deleted file mode 100644 index e87c4ea39e..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Configuration/AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System.Reflection; - -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. - -[assembly: System.Runtime.InteropServices.ComVisible(false)] -[assembly: AssemblyTitle("FSharp.Build.Tasks")] -[assembly: AssemblyDescription("Provides F# build tasks for the F# addin.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyCompany("ic#code")] -[assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2000-2008 AlphaSierraPapa")] -[assembly: AssemblyVersion("1.0")] diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/FSharp.Build.Tasks.csproj b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/FSharp.Build.Tasks.csproj deleted file mode 100644 index 0ed68bd56a..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/FSharp.Build.Tasks.csproj +++ /dev/null @@ -1,67 +0,0 @@ - - - {674D485B-8340-498D-B91F-BE51543386C8} - Debug - AnyCPU - Library - FSharp.Build.Tasks - FSharp.Build.Tasks - v3.5 - False - False - 4 - false - - - ..\..\RequiredLibraries - true - Full - False - True - DEBUG;TRACE - - - ..\..\RequiredLibraries - false - None - True - False - TRACE - - - False - Auto - 4194304 - AnyCPU - 4096 - - - - - False - - - False - - - - False - - - False - - - False - - - - - - - - - - Always - - - \ No newline at end of file diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/SharpDevelop.Build.Fsc.targets b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/SharpDevelop.Build.Fsc.targets deleted file mode 100644 index 7e7a73b989..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/SharpDevelop.Build.Fsc.targets +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - $(MSBuildAllProjects);$(FSharpBuildTasksPath)\SharpDevelop.Build.Fsc.targets - .fs - F# - False - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/CompilerCommandLineBuilder.cs b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/CompilerCommandLineBuilder.cs deleted file mode 100644 index d269c84d28..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/CompilerCommandLineBuilder.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Globalization; -using System.IO; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; - -namespace FSharp.Build.Tasks -{ - public class CompilerCommandLineBuilder : CommandLineBuilder - { - public void AppendIntegerSwitch(string switchName, int value) - { - AppendSwitchUnquotedIfNotNull(switchName, value.ToString(NumberFormatInfo.InvariantInfo)); - } - - public void AppendFileNameIfNotNull(string switchName, ITaskItem fileItem) - { - if (fileItem != null) { - AppendFileNameIfNotNull(switchName, fileItem.ItemSpec); - } - } - - public void AppendFileNameIfNotNull(string switchName, string fileName) - { - if (fileName != null) { - AppendSpaceIfNotEmpty(); - AppendTextUnquoted(switchName); - AppendFileNameWithQuoting(fileName); - } - } - } -} diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/Fsc.cs b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/Fsc.cs deleted file mode 100644 index 27ef72064d..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/Fsc.cs +++ /dev/null @@ -1,220 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using System.CodeDom.Compiler; -using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace FSharp.Build.Tasks -{ - public sealed class Fsc : ToolTask - { - string keyContainer; - string keyFile; - int fileAlignment; - bool standalone; - bool noMLLib; - ITaskItem[] sources; - ITaskItem[] resources; - ITaskItem[] references; - ITaskItem outputAssembly; - string debugType; - bool emitDebugInformation; - string targetType; - bool optimize; - - public int FileAlignment { - get { return fileAlignment; } - set { fileAlignment = value; } - } - - public string KeyContainer { - get { return keyContainer; } - set { keyContainer = value; } - } - - public string KeyFile { - get { return keyFile; } - set { keyFile = value; } - } - - public bool Standalone { - get { return standalone; } - set { standalone = value; } - } - - public bool NoMLLib { - get { return noMLLib; } - set { noMLLib = value; } - } - - public string DebugType { - get { return debugType; } - set { debugType = value; } - } - - public bool EmitDebugInformation { - get { return emitDebugInformation; } - set { emitDebugInformation = value; } - } - - public ITaskItem[] Sources { - get { return sources; } - set { sources = value; } - } - - public ITaskItem[] References { - get { return references; } - set { references = value; } - } - - public ITaskItem[] Resources { - get { return resources; } - set { resources = value; } - } - - public bool Optimize { - get { return optimize; } - set { optimize = value; } - } - - public ITaskItem OutputAssembly { - get { return outputAssembly; } - set { outputAssembly = value; } - } - - public string TargetType { - get { return targetType; } - set { targetType = value; } - } - - protected override string ToolName { - get { return "fsc.exe"; } - } - - protected override string GenerateFullPathToTool() - { - return FscToolLocationHelper.GetPathToTool(); - } - - protected override string GenerateCommandLineCommands() - { - CompilerCommandLineBuilder commandLine = new CompilerCommandLineBuilder(); - if (((OutputAssembly == null) && (Sources != null)) && ((Sources.Length > 0))) { - OutputAssembly = new TaskItem(Path.GetFileNameWithoutExtension(this.Sources[0].ItemSpec)); - if (string.Equals(this.TargetType, "library", StringComparison.InvariantCultureIgnoreCase)) { - OutputAssembly.ItemSpec += ".dll"; - } else if (string.Equals(this.TargetType, "module", StringComparison.InvariantCultureIgnoreCase)) { - OutputAssembly.ItemSpec += ".netmodule"; - } else { - OutputAssembly.ItemSpec += ".exe"; - } - } - - commandLine.AppendSwitch("-g"); - - if (Optimize) { - commandLine.AppendSwitch("-O3"); - } - - commandLine.AppendSwitchIfNotNull("--keyfile ", this.KeyFile); - - if (noMLLib) { - commandLine.AppendSwitch("--no-mllib"); - } - - if (standalone) { - commandLine.AppendSwitch("--standalone"); - } - - if (Resources != null) { - foreach (ITaskItem item in Resources) { - commandLine.AppendSwitchIfNotNull("--resource ", item); - } - } - - if (FileAlignment > 0) { - commandLine.AppendIntegerSwitch("--base-address ", FileAlignment); - } - - commandLine.AppendSwitchIfNotNull("-o ", this.OutputAssembly); - - if (string.Equals(this.TargetType, "library", StringComparison.InvariantCultureIgnoreCase)) { - commandLine.AppendSwitch("--target-dll"); - } else if (string.Equals(this.TargetType, "winexe", StringComparison.InvariantCultureIgnoreCase)) { - commandLine.AppendSwitch("--target-winexe"); - } else if (string.Equals(this.TargetType, "module", StringComparison.InvariantCultureIgnoreCase)) { - commandLine.AppendSwitch("--target-module"); - } - - if (References != null) { - foreach (ITaskItem reference in References) { - commandLine.AppendFileNameIfNotNull("-r ", reference); - } - } - commandLine.AppendFileNamesIfNotNull(this.Sources, " "); - return commandLine.ToString(); - } - - /// - /// Each line of output, from either standard output or standard error - /// is parsed and any compiler errors are logged. If the line cannot - /// be parsed it is logged using the specified message importance. - /// - protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance) - { - CompilerError error = ParseLine(singleLine); - if (error != null) { - if (error.IsWarning) { - Log.LogWarning("warning", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); - } else { - Log.LogError("error", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); - } - } else { - Log.LogMessage(messageImportance, singleLine); - } - } - - - const string ErrorPattern = @"(?[^\(]*)\((?[0-9]*),(?[0-9]*)\):\s(?[^:]*):\s(?[^:]*):\s(?.*)"; - static Regex ErrorRegex = new Regex(ErrorPattern, RegexOptions.Compiled); - const string ErrorPatternNoLine = @"(?[^\(]*)\((?[0-9]*),(?[0-9]*)\):\s(?[^:]*):\s(?.*)"; - static Regex ErrorNoLineRegex = new Regex(ErrorPatternNoLine, RegexOptions.Compiled); - - CompilerError ParseLine(string line) - { - Match match = ErrorRegex.Match(line); - Match matchNoLine = ErrorNoLineRegex.Match(line); - if (match.Success) { - CompilerError error = new CompilerError(); - error.Column = Int32.Parse(match.Result("${column}")); - error.Line = Int32.Parse(match.Result("${line}")); - error.FileName = Path.GetFullPath(match.Result("${file}")); - error.IsWarning = match.Result("${error}") == "warning"; - error.ErrorNumber = match.Result("${number}"); - error.ErrorText = match.Result("${message}"); - return error; - } else if (matchNoLine.Success) { - CompilerError error = new CompilerError(); - error.Column = Int32.Parse(matchNoLine.Result("${column}")); - error.Line = Int32.Parse(matchNoLine.Result("${line}")); - error.FileName = Path.GetFullPath(matchNoLine.Result("${file}")); - error.IsWarning = matchNoLine.Result("${error}") == "warning"; - error.ErrorNumber = matchNoLine.Result("${number}"); - error.ErrorText = matchNoLine.Result("${message}"); - return error; - } - return null; - } - } -} diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/FscToolLocationHelper.cs b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/FscToolLocationHelper.cs deleted file mode 100644 index 08042a74d9..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/FscToolLocationHelper.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.IO; - -namespace FSharp.Build.Tasks -{ - public sealed class FscToolLocationHelper - { - public static readonly string ToolName = "fsc.exe"; - - FscToolLocationHelper() - { - } - - public static string GetPathToTool() - { - string path = null; - if (Array.Exists(ConfigurationManager.AppSettings.AllKeys, delegate(string k) { return k == "alt_fs_bin_path"; })) { - path = Path.Combine(ConfigurationManager.AppSettings["alt_fs_bin_path"], ToolName); - if (!File.Exists(path)) { - throw new Exception("you are trying to use the app setting alt_fs_bin_path, but fsc.exe is not localed in the given directory"); - } - } else { - string[] paths = Environment.GetEnvironmentVariable("path").Split(';'); - path = Array.Find(paths, delegate(string x) { - bool res = false; - try { - res = File.Exists(Path.Combine(x, "fsc.exe")); - } catch { - res = false; - } - return res; - }); - if (path != null) { - path = Path.Combine(path, ToolName); - } else { - string[] dirs = Directory.GetDirectories(Environment.GetEnvironmentVariable("ProgramFiles"), "FSharp*"); - List files = new List(); - foreach (string dir in dirs) { - FileInfo file = new FileInfo(Path.Combine(Path.Combine(dir, "bin"), ToolName)); - if (file.Exists) { - files.Add(file); - } - } - if (files.Count > 0) { - files.Sort(delegate(FileInfo x, FileInfo y) { return DateTime.Compare(x.CreationTime, y.CreationTime); }); - path = files[0].FullName; - } - } - } - return path; - } - } -} diff --git a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/IsFscInstalled.cs b/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/IsFscInstalled.cs deleted file mode 100644 index dbd566b6e1..0000000000 --- a/src/AddIns/BackendBindings/FSharp/FSharp.Build.Tasks/Project/Src/IsFscInstalled.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; - -namespace FSharp.Build.Tasks -{ - /// - /// Tasks that determines if the F# compiler is installed. - /// - public sealed class IsFscInstalled : Task - { - bool installed; - - [Output] - public bool IsInstalled { - get { return installed; } - set { installed = value; } - } - - public override bool Execute() - { - if (FscToolLocationHelper.GetPathToTool() != null) { - installed = true; - } - return true; - } - } -} 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 944907a419..9a21ab53f8 100644 --- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj +++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj @@ -1,159 +1,109 @@ - + + - {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 - - - ..\..\..\..\..\Libraries\AvalonDock\AvalonDock.dll - False - - - ..\..\RequiredLibraries\FSharp.Build.Tasks.dll - - - ..\..\..\..\..\Libraries\log4net\log4net.dll - False - + + + + + + + - 3.5 - False - - - 3.5 - False - - - - ..\..\..\..\..\Libraries\Mono.Cecil\Mono.Cecil.dll - False - - - - 3.0 - False - - - 3.0 + Microsoft.Build.Engine + Microsoft.Build.Engine.dll - - 3.0 - - - 3.0 - - - False + + + System.Configuration + System.configuration.dll 3.5 - False - - - - - 3.0 - False - - - False - - 3.0 + + System.Drawing + System.Drawing.dll - - 3.0 + + System.Windows.Forms + System.Windows.Forms.dll - - 3.0 + + System.Xml + System.XML.dll - - - - - - - - - - SharpDevelop.Build.Fsc.targets - Always - - - Always - - - Always - - - Always - - - - {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 - - - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} - ICSharpCode.Core.Presentation - 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 e4ddc84be6..aeb7242404 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/AddIns/BackendBindings/FSharp/RequiredLibraries/FSharp.Build.Tasks.dll b/src/AddIns/BackendBindings/FSharp/RequiredLibraries/FSharp.Build.Tasks.dll deleted file mode 100755 index 93729dae72461591c7d9efbacfc86b17ab0fc5ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 J2)tV&@ZS@e8(;tc diff --git a/src/AddIns/BackendBindings/FSharp/RequiredLibraries/SharpDevelop.Build.Fsc.targets b/src/AddIns/BackendBindings/FSharp/RequiredLibraries/SharpDevelop.Build.Fsc.targets deleted file mode 100644 index ea64c5de0b..0000000000 --- a/src/AddIns/BackendBindings/FSharp/RequiredLibraries/SharpDevelop.Build.Fsc.targets +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - $(MSBuildAllProjects);$(FSharpBuildTasksPath)\SharpDevelop.Build.Fsc.targets - .fs - F# - False - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file