[NuGet] Update multiple packages together in a batch

Updating two NuGet package references that have a strict dependency
on a single version of another NuGet package not explicitly added
to the project would fail in the Manage NuGet Packages dialog. This
was because the update would be done one package at a time. Doing
the update of the two NuGet packages together allows NuGet to
update both so they then use the new strict dependency.

Note that updating all packages in the project from the Solution
window does not have this problem since there the packages are
updated together in a batch.

Fixes VSTS #986960 - Solution nuget updater fails to update a set of
packages that all have a related dependency update

Author: mrward

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs

@@ -757,8 +757,16 @@ static ProgressMonitorStatusMessage GetProgressMonitorUpdateMessages (List<IPack
 		{
 			int count = packageActions.Count;
 			if (count == 1) {
-				string packageId = packageActions.Cast<INuGetPackageAction> ().First ().PackageId;
-				return ProgressMonitorStatusMessageFactory.CreateUpdatingSinglePackageMessage (packageId);
+				if (packageActions [0] is UpdateMultipleNuGetPackagesAction updateMultiplePackagesAction) {
+					count = updateMultiplePackagesAction.PackagesToUpdate.Count ();
+					if (count == 1) {
+						return ProgressMonitorStatusMessageFactory.CreateUpdatingSinglePackageMessage (
+							updateMultiplePackagesAction.PackagesToUpdate.First ().Id);
+					}
+				} else {
+					string packageId = packageActions.Cast<INuGetPackageAction> ().First ().PackageId;
+					return ProgressMonitorStatusMessageFactory.CreateUpdatingSinglePackageMessage (packageId);
+				}
 			}
 
 			return new ProgressMonitorStatusMessage (

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetPackageManager.cs

@@ -59,6 +59,7 @@ public void SetDirectInstall (PackageIdentity directInstall, INuGetProjectContex
 		public NuGetProject ExecutedNuGetProject;
 		public List<NuGetProjectAction> ExecutedActions;
 		public INuGetProjectContext ExecutedProjectContext;
+		public SourceCacheContext ExecutedSourceCacheContext;
 		public CancellationToken ExecutedCancellationToken;
 
 		public Action BeforeExecuteAction = () => { };
@@ -74,6 +75,7 @@ public Task ExecuteNuGetProjectActionsAsync (
 			ExecutedNuGetProject = nuGetProject;
 			ExecutedActions = nuGetProjectActions.ToList ();
 			ExecutedProjectContext = nuGetProjectContext;
+			ExecutedSourceCacheContext = sourceCacheContext;
 			ExecutedCancellationToken = token;
 
 			BeforeExecuteAction ();
@@ -84,6 +86,25 @@ public Task ExecuteNuGetProjectActionsAsync (
 			return Task.FromResult (0);
 		}
 
+		public List<NuGetProject> ExecutedNuGetProjects;
+
+		public Task ExecuteNuGetProjectActionsAsync (
+			IEnumerable<NuGetProject> nuGetProjects,
+			IEnumerable<NuGetProjectAction> nuGetProjectActions,
+			INuGetProjectContext nuGetProjectContext,
+			SourceCacheContext sourceCacheContext,
+			CancellationToken token)
+		{
+			ExecutedNuGetProjects = nuGetProjects.ToList ();
+
+			return ExecuteNuGetProjectActionsAsync (
+				(NuGetProject)null,
+				nuGetProjectActions,
+				nuGetProjectContext,
+				sourceCacheContext,
+				token);
+		}
+
 		public NuGetVersion LatestVersion = new NuGetVersion ("1.2.3");
 		public string GetLatestVersionPackageId;
 		public NuGetProject GetLatestVersionProject;
@@ -203,6 +224,30 @@ public Task<IEnumerable<NuGetProjectAction>> PreviewUpdatePackagesAsync (
 			);
 		}
 
+		public List<PackageIdentity> PreviewUpdatePackages;
+		public List<NuGetProject> PreviewUpdateProjects;
+
+		public Task<IEnumerable<NuGetProjectAction>> PreviewUpdatePackagesAsync (
+			List<PackageIdentity> packageIdentities,
+			IEnumerable<NuGetProject> nuGetProjects,
+			ResolutionContext resolutionContext,
+			INuGetProjectContext nuGetProjectContext,
+			IEnumerable<SourceRepository> primarySources,
+			IEnumerable<SourceRepository> secondarySources,
+			CancellationToken token)
+		{
+			PreviewUpdatePackages = packageIdentities;
+			PreviewUpdateProjects = nuGetProjects.ToList ();
+
+			return PreviewUpdatePackagesAsync (
+				null,
+				resolutionContext,
+				nuGetProjectContext,
+				primarySources,
+				secondarySources,
+				token);
+		}
+
 		public void AddPackageToPackagesFolder (string packageId, string version)
 		{
 			var package = new PackageIdentity (packageId, new NuGetVersion (version));
@@ -239,6 +284,7 @@ public Task<IEnumerable<NuGetProjectAction>> PreviewUninstallPackageAsync (
 		}
 
 		public NuGetProject OpenReadmeFilesForProject;
+		public List<NuGetProject> OpenReadmeFilesForProjects;
 		public List<PackageIdentity> OpenReadmeFilesForPackages;
 		public INuGetProjectContext OpenReadmeFilesWithProjectContext;
 		public CancellationToken OpenReadmeFilesWithCancellationToken;
@@ -257,6 +303,20 @@ public Task OpenReadmeFiles (
 			return Task.FromResult (0);
 		}
 
+		public Task OpenReadmeFiles (
+			IEnumerable<NuGetProject> projects,
+			IEnumerable<PackageIdentity> packages,
+			INuGetProjectContext nuGetProjectContext,
+			CancellationToken token)
+		{
+			OpenReadmeFilesForProjects = projects.ToList ();
+			OpenReadmeFilesForPackages = packages.ToList ();
+			OpenReadmeFilesWithProjectContext = nuGetProjectContext;
+			OpenReadmeFilesWithCancellationToken = token;
+
+			return Task.FromResult (0);
+		}
+
 		public IBuildIntegratedNuGetProject PreviewBuildIntegratedProject;
 		public List<NuGetProjectAction> PreviewBuildIntegratedProjectActions;
 		public INuGetProjectContext PreviewBuildIntegratedContext;
@@ -278,6 +338,20 @@ public Task<BuildIntegratedProjectAction> PreviewBuildIntegratedProjectActionsAs
 
 			return Task.FromResult (BuildIntegratedProjectAction);
 		}
+
+		public INuGetProjectContext RunPostProcessAsyncProjectContext;
+		public List<NuGetProject> RunPostProcessAsyncProjects;
+
+		public Task RunPostProcessAsync (
+			List<NuGetProject> nuGetProjects,
+			INuGetProjectContext nuGetProjectContext,
+			CancellationToken token)
+		{
+			RunPostProcessAsyncProjectContext = nuGetProjectContext;
+			RunPostProcessAsyncProjects = nuGetProjects;
+
+			return Task.CompletedTask;
+		}
 	}
 }
 

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectAction.cs

@@ -26,6 +26,7 @@
 
 using NuGet.PackageManagement;
 using NuGet.Packaging.Core;
+using NuGet.ProjectManagement;
 using NuGet.Versioning;
 
 namespace MonoDevelop.PackageManagement.Tests.Helpers
@@ -43,6 +44,18 @@ public FakeNuGetProjectAction (
 		{
 		}
 
+		public FakeNuGetProjectAction (
+			NuGetProject project,
+			string packageId,
+			string packageVersion,
+			NuGetProjectActionType actionType)
+			: base (
+				CreatePackageIdentity (packageId, packageVersion),
+				actionType,
+				project)
+		{
+		}
+
 		static PackageIdentity CreatePackageIdentity (string packageId, string packageVersion)
 		{
 			NuGetVersion nuGetVersion = null;

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectContext.cs

@@ -72,6 +72,8 @@ public FileConflictAction ResolveFileConflict (string message)
 
 		public void Log (ILogMessage message)
 		{
+			if (LogToConsole)
+				Console.WriteLine (message.Message);
 		}
 
 		public void ReportError (ILogMessage message)

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRestoreManager.cs

@@ -77,6 +77,16 @@ public void EnableCurrentSolutionForRestore (bool fromActivation)
 			new Dictionary<string, List<PackageRestoreData>> ();
 
 		public void AddUnrestoredPackageForProject (string projectName, string solutionDirectory)
+		{
+			AddPackageForProject (projectName, solutionDirectory, isMissing: true);
+		}
+
+		public void AddRestoredPackageForProject (string projectName, string solutionDirectory)
+		{
+			AddPackageForProject (projectName, solutionDirectory, isMissing: false);
+		}
+
+		public void AddPackageForProject (string projectName, string solutionDirectory, bool isMissing)
 		{
 			var packageReference = new PackageReference (
 				new PackageIdentity ("Test", new NuGetVersion ("1.0")),
@@ -85,11 +95,11 @@ public void AddUnrestoredPackageForProject (string projectName, string solutionD
 			var restoreData = new PackageRestoreData (
 				packageReference,
 				new [] { projectName },
-				isMissing: true);
+				isMissing);
 
 			var restoreDataList = new List<PackageRestoreData> ();
 			restoreDataList.Add (restoreData);
-			PackagesInSolution[solutionDirectory] = restoreDataList;
+			PackagesInSolution [solutionDirectory] = restoreDataList;
 		}
 
 		public Task<IEnumerable<PackageRestoreData>> GetPackagesInSolutionAsync (

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdateMultipleNuGetPackagesAction.cs

@@ -0,0 +1,86 @@
+//
+// TestableUpdateMultipleNuGetPackagesAction.cs
+//
+// Author:
+//       Matt Ward <[email protected]>
+//
+// Copyright (c) 2019 Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using NuGet.Protocol.Core.Types;
+
+namespace MonoDevelop.PackageManagement.Tests.Helpers
+{
+	class TestableUpdateMultipleNuGetPackagesAction : UpdateMultipleNuGetPackagesAction
+	{
+		public FakeNuGetProjectContext ProjectContext;
+		public FakeNuGetPackageManager PackageManager;
+		public FakePackageRestoreManager RestoreManager;
+		public PackageManagementEvents PackageManagementEvents;
+		public FakeLicenseAcceptanceService LicenseAcceptanceService = new FakeLicenseAcceptanceService ();
+		public FakeFileRemover FileRemover = new FakeFileRemover ();
+
+		public TestableUpdateMultipleNuGetPackagesAction (
+			IEnumerable<SourceRepository> primarySources,
+			FakeSolutionManager solutionManager)
+			: this (
+				primarySources,
+				solutionManager,
+				new FakeNuGetProjectContext (),
+				new FakeNuGetPackageManager (),
+				new FakePackageRestoreManager (),
+				new PackageManagementEvents ())
+		{
+		}
+
+		public TestableUpdateMultipleNuGetPackagesAction (
+			IEnumerable<SourceRepository> primarySources,
+			FakeSolutionManager solutionManager,
+			FakeNuGetProjectContext projectContext,
+			FakeNuGetPackageManager packageManager,
+			FakePackageRestoreManager restoreManager,
+			PackageManagementEvents packageManagementEvents)
+			: base (
+				primarySources,
+				solutionManager,
+				projectContext,
+				packageManager,
+				restoreManager,
+				packageManagementEvents)
+		{
+			ProjectContext = projectContext;
+			PackageManager = packageManager;
+			RestoreManager = restoreManager;
+
+			PackageManagementEvents = packageManagementEvents;
+		}
+
+		protected override ILicenseAcceptanceService GetLicenseAcceptanceService ()
+		{
+			return LicenseAcceptanceService;
+		}
+
+		protected override IFileRemover GetFileRemover ()
+		{
+			return FileRemover;
+		}
+	}
+}

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj

@@ -156,6 +156,9 @@
     <Compile Include="MonoDevelop.PackageManagement.Tests.Helpers\TestableManagePackagesViewModel.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Tests\PackageManagementCanReferenceProjectExtensionTests.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Tests\PackageLoadContextTests.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Tests\UpdateStrictPackageDependenciesTests.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Tests\UpdateMultipleNuGetPackagesActionTests.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Tests.Helpers\TestableUpdateMultipleNuGetPackagesAction.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">