Skip to content

Commit 53c700e

Browse files
authored
[FIX] tool-update: Compare tool versions correctly (#44517)
1 parent 2f52f9e commit 53c700e

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange
249249

250250
private static bool ToolVersionAlreadyInstalled(IToolPackage oldPackageNullable, NuGetVersion nuGetVersion)
251251
{
252-
return oldPackageNullable != null && (oldPackageNullable.Version.Version == nuGetVersion.Version);
252+
return oldPackageNullable != null && (oldPackageNullable.Version == nuGetVersion);
253253
}
254254

255255
private static void EnsureVersionIsHigher(IToolPackage oldPackageNullable, IToolPackage newInstalledPackage, bool allowDowngrade)

test/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,21 @@ public void GivenAnExistedLowerversionInstallationWhenUpdateAllItCanPrintSuccess
200200
_packageId, LowerPackageVersion, HigherPackageVersion));
201201
}
202202

203+
[Fact]
204+
public void GivenAnExistedPreviewVersionInstallationWhenUpdateToHigherVersionItSucceeds()
205+
{
206+
var installCommand = CreateInstallCommand($"-g {_packageId} --version {HigherPreviewPackageVersion} --verbosity minimal");
207+
installCommand.Execute();
208+
_reporter.Lines.Clear();
209+
210+
var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPackageVersion} --verbosity minimal");
211+
command.Execute().Should().Be(0);
212+
213+
_reporter.Lines.First().Should().Contain(string.Format(
214+
LocalizableStrings.UpdateSucceeded,
215+
_packageId, HigherPreviewPackageVersion, HigherPackageVersion));
216+
}
217+
203218
[Fact]
204219
public void GivenAnExistedHigherversionInstallationWhenUpdateToLowerVersionItErrors()
205220
{

0 commit comments

Comments
 (0)