Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/9.0.1xx] [FIX] tool-update: Compare tool versions correctly #45383

Merged
merged 3 commits into from
Jan 15, 2025
Merged

[release/9.0.1xx] [FIX] tool-update: Compare tool versions correctly #45383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7032fbb
[FIX] tool-update: Compare tool versions correctly
edvilme Oct 29, 2024
2e18ef4
[TEST] tool-update: Update same version different release tag
edvilme Oct 30, 2024
8c07f4f
Fix tests
edvilme Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange

private static bool ToolVersionAlreadyInstalled(IToolPackage oldPackageNullable, NuGetVersion nuGetVersion)
{
return oldPackageNullable != null && (oldPackageNullable.Version.Version == nuGetVersion.Version);
return oldPackageNullable != null && (oldPackageNullable.Version == nuGetVersion);
}

private static void EnsureVersionIsHigher(IToolPackage oldPackageNullable, IToolPackage newInstalledPackage, bool allowDowngrade)
Expand Down
15 changes: 15 additions & 0 deletions test/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,21 @@ public void GivenAnExistedLowerversionInstallationWhenUpdateAllItCanPrintSuccess
_packageId, LowerPackageVersion, HigherPackageVersion));
}

[Fact]
public void GivenAnExistedPreviewVersionInstallationWhenUpdateToHigherVersionItSucceeds()
{
var installCommand = CreateInstallCommand($"-g {_packageId} --version {HigherPreviewPackageVersion} --verbosity minimal");
installCommand.Execute();
_reporter.Lines.Clear();

var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPackageVersion} --verbosity minimal");
command.Execute().Should().Be(0);

_reporter.Lines.First().Should().Contain(string.Format(
LocalizableStrings.UpdateSucceeded,
_packageId, HigherPreviewPackageVersion, HigherPackageVersion));
}

[Fact]
public void GivenAnExistedHigherversionInstallationWhenUpdateToLowerVersionItErrors()
{
Expand Down
Loading