Don't create tool manifests in a .config subfolder by default (#50242)

Author: dsplaisted

src/Cli/dotnet/ToolManifest/ToolManifestFinder.cs

@@ -250,8 +250,7 @@ private string WriteManifestFile(DirectoryPath folderPath)
               "tools": {}
             }
             """;
-        _fileSystem.Directory.CreateDirectory(Path.Combine(folderPath.Value, Constants.DotConfigDirectoryName));
-        string manifestFileLocation = Path.Combine(folderPath.Value, Constants.DotConfigDirectoryName, Constants.ToolManifestFileName);
+        string manifestFileLocation = Path.Combine(folderPath.Value, Constants.ToolManifestFileName);
         _fileSystem.File.WriteAllText(manifestFileLocation, manifestFileContent);
 
         return manifestFileLocation;

template_feed/Microsoft.DotNet.Common.ItemTemplates/content/ToolManifest/.config/dotnet-tools.json renamed to template_feed/Microsoft.DotNet.Common.ItemTemplates/content/ToolManifest/dotnet-tools.json

@@ -15,7 +15,7 @@ public TemplateDiscoveryTool(IMessageSink messageSink)
             testOutputHelper = new SharedTestOutputHelper(messageSink);
             string home = Utilities.CreateTemporaryFolder("home");
             dotnetNewTestExecutionDir = Utilities.GetTestExecutionTempFolder();
-            string toolManifestPath = Path.Combine(dotnetNewTestExecutionDir, @".config\dotnet-tools.json");
+            string toolManifestPath = Path.Combine(dotnetNewTestExecutionDir, "dotnet-tools.json");
             if (!File.Exists(toolManifestPath))
             {
                 new DotnetNewCommand(

test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Dotnet-local-tool-manifest-file#-n#item.verified/Dotnet-local-tool-manifest-file/.config/dotnet-tools.json renamed to test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Dotnet-local-tool-manifest-file#-n#item.verified/Dotnet-local-tool-manifest-file/dotnet-tools.json

@@ -315,6 +315,35 @@ out ToolCommand restoredCommand
                                "But restore do not need to 'revert' since it just set in nuget global directory");
         }
 
+        [Fact]
+        public void WhenRunWithExistingManifestInConfigDirectoryItShouldAddToExistingManifest()
+        {
+            // Test backward compatibility: ensure tools can be added to existing manifests in .config directories
+            _fileSystem.File.Delete(_manifestFilePath);
+            var configDirectory = Path.Combine(_temporaryDirectory, ".config");
+            _fileSystem.Directory.CreateDirectory(configDirectory);
+            var configManifestPath = Path.Combine(configDirectory, "dotnet-tools.json");
+            _fileSystem.File.WriteAllText(configManifestPath, _jsonContent);
+
+            var toolInstallLocalCommand = GetDefaultTestToolInstallLocalCommand();
+
+            toolInstallLocalCommand.Execute().Should().Be(0);
+
+            // Verify the tool was added to the existing .config manifest
+            var manifestPackages = _toolManifestFinder.Find();
+            manifestPackages.Should().HaveCount(1);
+            manifestPackages.First().PackageId.Should().Be(_packageIdA);
+
+            // Verify that the manifest under the .config folder has been updated
+            _fileSystem.File.Exists(configManifestPath).Should().BeTrue("The .config manifest file should exist");
+            var configManifestContent = _fileSystem.File.ReadAllText(configManifestPath);
+            configManifestContent.Should().Contain(_packageIdA.ToString(), "The .config manifest should contain the installed tool");
+            configManifestContent.Should().NotBe(_jsonContent, "The .config manifest should have been updated with the new tool");
+
+            // Verify that no manifest exists in the root folder after the install command is run
+            _fileSystem.File.Exists(_manifestFilePath).Should().BeFalse("No manifest should exist in the root folder");
+        }
+
         private ToolInstallLocalCommand GetDefaultTestToolInstallLocalCommand()
         {
             return new ToolInstallLocalCommand(
@@ -418,7 +447,7 @@ public void GivenNoManifestFileAndCreateManifestIfNeededFlagItShouldCreateManife
                 _reporter);
 
             installLocalCommand.Execute().Should().Be(0);
-            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, ".config", "dotnet-tools.json")).Should().BeTrue();
+            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, "dotnet-tools.json")).Should().BeTrue();
         }
 
         [Fact]
@@ -440,7 +469,7 @@ public void GivenNoManifestFileItUsesCreateManifestIfNeededByDefault()
                 _reporter);
 
             installLocalCommand.Execute().Should().Be(0);
-            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, ".config", "dotnet-tools.json")).Should().BeTrue();
+            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, "dotnet-tools.json")).Should().BeTrue();
         }
 
         [Fact]
@@ -465,7 +494,7 @@ public void GivenNoManifestFileAndCreateManifestIfNeededFlagItShouldCreateManife
                 _reporter);
 
             installLocalCommand.Execute().Should().Be(0);
-            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, ".config", "dotnet-tools.json")).Should().BeTrue();
+            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, "dotnet-tools.json")).Should().BeTrue();
         }
 
         [Fact]
@@ -487,7 +516,7 @@ public void GivenNoManifestFileAndCreateManifestIfNeededFlagItShouldCreateManife
                 _reporter);
 
             installLocalCommand.Execute().Should().Be(0);
-            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, ".config", "dotnet-tools.json")).Should().BeTrue();
+            _fileSystem.File.Exists(Path.Combine(_temporaryDirectory, "dotnet-tools.json")).Should().BeTrue();
         }
 
         private IToolPackageDownloader GetToolToolPackageInstallerWithPreviewInFeed()

test/dotnet-new.IntegrationTests/TemplateDiscoveryTool.cs

@@ -764,6 +764,22 @@ public void GivenNoManifestInspectShouldNotThrow()
             a.Should().NotThrow();
         }
 
+        [Fact]
+        public void GivenNoManifestFileWhenCreatingNewManifestItShouldCreateInDirectFolder()
+        {
+            var toolManifest =
+                new ToolManifestFinder(
+                    new DirectoryPath(_testDirectoryRoot),
+                    _fileSystem,
+                    new FakeDangerousFileDetector());
+
+            FilePath createdManifest = toolManifest.FindFirst(createIfNotFound: true);
+
+            createdManifest.Value.Should().Be(Path.Combine(_testDirectoryRoot, "dotnet-tools.json"));
+            _fileSystem.File.Exists(Path.Combine(_testDirectoryRoot, "dotnet-tools.json")).Should().BeTrue();
+            _fileSystem.Directory.Exists(Path.Combine(_testDirectoryRoot, ".config")).Should().BeFalse("New manifests should not create .config directories");
+        }
+
         private string _jsonContent =
             @"{
    ""version"":1,