Skip to content

Commit dc411d0

Browse files
Copilotnkolev92
andcommitted
Simplify CentralTransitive error message based on review feedback
Co-authored-by: nkolev92 <[email protected]>
1 parent 8615a8e commit dc411d0

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,9 +1541,7 @@ private async Task<bool> ValidateConflictsAsync(IEnumerable<RestoreTargetGraph>
15411541
CultureInfo.CurrentCulture,
15421542
Strings.Log_VersionConflictForCentralTransitive,
15431543
versionConflict.Selected.Key.Name,
1544-
_request.Project.Name,
1545-
"Directory.Packages.props",
1546-
versionConflict.Selected.GetIdAndVersionOrRange())
1544+
_request.Project.Name)
15471545
+ $" {Environment.NewLine} {versionConflict.Selected.GetPathWithLastRange()} {Environment.NewLine} {versionConflict.Conflicting.GetPathWithLastRange()}.";
15481546
}
15491547
else

src/NuGet.Core/NuGet.Commands/Strings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NuGet.Core/NuGet.Commands/Strings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<value>Version conflict detected for {0}. Install/reference {1} directly to project {2} to resolve this issue.</value>
181181
</data>
182182
<data name="Log_VersionConflictForCentralTransitive" xml:space="preserve">
183-
<value>Version conflict detected for {0} transitively pinned centrally managed package in project {1}. Update the centrally managed package version in {2} to {3} or higher to resolve this issue.</value>
183+
<value>Version conflict detected for {0} transitively pinned centrally managed package in project {1}. Update the centrally managed package version in Directory.Packages.props to resolve this issue.</value>
184184
</data>
185185
<data name="Error_UnknownBuildAction" xml:space="preserve">
186186
<value>Package '{0}' specifies an invalid build action '{1}' for file '{2}'.</value>

0 commit comments

Comments
 (0)