From 28ce7f2d26b9bc0c213c069632311ad1bdcc9fe4 Mon Sep 17 00:00:00 2001 From: mrward Date: Wed, 23 Feb 2011 20:06:56 +0000 Subject: [PATCH] Files added by NuGet package are now removed when package is uninstalled. --- .../Project/Src/SharpDevelopProjectSystem.cs | 6 ++++-- .../Test/Src/SharpDevelopProjectSystemTests.cs | 13 ++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs b/src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs index 514d57f324..88fcfe5ccd 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopProjectSystem.cs @@ -162,13 +162,15 @@ namespace ICSharpCode.PackageManagement public override void DeleteDirectory(string path, bool recursive) { - fileService.RemoveDirectory(path); + string directory = GetFullPath(path); + fileService.RemoveDirectory(directory); project.Save(); } public override void DeleteFile(string path) { - fileService.RemoveFile(path); + string fileName = GetFullPath(path); + fileService.RemoveFile(fileName); project.Save(); } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs index 996a3cf76e..e7abd75b5e 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopProjectSystemTests.cs @@ -443,7 +443,7 @@ namespace PackageManagement.Tests ProjectHelper.AddFile(project, fileName); CreateProjectSystem(project); - projectSystem.DeleteFile(fileName); + projectSystem.DeleteFile("test.cs"); Assert.AreEqual(fileName, projectSystem.FakeFileService.PathPassedToRemoveFile); } @@ -458,7 +458,7 @@ namespace PackageManagement.Tests ProjectHelper.AddFile(project, fileName); CreateProjectSystem(project); - projectSystem.DeleteFile(fileName); + projectSystem.DeleteFile("test.cs"); Assert.AreEqual(0, project.ItemsWhenSaved.Count); } @@ -468,12 +468,12 @@ namespace PackageManagement.Tests { CreateTestProject(); project.FileName = @"d:\temp\MyProject.csproj"; - string fileName = @"d:\temp\test.cs"; + string fileName = @"d:\temp\test\test.cs"; ProjectHelper.AddFile(project, fileName); CreateProjectSystem(project); string path = @"d:\temp\test"; - projectSystem.DeleteDirectory(path); + projectSystem.DeleteDirectory("test"); Assert.AreEqual(path, projectSystem.FakeFileService.PathPassedToRemoveDirectory); } @@ -483,13 +483,12 @@ namespace PackageManagement.Tests { CreateTestProject(); project.FileName = @"d:\temp\MyProject.csproj"; - string fileName = @"d:\temp\test.cs"; + string fileName = @"d:\temp\test\test.cs"; ProjectHelper.AddFile(project, fileName); project.IsSaved = false; CreateProjectSystem(project); - string path = @"d:\temp"; - projectSystem.DeleteDirectory(path); + projectSystem.DeleteDirectory("test"); Assert.AreEqual(0, project.ItemsWhenSaved.Count); }