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

Commit 7c203b4

Browse files
author
Dragan
committed
PM: Duplicate functionality removed & rename
1) GetPackagesInstaledInSolution() removed. Duplicate, does nothing, redirects to public available Solution.GetPackages() 2) IsPackageInstaledInSolution() removed. Duplicate, does nothing, redirects to public available Solution.IsPackageInstalled() 3) Name GetInstalledPackages() renamed to GetPackages(). Misleading name, all packages are installed in selected-projects/project/solution. Or packages exist in repository, where repository can be available/solution/project/installed.
1 parent 285d639 commit 7c203b4

3 files changed

Lines changed: 9 additions & 19 deletions

File tree

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSelectedProjects.cs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,26 +138,16 @@ public bool IsPackageInstalled(IPackageFromRepository package)
138138
IPackageManagementProject project = GetSingleProjectSelected(package.Repository);
139139
return project.IsPackageInstalled(package);
140140
}
141-
return IsPackageInstalledInSolution(package);
142-
}
143-
144-
public bool IsPackageInstalledInSolution(IPackage package)
145-
{
146141
return Solution.IsPackageInstalled(package);
147142
}
148143

149-
public IQueryable<IPackage> GetPackagesInstalledInSolution()
150-
{
151-
return Solution.GetPackages();
152-
}
153-
154-
public IQueryable<IPackage> GetInstalledPackages(IPackageRepository sourceRepository)
144+
public IQueryable<IPackage> GetPackages(IPackageRepository sourceRepository)
155145
{
156146
if (HasSingleProjectSelected()) {
157147
IPackageManagementProject project = GetSingleProjectSelected(sourceRepository);
158148
return project.GetPackages();
159149
}
160-
return GetPackagesInstalledInSolution();
150+
return Solution.GetPackages();
161151
}
162152

163153
public IPackageManagementProject GetSingleProjectSelected(IPackageRepository repository)

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected override void UpdateRepositoryBeforeReadPackagesTaskStarts()
8686

8787
IQueryable<IPackage> GetInstalledPackages(IPackageRepository aggregateRepository)
8888
{
89-
return selectedProjects.GetInstalledPackages(aggregateRepository);
89+
return selectedProjects.GetPackages(aggregateRepository);
9090
}
9191

9292
protected override IQueryable<IPackage> GetAllPackages()

src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSelectedProjectsTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public void IsPackageInstalledInSolution_PackageInstalledInSolutionWithTwoProjec
301301
fakeSolution.FakeInstalledPackages.Add(package);
302302
CreateSelectedProjects();
303303

304-
bool installed = selectedProjects.IsPackageInstalledInSolution(package);
304+
bool installed = selectedProjects.Solution.IsPackageInstalled(package);
305305

306306
Assert.IsTrue(installed);
307307
}
@@ -316,7 +316,7 @@ public void IsPackageInstalledInSolution_PackageNotInstalledInSolutionWithTwoPro
316316

317317
var package = new FakePackage("Test");
318318

319-
bool installed = selectedProjects.IsPackageInstalledInSolution(package);
319+
bool installed = selectedProjects.Solution.IsPackageInstalled(package);
320320

321321
Assert.IsFalse(installed);
322322
}
@@ -332,7 +332,7 @@ public void GetPackagesInstalledInSolution_PackageInstalledInSolutionAndProjectN
332332
fakeSolution.FakeInstalledPackages.Add(package);
333333
CreateSelectedProjects();
334334

335-
IQueryable<IPackage> packages = selectedProjects.GetPackagesInstalledInSolution();
335+
IQueryable<IPackage> packages = selectedProjects.Solution.GetPackages();
336336

337337
var expectedPackages = new FakePackage[] {
338338
package
@@ -439,7 +439,7 @@ public void GetInstalledPackages_PackageInstalledInSolutionAndProjectNotSelected
439439
CreateSelectedProjects();
440440

441441
var repository = new FakePackageRepository();
442-
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(repository);
442+
IQueryable<IPackage> packages = selectedProjects.GetPackages(repository);
443443

444444
var expectedPackages = new FakePackage[] {
445445
package
@@ -463,7 +463,7 @@ public void GetInstalledPackages_PackageInstalledInProjectAndProjectIsSelected_R
463463
CreateSelectedProjects();
464464

465465
var repository = new FakePackageRepository();
466-
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(repository);
466+
IQueryable<IPackage> packages = selectedProjects.GetPackages(repository);
467467

468468
var expectedPackages = new FakePackage[] {
469469
package
@@ -481,7 +481,7 @@ public void GetInstalledPackages_PackageInstalledInProjectAndProjectIsSelected_C
481481
CreateSelectedProjects();
482482

483483
var expectedRepository = new FakePackageRepository();
484-
IQueryable<IPackage> packages = selectedProjects.GetInstalledPackages(expectedRepository);
484+
IQueryable<IPackage> packages = selectedProjects.GetPackages(expectedRepository);
485485

486486
IPackageRepository repository = fakeSolution.RepositoryPassedToGetProject;
487487

0 commit comments

Comments
 (0)