Skip to content

Fix DNX command casting error with DnxCommandDefinition #52820

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

Merged
marcpopMSFT merged 4 commits into from
Feb 5, 2026
Merged

Fix DNX command casting error with DnxCommandDefinition #52820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0505d7e
Initial plan
Copilot Feb 3, 2026
d279bd8
Fix DNX command casting error by using base class
Copilot Feb 4, 2026
cb85019
Add parameterized tests for dnx and exec commands
Copilot Feb 4, 2026
a426e5c
Refactor tests to extract common arguments
Copilot Feb 4, 2026
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/Tool/Execute/ToolExecuteCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Microsoft.DotNet.Cli.Commands.Tool.Execute;

internal sealed class ToolExecuteCommand : CommandBase<ToolExecuteCommandDefinition>
internal sealed class ToolExecuteCommand : CommandBase<ToolExecuteCommandDefinitionBase>
{
const int ERROR_CANCELLED = 1223; // Windows error code for "Operation canceled by user"

Expand Down
26 changes: 20 additions & 6 deletions test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,10 @@ public void PackageToolWithAnyRid()
.And.Satisfy<string>(SupportAllOfTheseRuntimes([.. expectedRids, "any"]));
}

[Fact]
public void InstallAndRunToolFromAnyRid()
[Theory]
[InlineData("exec")]
[InlineData("dnx")]
public void InstallAndRunToolFromAnyRid(string command)
{
var toolSettings = new TestToolBuilder.TestToolSettings()
{
Expand All @@ -282,16 +284,23 @@ public void InstallAndRunToolFromAnyRid()
var testDirectory = _testAssetsManager.CreateTestDirectory();
var homeFolder = Path.Combine(testDirectory.Path, "home");

new DotnetToolCommand(Log, "exec", toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath)
string[] args = [command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath];
var testCommand = command == "dnx"
? new DotnetCommand(Log, args)
: new DotnetToolCommand(Log, args);

testCommand
.WithEnvironmentVariables(homeFolder)
.WithWorkingDirectory(testDirectory.Path)
.Execute()
.Should().Pass()
.And.HaveStdOutContaining("Hello Tool!");
}

[Fact]
public void InstallAndRunToolFromAnyRidWhenOtherRidsArePresentButIncompatible()
[Theory]
[InlineData("exec")]
[InlineData("dnx")]
public void InstallAndRunToolFromAnyRidWhenOtherRidsArePresentButIncompatible(string command)
{
var toolSettings = new TestToolBuilder.TestToolSettings()
{
Expand All @@ -310,7 +319,12 @@ .. expectedRids.Select(rid => $"{toolSettings.ToolPackageId}.{rid}.{toolSettings
var testDirectory = _testAssetsManager.CreateTestDirectory();
var homeFolder = Path.Combine(testDirectory.Path, "home");

new DotnetToolCommand(Log, "exec", toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath)
string[] args = [command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath];
var testCommand = command == "dnx"
? new DotnetCommand(Log, args)
: new DotnetToolCommand(Log, args);

testCommand
.WithEnvironmentVariables(homeFolder)
.WithWorkingDirectory(testDirectory.Path)
.Execute()
Expand Down
Loading