[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'

.gitattributes

@@ -71,3 +71,8 @@
 *.verified.zsh text eol=lf working-tree-encoding=UTF-8
 *.verified.nu text eol=lf working-tree-encoding=UTF-8
 *.verified.fish text eol=lf working-tree-encoding=UTF-8
+
+###############################################################################
+# Ensure files are included in git archive
+###############################################################################
+/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitattributes/.gitattributes -export-ignore

.vsts-ci.yml

@@ -104,7 +104,7 @@ extends:
             publishTaskPrefix: 1ES.
           populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/10.0.2xx
+          locBranch: release/10.0.3xx
           # WORKAROUND: BinSkim requires the folder exist prior to scanning.
           preSteps:
           - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -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"
 

test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs

@@ -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()
             {
@@ -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()
             {
@@ -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()