From 60a8df09629db55a2396ecd3925786546acbaf7d Mon Sep 17 00:00:00 2001 From: Kartheek Penagamuri Date: Wed, 5 Jun 2024 16:46:30 -0700 Subject: [PATCH 1/4] log an error when a package is not found in the feed. --- src/NuGet.Core/NuGet.DependencyResolver.Core/ResolverUtility.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/ResolverUtility.cs b/src/NuGet.Core/NuGet.DependencyResolver.Core/ResolverUtility.cs index e1687b980df..ab871d42a1b 100644 --- a/src/NuGet.Core/NuGet.DependencyResolver.Core/ResolverUtility.cs +++ b/src/NuGet.Core/NuGet.DependencyResolver.Core/ResolverUtility.cs @@ -91,6 +91,7 @@ public static async Task> FindLibraryEntryAsync( Strings.Error_PackageNotFoundWhenExpected, match.Provider.Source, ex.PackageIdentity.ToString()); + context.Logger.LogError(message); throw new FatalProtocolException(message, ex); } From 57b7a8557084abf0e09ad214be60f5bd1a7f7da3 Mon Sep 17 00:00:00 2001 From: Kartheek Penagamuri Date: Thu, 6 Jun 2024 07:37:30 -0700 Subject: [PATCH 2/4] updated existing test --- .../FindPackageTests.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs index 9e2a78f7069..a2601de11d4 100644 --- a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs +++ b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -176,6 +176,7 @@ public async Task FindPackage_VerifyMissingListedPackageThrowsNotFound() var token = CancellationToken.None; var edge = new GraphEdge(null, null, null); var actualIdentity = new LibraryIdentity("x", NuGetVersion.Parse("1.0.0-beta"), LibraryType.Package); + var packageIdentity = new PackageIdentity(actualIdentity.Name, actualIdentity.Version); var dependencies = new[] { new LibraryDependency() { LibraryRange = new LibraryRange("y", VersionRange.All, LibraryDependencyTarget.Package) } }; var dependencyInfo = LibraryDependencyInfo.Create(actualIdentity, framework, dependencies); @@ -198,6 +199,12 @@ public async Task FindPackage_VerifyMissingListedPackageThrowsNotFound() // Assert Assert.Equal(2, hitCount); + Assert.Equal(1, testLogger.Errors); + string errorMessage = string.Format(CultureInfo.CurrentCulture, + Strings.Error_PackageNotFoundWhenExpected, + remoteProvider.Object.Source, + packageIdentity.ToString()); + Assert.Equal(errorMessage, testLogger.ErrorMessages.Single()); } [Fact] From 15e1ea7e4ceaf2c35bb54797630e7a09c63cc5c6 Mon Sep 17 00:00:00 2001 From: Kartheek Penagamuri Date: Thu, 6 Jun 2024 07:47:34 -0700 Subject: [PATCH 3/4] updated test name --- .../NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs index a2601de11d4..7b0159f6969 100644 --- a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs +++ b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs @@ -165,7 +165,7 @@ public async Task FindLibraryEntryAsync_LogsOnlyPackages(LibraryDependencyTarget } [Fact] - public async Task FindPackage_VerifyMissingListedPackageThrowsNotFound() + public async Task FindPackage_VerifyMissingListedPackageThrowsNotFoundAndLogsErrorAsync() { // Arrange var range = new LibraryRange("x", VersionRange.Parse("1.0.0-beta"), LibraryDependencyTarget.Package); From f8a6d84b578b8da73faf5d320ba30c727f8bb900 Mon Sep 17 00:00:00 2001 From: Donnie Goodson <49205731+donnie-msft@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:14:10 -0400 Subject: [PATCH 4/4] test name --- .../NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs index 7b0159f6969..591028eb3bc 100644 --- a/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs +++ b/test/NuGet.Core.Tests/NuGet.DependencyResolver.Core.Tests/FindPackageTests.cs @@ -165,7 +165,7 @@ public async Task FindLibraryEntryAsync_LogsOnlyPackages(LibraryDependencyTarget } [Fact] - public async Task FindPackage_VerifyMissingListedPackageThrowsNotFoundAndLogsErrorAsync() + public async Task FindPackage_VerifyMissingListedPackage_ThrowsNotFoundAndLogsErrorAsync() { // Arrange var range = new LibraryRange("x", VersionRange.Parse("1.0.0-beta"), LibraryDependencyTarget.Package);