Skip to content

Commit a5b3141

Browse files
authored
[release/9.0.1xx] [FIX] tool-update: Compare tool versions correctly (#45383)
2 parents e60ca75 + 8c07f4f commit a5b3141

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
@@ -222,6 +222,21 @@ public void GivenAnExistedLowerversionInstallationWhenUpdateAllItCanPrintSuccess
222222
_packageId, LowerPackageVersion, HigherPackageVersion));
223223
}
224224

225+
[Fact]
226+
public void GivenAnExistedPreviewVersionInstallationWhenUpdateToHigherVersionItSucceeds()
227+
{
228+
var installCommand = CreateInstallCommand($"-g {_packageId} --version {HigherPreviewPackageVersion} --verbosity minimal");
229+
installCommand.Execute();
230+
_reporter.Lines.Clear();
231+
232+
var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPackageVersion} --verbosity minimal");
233+
command.Execute().Should().Be(0);
234+
235+
_reporter.Lines.First().Should().Contain(string.Format(
236+
LocalizableStrings.UpdateSucceeded,
237+
_packageId, HigherPreviewPackageVersion, HigherPackageVersion));
238+
}
239+
225240
[Fact]
226241
public void GivenAnExistedHigherversionInstallationWhenUpdateToLowerVersionItErrors()
227242
{

0 commit comments

Comments
 (0)