Browse Source

Files added by NuGet package are now removed when package is uninstalled.

pull/15/head
mrward 15 years ago
parent
commit
28ce7f2d26
  1. 6
      src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs
  2. 13
      src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs

6
src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs

@ -162,13 +162,15 @@ namespace ICSharpCode.PackageManagement
public override void DeleteDirectory(string path, bool recursive) public override void DeleteDirectory(string path, bool recursive)
{ {
fileService.RemoveDirectory(path); string directory = GetFullPath(path);
fileService.RemoveDirectory(directory);
project.Save(); project.Save();
} }
public override void DeleteFile(string path) public override void DeleteFile(string path)
{ {
fileService.RemoveFile(path); string fileName = GetFullPath(path);
fileService.RemoveFile(fileName);
project.Save(); project.Save();
} }
} }

13
src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs

@ -443,7 +443,7 @@ namespace PackageManagement.Tests
ProjectHelper.AddFile(project, fileName); ProjectHelper.AddFile(project, fileName);
CreateProjectSystem(project); CreateProjectSystem(project);
projectSystem.DeleteFile(fileName); projectSystem.DeleteFile("test.cs");
Assert.AreEqual(fileName, projectSystem.FakeFileService.PathPassedToRemoveFile); Assert.AreEqual(fileName, projectSystem.FakeFileService.PathPassedToRemoveFile);
} }
@ -458,7 +458,7 @@ namespace PackageManagement.Tests
ProjectHelper.AddFile(project, fileName); ProjectHelper.AddFile(project, fileName);
CreateProjectSystem(project); CreateProjectSystem(project);
projectSystem.DeleteFile(fileName); projectSystem.DeleteFile("test.cs");
Assert.AreEqual(0, project.ItemsWhenSaved.Count); Assert.AreEqual(0, project.ItemsWhenSaved.Count);
} }
@ -468,12 +468,12 @@ namespace PackageManagement.Tests
{ {
CreateTestProject(); CreateTestProject();
project.FileName = @"d:\temp\MyProject.csproj"; project.FileName = @"d:\temp\MyProject.csproj";
string fileName = @"d:\temp\test.cs"; string fileName = @"d:\temp\test\test.cs";
ProjectHelper.AddFile(project, fileName); ProjectHelper.AddFile(project, fileName);
CreateProjectSystem(project); CreateProjectSystem(project);
string path = @"d:\temp\test"; string path = @"d:\temp\test";
projectSystem.DeleteDirectory(path); projectSystem.DeleteDirectory("test");
Assert.AreEqual(path, projectSystem.FakeFileService.PathPassedToRemoveDirectory); Assert.AreEqual(path, projectSystem.FakeFileService.PathPassedToRemoveDirectory);
} }
@ -483,13 +483,12 @@ namespace PackageManagement.Tests
{ {
CreateTestProject(); CreateTestProject();
project.FileName = @"d:\temp\MyProject.csproj"; project.FileName = @"d:\temp\MyProject.csproj";
string fileName = @"d:\temp\test.cs"; string fileName = @"d:\temp\test\test.cs";
ProjectHelper.AddFile(project, fileName); ProjectHelper.AddFile(project, fileName);
project.IsSaved = false; project.IsSaved = false;
CreateProjectSystem(project); CreateProjectSystem(project);
string path = @"d:\temp";
projectSystem.DeleteDirectory(path); projectSystem.DeleteDirectory("test");
Assert.AreEqual(0, project.ItemsWhenSaved.Count); Assert.AreEqual(0, project.ItemsWhenSaved.Count);
} }

Loading…
Cancel
Save