Browse Source

Fixed deleting directories when "Use recycle bin" option was activated.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2700 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
13f3fad76d
  1. 1
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
  2. 10
      src/Main/Base/Project/Src/Project/MSBuildEngine.cs
  3. 2
      src/Main/Base/Project/Src/Util/NativeMethods.cs

1
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@ -76,6 +76,7 @@
resource = "Boo.FileIcon"/> resource = "Boo.FileIcon"/>
</Path> </Path>
<Path name = "/SharpDevelop/BackendBindings/Templates"> <Path name = "/SharpDevelop/BackendBindings/Templates">
<Directory id = "Boo" path = "./Templates" /> <Directory id = "Boo" path = "./Templates" />
</Path> </Path>

10
src/Main/Base/Project/Src/Project/MSBuildEngine.cs

@ -42,23 +42,25 @@ namespace ICSharpCode.SharpDevelop.Project
public static readonly ICollection<string> CompileTaskNames; public static readonly ICollection<string> CompileTaskNames;
/// <summary> /// <summary>
/// Gets a list where addins can add additional properties for use in MsBuild. /// Gets a list where addins can add additional properties for use in MSBuild.
/// You can add items to this dictionary by putting strings into
/// "/SharpDevelop/MSBuildEngine/AdditionalProperties".
/// </summary> /// </summary>
public static readonly SortedList<string, string> MSBuildProperties; public static readonly IDictionary<string, string> MSBuildProperties;
/// <summary> /// <summary>
/// Gets a list of additional target files that are automatically loaded into all projects. /// Gets a list of additional target files that are automatically loaded into all projects.
/// You can add items into this list by putting strings into /// You can add items into this list by putting strings into
/// "/SharpDevelop/MSBuildEngine/AdditionalTargetFiles" /// "/SharpDevelop/MSBuildEngine/AdditionalTargetFiles"
/// </summary> /// </summary>
public static readonly List<string> AdditionalTargetFiles; public static readonly IList<string> AdditionalTargetFiles;
/// <summary> /// <summary>
/// Gets a list of additional MSBuild loggers. /// Gets a list of additional MSBuild loggers.
/// You can register your loggers by putting them into /// You can register your loggers by putting them into
/// "/SharpDevelop/MSBuildEngine/AdditionalLoggers" /// "/SharpDevelop/MSBuildEngine/AdditionalLoggers"
/// </summary> /// </summary>
public static readonly List<IMSBuildAdditionalLogger> AdditionalMSBuildLoggers; public static readonly IList<IMSBuildAdditionalLogger> AdditionalMSBuildLoggers;
static MSBuildEngine() static MSBuildEngine()
{ {

2
src/Main/Base/Project/Src/Util/NativeMethods.cs

@ -96,7 +96,7 @@ namespace ICSharpCode.SharpDevelop
public static void DeleteToRecycleBin(string fileName) public static void DeleteToRecycleBin(string fileName)
{ {
if (!File.Exists(fileName)) if (!File.Exists(fileName) && !Directory.Exists(fileName))
throw new FileNotFoundException("File not found.", fileName); throw new FileNotFoundException("File not found.", fileName);
SHFILEOPSTRUCT info = new SHFILEOPSTRUCT(); SHFILEOPSTRUCT info = new SHFILEOPSTRUCT();
info.hwnd = Gui.WorkbenchSingleton.MainForm.Handle; info.hwnd = Gui.WorkbenchSingleton.MainForm.Handle;

Loading…
Cancel
Save