Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 86a1715

Browse files
mrwardmrward
committed
Fix null path error when uninstalling jQuery NuGet package.
Run uninstall PowerShell scripts before the NuGet package is removed so the jQuery uninstall.ps1 script can find the Scripts folder in the project when uninstalling.
1 parent c532a4b commit 86a1715

10 files changed

Lines changed: 52 additions & 52 deletions

‎src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ public void FirePackageReferenceAddedEvent(PackageOperationEventArgs e)
183183
}
184184
}
185185

186-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
186+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
187187

188-
public void FirePackageReferenceRemovedEvent(PackageOperationEventArgs e)
188+
public void FirePackageReferenceRemovingEvent(PackageOperationEventArgs e)
189189
{
190-
if (PackageReferenceRemoved != null) {
191-
PackageReferenceRemoved(this, e);
190+
if (PackageReferenceRemoving != null) {
191+
PackageReferenceRemoving(this, e);
192192
}
193193
}
194194

‎src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ protected virtual void OnPackageReferenceAdded(IPackage package)
3535
}
3636
}
3737

38-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
38+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
3939

40-
protected virtual void OnPackageReferenceRemoved(IPackage package)
40+
protected virtual void OnPackageReferenceRemoving(IPackage package)
4141
{
42-
if (PackageReferenceRemoved != null) {
43-
PackageReferenceRemoved(this, new PackageOperationEventArgs(package, null, String.Empty));
42+
if (PackageReferenceRemoving != null) {
43+
PackageReferenceRemoving(this, new PackageOperationEventArgs(package, null, String.Empty));
4444
}
4545
}
4646

4747
#pragma warning disable 67
4848
public event EventHandler<PackageOperationEventArgs> PackageReferenceAdding;
49-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
49+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
5050
#pragma warning restore 67
5151

5252
public IPackageRepository LocalRepository { get; set; }
@@ -87,9 +87,9 @@ public void FirePackageReferenceAdded(IPackage package)
8787
OnPackageReferenceAdded(package);
8888
}
8989

90-
public void FirePackageReferenceRemoved(IPackage package)
90+
public void FirePackageReferenceRemoving(IPackage package)
9191
{
92-
OnPackageReferenceRemoved(package);
92+
OnPackageReferenceRemoving(package);
9393
}
9494

9595
public void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

‎src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface IPackageManagementProject
1515
event EventHandler<PackageOperationEventArgs> PackageInstalled;
1616
event EventHandler<PackageOperationEventArgs> PackageUninstalled;
1717
event EventHandler<PackageOperationEventArgs> PackageReferenceAdded;
18-
event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
18+
event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
1919

2020
string Name { get; }
2121
ILogger Logger { get; set; }

‎src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public event EventHandler<PackageOperationEventArgs> PackageReferenceAdded {
6464
remove { projectManager.PackageReferenceAdded -= value; }
6565
}
6666

67-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved {
68-
add { projectManager.PackageReferenceRemoved += value; }
69-
remove { projectManager.PackageReferenceRemoved -= value; }
67+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving {
68+
add { projectManager.PackageReferenceRemoving += value; }
69+
remove { projectManager.PackageReferenceRemoving -= value; }
7070
}
7171

7272
public bool IsPackageInstalled(IPackage package)

‎src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class RunAllProjectPackageScriptsAction : IDisposable
2222
List<EventHandler<PackageOperationEventArgs>> packageReferenceAddedHandlers =
2323
new List<EventHandler<PackageOperationEventArgs>>();
2424

25-
List<EventHandler<PackageOperationEventArgs>> packageReferenceRemovedHandlers =
25+
List<EventHandler<PackageOperationEventArgs>> packageReferenceRemovingHandlers =
2626
new List<EventHandler<PackageOperationEventArgs>>();
2727

2828
public RunAllProjectPackageScriptsAction(
@@ -68,7 +68,7 @@ void RegisterEvents()
6868
foreach (IPackageManagementProject project in projects) {
6969
RegisterPackageInstalledEvent(project);
7070
RegisterPackageReferenceAddedEvent(project);
71-
RegisterPackageReferenceRemovedEvent(project);
71+
RegisterPackageReferenceRemovingEvent(project);
7272
}
7373
}
7474

@@ -88,20 +88,20 @@ void RegisterPackageReferenceAddedEvent(IPackageManagementProject project)
8888
project.PackageReferenceAdded += referenceAddedHandler;
8989
}
9090

91-
void RegisterPackageReferenceRemovedEvent(IPackageManagementProject project)
91+
void RegisterPackageReferenceRemovingEvent(IPackageManagementProject project)
9292
{
93-
EventHandler<PackageOperationEventArgs> referenceRemovedHandler =
94-
(_, e) => PackageReferenceRemoved(project, e);
95-
packageReferenceRemovedHandlers.Add(referenceRemovedHandler);
96-
project.PackageReferenceRemoved += referenceRemovedHandler;
93+
EventHandler<PackageOperationEventArgs> referenceRemovingHandler =
94+
(_, e) => PackageReferenceRemoving(project, e);
95+
packageReferenceRemovingHandlers.Add(referenceRemovingHandler);
96+
project.PackageReferenceRemoving += referenceRemovingHandler;
9797
}
9898

9999
void UnregisterEvents()
100100
{
101101
foreach (IPackageManagementProject project in projects) {
102102
UnregisterPackageInstalledEvent(project);
103103
UnregisterPackageReferenceAddedEvent(project);
104-
UnregisterPackageReferenceRemovedEvent(project);
104+
UnregisterPackageReferenceRemovingEvent(project);
105105
}
106106
}
107107

@@ -119,11 +119,11 @@ void UnregisterPackageReferenceAddedEvent(IPackageManagementProject project)
119119
project.PackageReferenceAdded -= handler;
120120
}
121121

122-
void UnregisterPackageReferenceRemovedEvent(IPackageManagementProject project)
122+
void UnregisterPackageReferenceRemovingEvent(IPackageManagementProject project)
123123
{
124-
EventHandler<PackageOperationEventArgs> handler = packageReferenceRemovedHandlers.First();
125-
packageReferenceRemovedHandlers.Remove(handler);
126-
project.PackageReferenceRemoved -= handler;
124+
EventHandler<PackageOperationEventArgs> handler = packageReferenceRemovingHandlers.First();
125+
packageReferenceRemovingHandlers.Remove(handler);
126+
project.PackageReferenceRemoving -= handler;
127127
}
128128

129129
void PackageInstalled(IPackageManagementProject project, PackageOperationEventArgs e)
@@ -136,7 +136,7 @@ void PackageReferenceAdded(IPackageManagementProject project, PackageOperationEv
136136
RunInstallScript(project, e);
137137
}
138138

139-
void PackageReferenceRemoved(IPackageManagementProject project, PackageOperationEventArgs e)
139+
void PackageReferenceRemoving(IPackageManagementProject project, PackageOperationEventArgs e)
140140
{
141141
RunUninstallScript(project, e);
142142
}

‎src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ void RegisterEvents()
3939
{
4040
project.PackageInstalled += PackageInstalled;
4141
project.PackageReferenceAdded += PackageReferenceAdded;
42-
project.PackageReferenceRemoved += PackageReferenceRemoved;
42+
project.PackageReferenceRemoving += PackageReferenceRemoving;
4343
}
4444

4545
void UnregisterEvents()
4646
{
4747
project.PackageInstalled -= PackageInstalled;
4848
project.PackageReferenceAdded -= PackageReferenceAdded;
49-
project.PackageReferenceRemoved -= PackageReferenceRemoved;
49+
project.PackageReferenceRemoving -= PackageReferenceRemoving;
5050
}
5151

5252
void PackageInstalled(object sender, PackageOperationEventArgs e)
5353
{
5454
RunInitScript(e);
5555
}
5656

57-
void PackageReferenceRemoved(object sender, PackageOperationEventArgs e)
57+
void PackageReferenceRemoving(object sender, PackageOperationEventArgs e)
5858
{
5959
RunUninstallScript(e);
6060
}

‎src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void PackageViewModels_PackageReferenceIsAdded_PackageViewModelsIsUpdated
100100
}
101101

102102
[Test]
103-
public void PackageViewModels_PackageReferenceIsRemoved_PackageViewModelsIsUpdated()
103+
public void PackageViewModels_PackageReferenceIsBeingRemoved_PackageViewModelsIsUpdated()
104104
{
105105
CreateViewModel();
106106
FakePackage package = AddPackageToProjectLocalRepository();
@@ -159,7 +159,7 @@ public void PackageViewModels_PackageReferenceIsAddedAfterViewModelIsDisposed_Pa
159159
}
160160

161161
[Test]
162-
public void PackageViewModels_PackageReferenceIsRemovedAfterViewModelIsDisposed_PackageViewModelsIsNotUpdated()
162+
public void PackageViewModels_PackageReferenceIsBeingRemovedAfterViewModelIsDisposed_PackageViewModelsIsNotUpdated()
163163
{
164164
CreateViewModel();
165165
FakePackage package = AddPackageToProjectLocalRepository();

‎src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,14 @@ public void PackageReferenceAdded_ProjectManagerPackageReferenceAddedEventFired_
486486
}
487487

488488
[Test]
489-
public void PackageReferenceRemoved_ProjectManagerPackageReferenceRemovedEventFired_EventFiresWithPackage()
489+
public void PackageReferenceRemoving_ProjectManagerPackageReferenceRemovingEventFired_EventFiresWithPackage()
490490
{
491491
CreateProject();
492492
PackageOperationEventArgs eventArgs = null;
493-
project.PackageReferenceRemoved += (sender, e) => eventArgs = e;
493+
project.PackageReferenceRemoving += (sender, e) => eventArgs = e;
494494

495495
var expectedPackage = new FakePackage();
496-
fakeProjectManager.FirePackageReferenceRemoved(expectedPackage);
496+
fakeProjectManager.FirePackageReferenceRemoving(expectedPackage);
497497

498498
Assert.AreEqual(expectedPackage, eventArgs.Package);
499499
}

‎src/AddIns/Misc/PackageManagement/Test/Src/RunAllProjectPackageScriptsActionTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ void FirePackageReferenceAddedEvent(IPackageManagementProject project, PackageOp
8080
project.Raise(p => p.PackageReferenceAdded += null, null, eventArgs);
8181
}
8282

83-
void FirePackageReferenceRemovedEvent(IPackageManagementProject project, PackageOperationEventArgs eventArgs)
83+
void FirePackageReferenceRemovingEvent(IPackageManagementProject project, PackageOperationEventArgs eventArgs)
8484
{
85-
project.Raise(p => p.PackageReferenceRemoved += null, null, eventArgs);
85+
project.Raise(p => p.PackageReferenceRemoving += null, null, eventArgs);
8686
}
8787

8888
IPackageScript CreatePackageScript()
@@ -292,7 +292,7 @@ public void Constructor_OneProjectAndPackageReferencedRemovedFromProject_Package
292292
string installPath = @"d:\projects\MyProject\packages\foo";
293293
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(package, installPath);
294294

295-
FirePackageReferenceRemovedEvent(project, eventArgs);
295+
FirePackageReferenceRemovingEvent(project, eventArgs);
296296

297297
scriptFactory.AssertWasCalled(factory => factory.CreatePackageUninstallScript(package, installPath));
298298
}
@@ -307,7 +307,7 @@ public void Constructor_TwoProjectsAndPackageReferencedRemovedFromSecondProject_
307307
SetUninstallScriptToReturnFromScriptFactory(uninstallScript);
308308
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
309309

310-
FirePackageReferenceRemovedEvent(project2, eventArgs);
310+
FirePackageReferenceRemovingEvent(project2, eventArgs);
311311

312312
scriptRunner.AssertWasCalled(runner => runner.Run(uninstallScript));
313313
}
@@ -322,7 +322,7 @@ public void Constructor_TwoProjectsAndPackageReferencedIsRemovedFromSecondProjec
322322
SetUninstallScriptToReturnFromScriptFactory(uninstallScript);
323323
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
324324

325-
FirePackageReferenceRemovedEvent(project2, eventArgs);
325+
FirePackageReferenceRemovingEvent(project2, eventArgs);
326326

327327
Assert.AreEqual(project2, uninstallScript.Project);
328328
}
@@ -337,7 +337,7 @@ public void Dispose_OneProjectAndPackageReferencedRemovedFromProjectAfterActionI
337337
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
338338

339339
action.Dispose();
340-
FirePackageReferenceRemovedEvent(project, eventArgs);
340+
FirePackageReferenceRemovingEvent(project, eventArgs);
341341

342342
scriptRunner.AssertWasNotCalled(runner => runner.Run(uninstallScript));
343343
}

‎src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ public void Constructor_PackageReferenceIsAdded_InstallScriptIsPassedPackageFrom
174174
}
175175

176176
[Test]
177-
public void Constructor_PackageReferenceIsRemoved_PackageUninstallScriptIsRun()
177+
public void Constructor_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsRun()
178178
{
179179
CreateAction();
180180
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
181-
fakeProject.FirePackageReferenceRemovedEvent(eventArgs);
181+
fakeProject.FirePackageReferenceRemovingEvent(eventArgs);
182182

183183
IPackageScript actualScript = fakeScriptRunner.FirstScriptRun;
184184
FakePackageScript expectedScript = fakeScriptFactory.FirstPackageUninstallScriptCreated;
@@ -187,50 +187,50 @@ public void Constructor_PackageReferenceIsRemoved_PackageUninstallScriptIsRun()
187187
}
188188

189189
[Test]
190-
public void Constructor_PackageReferenceIsRemoved_PackageUninstallScriptIsCreated()
190+
public void Constructor_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsCreated()
191191
{
192192
CreateAction();
193193
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(@"d:\projects\myproject\packages\test");
194-
fakeProject.FirePackageReferenceRemovedEvent(eventArgs);
194+
fakeProject.FirePackageReferenceRemovingEvent(eventArgs);
195195

196196
string path = fakeScriptFactory.FirstPackageInstallDirectoryPassed;
197197

198198
Assert.AreEqual(@"d:\projects\myproject\packages\test", path);
199199
}
200200

201201
[Test]
202-
public void Dispose_PackageReferenceIsRemoved_PackageUninstallScriptIsNotRun()
202+
public void Dispose_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsNotRun()
203203
{
204204
CreateAction();
205205
action.Dispose();
206206

207207
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
208-
fakeProject.FirePackageReferenceRemovedEvent(eventArgs);
208+
fakeProject.FirePackageReferenceRemovingEvent(eventArgs);
209209

210210
int count = fakeScriptFactory.FakePackageUninstallScriptsCreated.Count;
211211

212212
Assert.AreEqual(0, count);
213213
}
214214

215215
[Test]
216-
public void Constructor_PackageReferenceIsRemoved_UninstallScriptIsPassedProject()
216+
public void Constructor_PackageReferenceIsBeingRemoved_UninstallScriptIsPassedProject()
217217
{
218218
CreateAction();
219219
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs();
220-
fakeProject.FirePackageReferenceRemovedEvent(eventArgs);
220+
fakeProject.FirePackageReferenceRemovingEvent(eventArgs);
221221

222222
IPackageManagementProject project = fakeScriptFactory.FirstPackageUninstallScriptCreated.Project;
223223

224224
Assert.AreEqual(fakeProject, project);
225225
}
226226

227227
[Test]
228-
public void Constructor_PackageReferenceIsRemoved_UninstallScriptIsPassedPackageFromPackageOperationEventArgs()
228+
public void Constructor_PackageReferenceIsBeingRemoved_UninstallScriptIsPassedPackageFromPackageOperationEventArgs()
229229
{
230230
CreateAction();
231231
var expectedPackage = new FakePackage();
232232
PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(expectedPackage);
233-
fakeProject.FirePackageReferenceRemovedEvent(eventArgs);
233+
fakeProject.FirePackageReferenceRemovingEvent(eventArgs);
234234

235235
IPackage package = fakeScriptFactory.FirstPackageUninstallScriptCreated.Package;
236236

0 commit comments

Comments
 (0)