Restrict scaffolder discovery to dotnet-scaffold

Directory.Build.props

@@ -2,6 +2,14 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <!-- Extensions 11 pulls in a DiagnosticSource fallback that is incompatible with .NET 9 HTTP metrics. -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>$(MicrosoftExtensionsPackageVersion10)</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>$(MicrosoftExtensionsPackageVersion10)</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>$(MicrosoftExtensionsPackageVersion10)</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>$(MicrosoftExtensionsPackageVersion10)</MicrosoftExtensionsLoggingConsolePackageVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Copyright>$(CopyrightMicrosoft)</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

eng/Versions.props

@@ -45,6 +45,7 @@
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>11.0.0-rc.2.26455.110</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
     <!-- Microsoft.Extensions.Hosting -->
     <MicrosoftExtensionsHostingPackageVersion>11.0.0-preview.1.26104.118</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsPackageVersion10>10.0.12</MicrosoftExtensionsPackageVersion10>
     <!-- Microsoft.Extensions.Logging.Console -->
     <MicrosoftExtensionsLoggingConsolePackageVersion>11.0.0-rc.2.26455.110</MicrosoftExtensionsLoggingConsolePackageVersion>
     <!-- Microsoft.Extensions.Logging.Debug -->

src/dotnet-scaffolding/dotnet-scaffold/Interactive/Flow/Steps/CategoryDiscovery.cs

@@ -45,7 +45,8 @@ public CategoryDiscovery(IDotNetToolService dotnetToolService, DotNetToolInfo? c
             .WithSpinner()
             .Start("Discovering scaffolders", statusContext =>
             {
-                return _dotnetToolService.GetAllCommandsParallel(envVars: envVars);
+                IList<DotNetToolInfo>? components = _componentPicked is null ? null : [_componentPicked];
+                return _dotnetToolService.GetAllCommandsParallel(components, envVars);
             });
 
             if (allCommands is not null)

src/dotnet-scaffolding/dotnet-scaffold/Interactive/Flow/Steps/CommandDiscovery.cs

@@ -49,7 +49,8 @@ public CommandDiscovery(IDotNetToolService dotnetToolService, DotNetToolInfo? co
             .WithSpinner()
             .Start("Discovering scaffolders", statusContext =>
             {
-                return _dotnetToolService.GetAllCommandsParallel(envVars: envVars);
+                IList<DotNetToolInfo>? components = _componentPicked is null ? null : [_componentPicked];
+                return _dotnetToolService.GetAllCommandsParallel(components, envVars);
             });
 
             if (allCommands is not null)

src/dotnet-scaffolding/dotnet-scaffold/Services/DotNetToolService.cs

@@ -16,6 +16,8 @@ namespace Microsoft.DotNet.Tools.Scaffold.Services;
 /// </summary>
 internal class DotNetToolService : IDotNetToolService
 {
+    private const string DotNetScaffoldPackageName = "Microsoft.dotnet-scaffold";
+
     private readonly ILogger _logger;
     private readonly IEnvironmentService _environmentService;
     private readonly IFileSystem _fileSystem;
@@ -39,18 +41,28 @@ public DotNetToolService(ILogger<DotNetToolService> logger, IEnvironmentService
 
     /// <summary>
     /// Gets the list of commands provided by a specific .NET tool.
+    /// Built-in commands are queried from the running assembly.
     /// </summary>
     /// <param name="dotnetTool">The .NET tool information.</param>
     /// <param name="envVars">Optional environment variables.</param>
     /// <returns>List of <see cref="CommandInfo"/> objects, or an empty list if none found.</returns>
     public List<CommandInfo> GetCommands(DotNetToolInfo dotnetTool, IDictionary<string, string>? envVars = null)
     {
         List<CommandInfo>? commands = null;
-        var runner = dotnetTool.IsGlobalTool ?
-            DotnetCliRunner.Create(dotnetTool.Command, ["get-commands"], envVars) :
-            DotnetCliRunner.CreateDotNet(dotnetTool.Command, ["get-commands"], envVars);
+        DotnetCliRunner runner;
+        if (IsDotNetScaffoldTool(dotnetTool))
+        {
+            // Preserve support for tools installed with --allow-roll-forward.
+            runner = DotnetCliRunner.CreateDotNet("exec", ["--roll-forward", "Major", typeof(DotNetToolService).Assembly.Location, "get-commands"], envVars);
+        }
+        else
+        {
+            runner = dotnetTool.IsGlobalTool ?
+                DotnetCliRunner.Create(dotnetTool.Command, ["get-commands"], envVars) :
+                DotnetCliRunner.CreateDotNet(dotnetTool.Command, ["get-commands"], envVars);
+        }
 
-        var exitCode = runner.ExecuteAndCaptureOutput(out var stdOut, out _);
+        var exitCode = ExecuteAndCaptureOutput(runner, out var stdOut, out _);
         if (exitCode == 0 && !string.IsNullOrEmpty(stdOut))
         {
             try
@@ -95,25 +107,27 @@ public List<CommandInfo> GetCommands(DotNetToolInfo dotnetTool, IDictionary<stri
     }
 
     /// <summary>
-    /// Gets all commands from all .NET tools in parallel.
+    /// Gets all commands from the specified .NET tools in parallel.
     /// </summary>
-    /// <param name="components">Optional list of components to query. If null, all tools are queried.</param>
+    /// <param name="components">Optional list of components to query. If null or empty, the dotnet-scaffold tool is queried.</param>
     /// <param name="envVars">Optional environment variables.</param>
     /// <returns>List of key-value pairs of tool command and <see cref="CommandInfo"/>.</returns>
     public IList<KeyValuePair<string, CommandInfo>> GetAllCommandsParallel(IList<DotNetToolInfo>? components = null, IDictionary<string, string>? envVars = null)
     {
+        var restoreLocalTools = components is { Count: > 0 };
         if (components is null || components.Count == 0)
         {
-            components = GetDotNetTools(refresh: true, envVars);
+            components = GetDotNetTools(refresh: true, envVars)
+                .Where(IsDotNetScaffoldTool)
+                .ToList();
         }
 
-        //if any local tools are present, we need to restore them first
-        //when sdks/runtimes are switched/rolled forward, local tools need to be restored before they are called
-        var anyLocalTools = components.FirstOrDefault(x => !x.IsGlobalTool) is not null;
-        if (anyLocalTools)
+        // Explicitly supplied local tools may need to be restored when SDKs or runtimes change.
+        // Default discovery queries the running assembly, so the discovered installation need not be restored.
+        if (restoreLocalTools && components.Any(x => !x.IsGlobalTool))
         {
             var runner = DotnetCliRunner.CreateDotNet("tool", ["restore"], envVars);
-            runner.ExecuteAndCaptureOutput(out _, out _);
+            ExecuteAndCaptureOutput(runner, out _, out _);
         }
 
         var options = new ParallelOptions
@@ -137,6 +151,15 @@ public IList<KeyValuePair<string, CommandInfo>> GetAllCommandsParallel(IList<Dot
         return commands.ToList();
     }
 
+    /// <summary>
+    /// Executes a tool discovery command and captures its output.
+    /// </summary>
+    protected virtual int ExecuteAndCaptureOutput(DotnetCliRunner runner, out string? stdOut, out string? stdErr)
+        => runner.ExecuteAndCaptureOutput(out stdOut, out stdErr);
+
+    private static bool IsDotNetScaffoldTool(DotNetToolInfo tool)
+        => tool.PackageName.Equals(DotNetScaffoldPackageName, StringComparison.OrdinalIgnoreCase);
+
     /// <summary>
     /// Installs a .NET tool using the dotnet CLI.
     /// </summary>
@@ -233,8 +256,8 @@ public IList<DotNetToolInfo> GetDotNetTools(bool refresh = false, IDictionary<st
             var dotnetToolList = new List<DotNetToolInfo>();
             var runner = DotnetCliRunner.CreateDotNet("tool", ["list", "-g"], envVars);
             var localRunner = DotnetCliRunner.CreateDotNet("tool", ["list"], envVars);
-            var exitCode = runner.ExecuteAndCaptureOutput(out var stdOut, out _);
-            var localExitCode = localRunner.ExecuteAndCaptureOutput(out var localStdOut, out var localStdErr);
+            var exitCode = ExecuteAndCaptureOutput(runner, out var stdOut, out _);
+            var localExitCode = ExecuteAndCaptureOutput(localRunner, out var localStdOut, out var localStdErr);
             // Parse through local dotnet tools first.
             if (localExitCode == 0 && !string.IsNullOrEmpty(localStdOut))
             {

src/dotnet-scaffolding/dotnet-scaffold/Services/IDotNetToolService.cs

@@ -13,7 +13,7 @@ internal interface IDotNetToolService
     /// <summary>
     /// Gets all commands for the specified tools in parallel.
     /// </summary>
-    /// <param name="components">The list of tool components to query. If null, all tools are used.</param>
+    /// <param name="components">The list of tool components to query. If null or empty, the dotnet-scaffold tool is used.</param>
     /// <param name="envVars">Optional environment variables for the command execution.</param>
     /// <returns>A list of key-value pairs mapping tool command names to their command info.</returns>
     IList<KeyValuePair<string, CommandInfo>> GetAllCommandsParallel(IList<DotNetToolInfo>? components = null, IDictionary<string, string>? envVars = null);
@@ -56,6 +56,7 @@ internal interface IDotNetToolService
 
     /// <summary>
     /// Gets the list of commands provided by a specific .NET tool.
+    /// Built-in commands are queried from the running assembly.
     /// </summary>
     /// <param name="dotnetTool">The tool to query for commands.</param>
     /// <param name="envVars">Optional environment variables for the command execution.</param>

test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/API/ApiControllerNet9IntegrationTests.cs

@@ -5,10 +5,11 @@
 using System.Threading.Tasks;
 using Microsoft.DotNet.Tools.Scaffold.Tests.Helpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.DotNet.Tools.Scaffold.Tests.AspNet.Integration.API;
 
-public class ApiControllerNet9IntegrationTests : ApiControllerIntegrationTestsBase
+public class ApiControllerNet9IntegrationTests(ITestOutputHelper output) : ApiControllerIntegrationTestsBase
 {
     protected override string TargetFramework => "net9.0";
     protected override string TestClassName => nameof(ApiControllerNet9IntegrationTests);
@@ -36,6 +37,7 @@ public async Task Scaffold_ApiControllerCrud_Net9_CliInvocation()
             "--controller", "TestApiController",
             "--dataContext", "TestDbContext",
             "--dbProvider", "sqlite-efcore");
+        output.WriteLine($"CLI exit code: {cliExitCode}\nStandard output:\n{cliOutput}\nStandard error:\n{cliError}");
         Assert.True(cliExitCode == 0, $"CLI scaffold should succeed.\nOutput: {cliOutput}\nError: {cliError}");
 
         // Assert — expected files were created

test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/API/MinimalApiNet9IntegrationTests.cs

@@ -5,10 +5,11 @@
 using System.Threading.Tasks;
 using Microsoft.DotNet.Tools.Scaffold.Tests.Helpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.DotNet.Tools.Scaffold.Tests.AspNet.Integration.API;
 
-public class MinimalApiNet9IntegrationTests : MinimalApiIntegrationTestsBase
+public class MinimalApiNet9IntegrationTests(ITestOutputHelper output) : MinimalApiIntegrationTestsBase
 {
     protected override string TargetFramework => "net9.0";
     protected override string TestClassName => nameof(MinimalApiNet9IntegrationTests);
@@ -36,6 +37,7 @@ public async Task Scaffold_MinimalApi_Net9_CliInvocation()
             "--endpoints", "TestModelEndpoints",
             "--dataContext", "TestDbContext",
             "--dbProvider", "sqlite-efcore");
+        output.WriteLine($"CLI exit code: {cliExitCode}\nStandard output:\n{cliOutput}\nStandard error:\n{cliError}");
         Assert.True(cliExitCode == 0, $"CLI scaffold should succeed.\nOutput: {cliOutput}\nError: {cliError}");
 
         // Assert — expected files were created

test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/Identity/IdentityNet9IntegrationTests.cs

@@ -6,10 +6,11 @@
 using System.Threading.Tasks;
 using Microsoft.DotNet.Tools.Scaffold.Tests.Helpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.DotNet.Tools.Scaffold.Tests.AspNet.Integration.Identity;
 
-public class IdentityNet9IntegrationTests : IdentityIntegrationTestsBase
+public class IdentityNet9IntegrationTests(ITestOutputHelper output) : IdentityIntegrationTestsBase
 {
     protected override string TargetFramework => "net9.0";
     protected override string TestClassName => nameof(IdentityNet9IntegrationTests);
@@ -78,6 +79,7 @@ public async Task Scaffold_Identity_Net9_CliInvocation()
             "--project", _testProjectPath,
             "--dataContext", "TestDbContext",
             "--dbProvider", "sqlite-efcore");
+        output.WriteLine($"CLI exit code: {cliExitCode}\nStandard output:\n{cliOutput}\nStandard error:\n{cliError}");
         Assert.True(cliExitCode == 0, $"CLI scaffold should succeed.\nOutput: {cliOutput}\nError: {cliError}");
 
         // Assert — expected files/directories were created

test/dotnet-scaffolding/dotnet-scaffold.Tests/AspNet/Integration/RazorPages/RazorPagesCrudNet9IntegrationTests.cs

@@ -6,10 +6,11 @@
 using System.Threading.Tasks;
 using Microsoft.DotNet.Tools.Scaffold.Tests.Helpers;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.DotNet.Tools.Scaffold.Tests.AspNet.Integration.RazorPages;
 
-public class RazorPagesCrudNet9IntegrationTests : RazorPagesCrudIntegrationTestsBase
+public class RazorPagesCrudNet9IntegrationTests(ITestOutputHelper output) : RazorPagesCrudIntegrationTestsBase
 {
     protected override string TargetFramework => "net9.0";
     protected override string TestClassName => nameof(RazorPagesCrudNet9IntegrationTests);
@@ -67,6 +68,7 @@ public async Task Scaffold_RazorPagesCrud_Net9_CliInvocation()
             "--dataContext", "TestDbContext",
             "--dbProvider", "sqlite-efcore",
             "--page", "CRUD");
+        output.WriteLine($"CLI exit code: {cliExitCode}\nStandard output:\n{cliOutput}\nStandard error:\n{cliError}");
         Assert.True(cliExitCode == 0, $"CLI scaffold should succeed.\nOutput: {cliOutput}\nError: {cliError}");
 
         // Assert — expected files were created (skip if scaffolding encountered errors)