From beb62296acad7c6e6a626be4bc7b9027e04aaeae Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sat, 4 May 2013 14:17:49 +0100 Subject: [PATCH] Add Update All button to Manage Packages dialog. --- .../Src/InvokeProcessPackageActionsCmdlet.cs | 6 +- .../Project/PackageManagement.csproj | 4 + .../Project/Src/AvailablePackagesViewModel.cs | 5 - .../Project/Src/ConsolePackageActionRunner.cs | 12 +- .../Design/FakePackageManagementProject.cs | 31 ++- .../Project/Src/Design/FakePackageManager.cs | 16 ++ .../FakeRegisteredPackageRepositories.cs | 7 +- .../Project/Src/IPackageAction.cs | 15 ++ .../Project/Src/IPackageActionRunner.cs | 4 +- .../Project/Src/IPackageManagementProject.cs | 3 + .../Src/IPackageOperationResolverFactory.cs | 6 + .../Project/Src/IPackageViewModelFactory.cs | 1 + .../Src/ISharpDevelopPackageManager.cs | 2 + .../Project/Src/IUpdatePackageActions.cs | 4 +- .../Project/Src/IUpdatePackageSettings.cs | 13 + .../Project/Src/PackageActionRunner.cs | 10 +- .../Project/Src/PackageActionsToRun.cs | 6 +- .../Project/Src/PackageManagementProject.cs | 15 ++ .../Src/PackageOperationsResolverFactory.cs | 11 + .../Project/Src/PackageViewModel.cs | 2 +- .../Project/Src/PackagesView.xaml | 9 +- .../Project/Src/PackagesViewModel.cs | 44 ++- .../Project/Src/ProcessPackageAction.cs | 4 +- .../Src/ProcessPackageOperationsAction.cs | 2 +- .../Project/Src/ReducedPackageOperations.cs | 52 ++++ .../Project/Src/SharpDevelopPackageManager.cs | 37 ++- .../Project/Src/UpdatePackageAction.cs | 2 +- .../Project/Src/UpdatePackageActions.cs | 2 +- .../Project/Src/UpdatePackagesAction.cs | 85 ++++++ .../Project/Src/UpdatedPackagesViewModel.cs | 24 ++ .../Test/PackageManagement.Tests.csproj | 5 + .../Src/AvailablePackagesViewModelTests.cs | 18 ++ .../Src/ConsolePackageActionRunnerTests.cs | 14 +- .../ExceptionThrowingPackageActionRunner.cs | 19 ++ .../Src/Helpers/FakePackageActionRunner.cs | 16 +- .../FakePackageOperationResolverFactory.cs | 20 ++ .../Helpers/FakePackageViewModelFactory.cs | 10 +- .../Src/Helpers/PackageCollectionAssert.cs | 2 +- .../Src/Helpers/PackageOperationHelper.cs | 29 ++ .../Helpers/TestableProcessPackageAction.cs | 7 + .../Src/Helpers/TestableProjectManager.cs | 4 + .../Helpers/TestableUpdatePackagesAction.cs | 37 +++ .../Test/Src/InstallPackageActionTests.cs | 10 +- .../Src/InstalledPackageViewModelTests.cs | 2 +- .../Test/Src/PackageActionRunnerTests.cs | 14 +- .../Test/Src/PackageActionsToRunTests.cs | 22 +- .../Test/Src/PackageManagementProjectTests.cs | 41 +++ .../Src/PackageReferenceInstallerTests.cs | 2 +- .../Test/Src/PackageViewModelTests.cs | 14 +- .../Test/Src/ProcessPackageActionTests.cs | 23 +- .../Test/Src/ReducedPackageOperationsTests.cs | 170 ++++++++++++ .../Src/SharpDevelopPackageManagerTests.cs | 245 +++++++++++++++-- .../Test/Src/UpdatePackagesActionTests.cs | 165 ++++++++++++ .../Test/Src/UpdatedPackageViewModelTests.cs | 7 +- .../Test/Src/UpdatedPackagesViewModelTests.cs | 253 +++++++++++++++++- 55 files changed, 1456 insertions(+), 127 deletions(-) create mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/IPackageAction.cs create mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageSettings.cs create mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/ReducedPackageOperations.cs create mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/UpdatePackagesAction.cs create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageActionRunner.cs create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PackageOperationHelper.cs create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableUpdatePackagesAction.cs create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/ReducedPackageOperationsTests.cs create mode 100644 src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackagesActionTests.cs diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InvokeProcessPackageActionsCmdlet.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InvokeProcessPackageActionsCmdlet.cs index 6f146edce5..25e5eebe08 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InvokeProcessPackageActionsCmdlet.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InvokeProcessPackageActionsCmdlet.cs @@ -36,18 +36,18 @@ namespace ICSharpCode.PackageManagement.Cmdlets void ExecutePackageActions() { - ProcessPackageAction action = null; + IPackageAction action = null; while (GetNextAction(out action)) { Execute(action); } } - bool GetNextAction(out ProcessPackageAction action) + bool GetNextAction(out IPackageAction action) { return actionsToRun.GetNextAction(out action); } - void Execute(ProcessPackageAction action) + void Execute(IPackageAction action) { action.PackageScriptRunner = this; action.Execute(); diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj index 39a71f8593..109b4fd99a 100644 --- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj +++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj @@ -156,8 +156,10 @@ + + @@ -230,8 +232,10 @@ + + diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs index 7a144063b5..e7b119e42e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs @@ -41,11 +41,6 @@ namespace ICSharpCode.PackageManagement return repository.GetPackages().Where(package => package.IsLatestVersion); } - public IQueryable CallGetPackagesFromPackageSource() - { - return GetPackagesFromPackageSource(); - } - /// /// Order packages by most downloaded first. /// diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/ConsolePackageActionRunner.cs b/src/AddIns/Misc/PackageManagement/Project/Src/ConsolePackageActionRunner.cs index a06a01908f..5871b20dca 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/ConsolePackageActionRunner.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/ConsolePackageActionRunner.cs @@ -30,14 +30,14 @@ namespace ICSharpCode.PackageManagement this.workbench = workbench; } - public void Run(ProcessPackageAction action) + public void Run(IPackageAction action) { - var actions = new List(); + var actions = new List(); actions.Add(action); Run(actions); } - public void Run(IEnumerable actions) + public void Run(IEnumerable actions) { CreateConsolePadIfConsoleHostIsNotRunning(); AddNewActionsToRun(actions); @@ -51,14 +51,14 @@ namespace ICSharpCode.PackageManagement } } - void AddNewActionsToRun(IEnumerable actions) + void AddNewActionsToRun(IEnumerable actions) { - foreach (ProcessPackageAction action in actions) { + foreach (IPackageAction action in actions) { AddNewActionToRun(action); } } - void AddNewActionToRun(ProcessPackageAction action) + void AddNewActionToRun(IPackageAction action) { packageActionsToRun.AddAction(action); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs index 3fe8611b14..e5b207f392 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs @@ -101,7 +101,7 @@ namespace ICSharpCode.PackageManagement.Design var package = new FakePackage("MyPackage"); var operation = new FakePackageOperation(package, PackageAction.Uninstall); FakeInstallOperations.Add(operation); - return operation; + return operation; } public FakePackageRepository FakeSourceRepository = new FakePackageRepository(); @@ -145,7 +145,7 @@ namespace ICSharpCode.PackageManagement.Design { return FakeUninstallPackageAction; } - + public UpdatePackageAction CreateUpdatePackageAction() { var action = new FakeUpdatePackageAction(this); @@ -213,5 +213,32 @@ namespace ICSharpCode.PackageManagement.Design { FakeSourceRepository.AddFakePackage(packageId); } + + public void UpdatePackages(UpdatePackagesAction action) + { + } + + public List UpdatePackagesActionsCreated = + new List(); + + public UpdatePackagesAction CreateUpdatePackagesAction() + { + var action = new UpdatePackagesAction(this); + UpdatePackagesActionsCreated.Add(action); + return action; + } + + public UpdatePackagesAction UpdatePackagesActionPassedToGetUpdatePackagesOperations; + public List PackagesOnUpdatePackagesActionPassedToGetUpdatePackagesOperations; + public List PackageOperationsToReturnFromGetUpdatePackagesOperations = + new List(); + + public IEnumerable GetUpdatePackagesOperations(UpdatePackagesAction action) + { + UpdatePackagesActionPassedToGetUpdatePackagesOperations = action; + PackagesOnUpdatePackagesActionPassedToGetUpdatePackagesOperations = + action.Packages.ToList(); + return PackageOperationsToReturnFromGetUpdatePackagesOperations; + } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs index 541d79977e..212215d197 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs @@ -22,6 +22,8 @@ namespace ICSharpCode.PackageManagement.Design public IPackage PackagePassedToUninstallPackage; + public UpdatePackagesAction UpdatePackagesActionsPassedToUpdatePackages; + #pragma warning disable 67 public event EventHandler PackageInstalled; public event EventHandler PackageInstalling; @@ -158,5 +160,19 @@ namespace ICSharpCode.PackageManagement.Design { throw new NotImplementedException(); } + + public void UpdatePackages(UpdatePackagesAction updateAction) + { + UpdatePackagesActionsPassedToUpdatePackages = updateAction; + } + + public List PackageOperationsToReturnFromGetUpdatePackageOperations = new List(); + public UpdatePackagesAction UpdatePackagesActionsPassedToGetUpdatePackagesOperations; + + public IEnumerable GetUpdatePackageOperations(UpdatePackagesAction updateAction) + { + UpdatePackagesActionsPassedToGetUpdatePackagesOperations = updateAction; + return PackageOperationsToReturnFromGetUpdatePackageOperations; + } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeRegisteredPackageRepositories.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeRegisteredPackageRepositories.cs index 25ca9d0005..910d32c29e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeRegisteredPackageRepositories.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeRegisteredPackageRepositories.cs @@ -72,7 +72,12 @@ namespace ICSharpCode.PackageManagement.Design public FakePackage AddFakePackageWithVersionToActiveRepository(string version) { - var package = FakePackage.CreatePackageWithVersion("Test", version); + return AddFakePackageWithVersionToActiveRepository("Test", version); + } + + public FakePackage AddFakePackageWithVersionToActiveRepository(string id, string version) + { + var package = FakePackage.CreatePackageWithVersion(id, version); FakeActiveRepository.FakePackages.Add(package); return package; } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageAction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageAction.cs new file mode 100644 index 0000000000..d62ed736a4 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageAction.cs @@ -0,0 +1,15 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.PackageManagement.Scripting; + +namespace ICSharpCode.PackageManagement +{ + public interface IPackageAction + { + void Execute(); + bool HasPackageScriptsToRun(); + IPackageScriptRunner PackageScriptRunner { get; set; } + } +} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageActionRunner.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageActionRunner.cs index 27d2ee38c8..0c243efdf8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageActionRunner.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageActionRunner.cs @@ -8,7 +8,7 @@ namespace ICSharpCode.PackageManagement { public interface IPackageActionRunner { - void Run(ProcessPackageAction action); - void Run(IEnumerable actions); + void Run(IPackageAction action); + void Run(IEnumerable actions); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs index 4c0af04881..c7e767656f 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs @@ -30,13 +30,16 @@ namespace ICSharpCode.PackageManagement IEnumerable GetPackagesInReverseDependencyOrder(); IEnumerable GetInstallPackageOperations(IPackage package, InstallPackageAction installAction); + IEnumerable GetUpdatePackagesOperations(UpdatePackagesAction action); void InstallPackage(IPackage package, InstallPackageAction installAction); void UpdatePackage(IPackage package, UpdatePackageAction updateAction); void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction); + void UpdatePackages(UpdatePackagesAction action); InstallPackageAction CreateInstallPackageAction(); UninstallPackageAction CreateUninstallPackageAction(); UpdatePackageAction CreateUpdatePackageAction(); + UpdatePackagesAction CreateUpdatePackagesAction(); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs index 3153c5f475..ebd2336677 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs @@ -13,5 +13,11 @@ namespace ICSharpCode.PackageManagement IPackageRepository sourceRepository, ILogger logger, InstallPackageAction installAction); + + IPackageOperationResolver CreateUpdatePackageOperationResolver( + IPackageRepository localRepository, + IPackageRepository sourceRepository, + ILogger logger, + IUpdatePackageSettings settings); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageViewModelFactory.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageViewModelFactory.cs index 7c55cb4eb0..9d46c1ce14 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageViewModelFactory.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageViewModelFactory.cs @@ -15,5 +15,6 @@ namespace ICSharpCode.PackageManagement PackageManagementSelectedProjects SelectedProjects { get; } IPackageManagementEvents PackageManagementEvents { get; } IPackageActionRunner PackageActionRunner { get; } + ILogger Logger { get; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs index 916ecb08db..04e31cd6bc 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs @@ -14,7 +14,9 @@ namespace ICSharpCode.PackageManagement void InstallPackage(IPackage package, InstallPackageAction installAction); void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction); void UpdatePackage(IPackage package, UpdatePackageAction updateAction); + void UpdatePackages(UpdatePackagesAction updateAction); IEnumerable GetInstallPackageOperations(IPackage package, InstallPackageAction installAction); + IEnumerable GetUpdatePackageOperations(UpdatePackagesAction updateAction); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageActions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageActions.cs index 2eaa69be5f..33334a4d72 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageActions.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageActions.cs @@ -7,10 +7,8 @@ using ICSharpCode.PackageManagement.Scripting; namespace ICSharpCode.PackageManagement { - public interface IUpdatePackageActions + public interface IUpdatePackageActions : IUpdatePackageSettings { - bool UpdateDependencies { get; set; } - bool AllowPrereleaseVersions { get; set; } IPackageScriptRunner PackageScriptRunner { get; set; } IEnumerable CreateActions(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageSettings.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageSettings.cs new file mode 100644 index 0000000000..d357bdae15 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IUpdatePackageSettings.cs @@ -0,0 +1,13 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; + +namespace ICSharpCode.PackageManagement +{ + public interface IUpdatePackageSettings + { + bool UpdateDependencies { get; set; } + bool AllowPrereleaseVersions { get; set; } + } +} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionRunner.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionRunner.cs index 5dd06bf996..0e757d137d 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionRunner.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionRunner.cs @@ -31,7 +31,7 @@ namespace ICSharpCode.PackageManagement this.powerShellDetection = powerShellDetection; } - public void Run(IEnumerable actions) + public void Run(IEnumerable actions) { if (ShouldRunActionsInConsole(actions)) { consolePackageActionRunner.Run(actions); @@ -42,9 +42,9 @@ namespace ICSharpCode.PackageManagement } } - bool ShouldRunActionsInConsole(IEnumerable actions) + bool ShouldRunActionsInConsole(IEnumerable actions) { - foreach (ProcessPackageAction action in actions) { + foreach (IPackageAction action in actions) { if (ShouldRunActionInConsole(action)) { return true; } @@ -52,7 +52,7 @@ namespace ICSharpCode.PackageManagement return false; } - public void Run(ProcessPackageAction action) + public void Run(IPackageAction action) { if (ShouldRunActionInConsole(action)) { consolePackageActionRunner.Run(action); @@ -61,7 +61,7 @@ namespace ICSharpCode.PackageManagement } } - bool ShouldRunActionInConsole(ProcessPackageAction action) + bool ShouldRunActionInConsole(IPackageAction action) { if (action.HasPackageScriptsToRun()) { if (powerShellDetection.IsPowerShell2Installed()) { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionsToRun.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionsToRun.cs index 06b1958798..a4aab81747 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionsToRun.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageActionsToRun.cs @@ -8,14 +8,14 @@ namespace ICSharpCode.PackageManagement { public class PackageActionsToRun { - ConcurrentQueue actions = new ConcurrentQueue(); + ConcurrentQueue actions = new ConcurrentQueue(); - public bool GetNextAction(out ProcessPackageAction action) + public bool GetNextAction(out IPackageAction action) { return actions.TryDequeue(out action); } - public void AddAction(ProcessPackageAction action) + public void AddAction(IPackageAction action) { actions.Enqueue(action); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs index f42d2d3033..6c7d258faf 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs @@ -131,5 +131,20 @@ namespace ICSharpCode.PackageManagement .GetPackagesByDependencyOrder(projectManager.LocalRepository) .Reverse(); } + + public void UpdatePackages(UpdatePackagesAction updateAction) + { + packageManager.UpdatePackages(updateAction); + } + + public UpdatePackagesAction CreateUpdatePackagesAction() + { + return new UpdatePackagesAction(this); + } + + public IEnumerable GetUpdatePackagesOperations(UpdatePackagesAction action) + { + return packageManager.GetUpdatePackageOperations(action); + } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs index 22b20e25e7..e1522de1ec 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs @@ -22,5 +22,16 @@ namespace ICSharpCode.PackageManagement installAction.IgnoreDependencies, installAction.AllowPrereleaseVersions); } + + public IPackageOperationResolver CreateUpdatePackageOperationResolver(IPackageRepository localRepository, IPackageRepository sourceRepository, ILogger logger, IUpdatePackageSettings settings) + { + return new InstallWalker( + localRepository, + sourceRepository, + null, + logger, + !settings.UpdateDependencies, + settings.AllowPrereleaseVersions); + } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs index 5a3fdb1b90..93c7e3f251 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs @@ -402,7 +402,7 @@ namespace ICSharpCode.PackageManagement void RunActionsIfAnyExist(IList actions) { if (actions.Any()) { - actionRunner.Run(actions); + actionRunner.Run(actions); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml index 05694252a6..a8d93dd35f 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml @@ -1,4 +1,4 @@ - + @@ -352,6 +353,12 @@ Width="16"/> +