Template verifier adoption in CommonTemplateTests

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.tool-manifest._.verified/tool-manifest/.config/dotnet-tools.json → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#Dotnet-local-tool-manifest-file#-n#item.verified/Dotnet-local-tool-manifest-file/.config/dotnet-tools.json

@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "isRoot": true,
   "tools": {}

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#Dotnet-local-tool-manifest-file#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#EditorConfig-file#-n#item#--empty.verified/EditorConfig-file/.editorconfig

@@ -0,0 +1,2 @@
+root = true
+

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#EditorConfig-file#-n#item#--empty.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.editorconfig._.verified/editorconfig/.editorconfig → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#EditorConfig-file#-n#item.verified/EditorConfig-file/.editorconfig

@@ -1,4 +1,4 @@
-root = true
+root = true
 
 # All files
 [*]

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#EditorConfig-file#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#NuGet-Config#-n#item.Windows.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.sln._.verified/sln/sln.sln → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#Solution-File#-n#item.verified/Solution-File/item.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#Solution-File#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#Web-Config#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.gitignore._.verified/gitignore/.gitignore → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#dotnet-gitignore-file#-n#item.verified/dotnet-gitignore-file/.gitignore

@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#dotnet-gitignore-file#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.globaljson.--sdk-version#5.0.200#--roll-forward#major.verified/globaljson/global.json → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#5.0.200#--roll-forward#major.verified/global-json-file/global.json

@@ -1,4 +1,4 @@
-{
+{
   "sdk": {
     "rollForward": "major",
     "version": "5.0.200"

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#5.0.200#--roll-forward#major.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.globaljson.--sdk-version#5.0.200.verified/globaljson/global.json → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#5.0.200.verified/global-json-file/global.json

@@ -1,4 +1,4 @@
-{
+{
   "sdk": {
     "version": "5.0.200"
   }

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#5.0.200.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.globaljson._.verified/globaljson/global.json → src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/global-json-file/global.json

@@ -1,4 +1,4 @@
-{
+{
   "sdk": {
     "version": "%CURRENT-VER%"
   }

src/Tests/dotnet-new.Tests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/std-streams/stdout.txt

@@ -0,0 +1 @@
+The template "%TEMPLATE_NAME%" was created successfully.

src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs

@@ -32,30 +32,41 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log)
 
         [Theory]
         [InlineData("dotnet gitignore file", "gitignore", null)]
+        [InlineData("dotnet gitignore file", ".gitignore", null)]
         [InlineData("global.json file", "globaljson", null)]
         [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "5.0.200" })]
         [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "5.0.200", "--roll-forward", "major" })]
+        [InlineData("global.json file", "global.json", null)]
+        [InlineData("global.json file", "global.json", new[] { "--sdk-version", "5.0.200" })]
+        [InlineData("global.json file", "global.json", new[] { "--sdk-version", "5.0.200", "--roll-forward", "major" })]
         [InlineData("NuGet Config", "nugetconfig", null)]
+        [InlineData("NuGet Config", "nuget.config", null)]
         [InlineData("Solution File", "sln", null)]
         [InlineData("Solution File", "solution", null)]
         [InlineData("Dotnet local tool manifest file", "tool-manifest", null)]
         [InlineData("Web Config", "webconfig", null)]
         [InlineData("EditorConfig file", "editorconfig", null)]
         [InlineData("EditorConfig file", "editorconfig", new[] { "--empty" })]
+        [InlineData("EditorConfig file", ".editorconfig", null)]
+        [InlineData("EditorConfig file", ".editorconfig", new[] { "--empty" })]
         public async void AllCommonItemsCreate(string expectedTemplateName, string templateShortName, string[]? args)
         {
             Dictionary<string, string> environmentUnderTest = new() { ["DOTNET_NOLOGO"] = false.ToString() };
             TestContext.Current.AddTestEnvironmentVariables(environmentUnderTest);
 
+            string itemName = expectedTemplateName.Replace(' ', '-').Replace('.', '-');
+
             TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName)
             {
-                TemplateSpecificArgs = args,
+                // squeshing snapshots by creating output unique for template (but not alias) and preventing item to have name by alias
+                TemplateSpecificArgs = new[] { "-o", itemName, "-n", "item" }.Concat(args ?? Enumerable.Empty<string>()),
                 SnapshotsDirectory = "Approvals",
                 VerifyCommandOutput = true,
                 VerificationExcludePatterns = new[] { "*/stderr.txt", "*\\stderr.txt" },
                 SettingsDirectory = _fixture.HomeDirectory,
                 DotnetExecutablePath = TestContext.Current.ToolsetUnderTest.DotNetHostPath,
-                UniqueFor = templateShortName.Equals("nugetconfig") ? UniqueForOption.OsPlatform : null,
+                DoNotPrependTemplateNameToScenarioName = true,
+                UniqueFor = expectedTemplateName.Equals("NuGet Config") ? UniqueForOption.OsPlatform : null,
             }
             .WithCustomEnvironment(environmentUnderTest)
             .WithCustomScrubbers(
@@ -72,7 +83,7 @@ public async void AllCommonItemsCreate(string expectedTemplateName, string templ
 
             // globaljson is appending current sdk version. Due to the 'base' dotnet used to run test this version differs
             //  on dev and CI runs and possibly from the version within test host. Easiest is just to scrub it away
-            if (templateShortName.Equals("globaljson") && args == null)
+            if (expectedTemplateName.Equals("global.json file") && args == null)
             {
                 string sdkVersionUnderTest = await new SdkInfoProvider().GetCurrentVersionAsync(default).ConfigureAwait(false);
                 options.CustomScrubbers?.AddScrubber(sb => sb.Replace(sdkVersionUnderTest, "%CURRENT-VER%"), "json");
@@ -162,24 +173,24 @@ public void NuGetConfigPermissions()
 
             var templatesToTest = new[]
             {
-                new { Template = consoleTemplateShortname,  Frameworks = new[] { null, "net7.0" } },
-                new { Template = "classlib", Frameworks = new[] { null, "net7.0", "netstandard2.0", "netstandard2.1" } }
+                new { Template = consoleTemplateShortname,  Frameworks = new[] { null, "net6.0", "net7.0", "net8.0" } },
+                new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net7.0", "net8.0", "netstandard2.0", "netstandard2.1" } }
             };
 
             //features: top-level statements; nullables; implicit usings; filescoped namespaces
 
             string[] unsupportedLanguageVersions = { "1", "ISO-1" };
-            string[] unsupportedFrameworkVersions = { "net5.0", "netcoreapp3.1" };
-            string?[] supportedLanguageVersions = { null, "ISO-2", "2", "3", "4", "5", "6", "7", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "11.0", "11", "latest", "latestMajor", "default", "preview" };
+            //C# 12 is not supported yet - https://github.com/dotnet/sdk/issues/29195
+            string?[] supportedLanguageVersions = { null, "ISO-2", "2", "3", "4", "5", "6", "7", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
 
-            string?[] nullableSupportedInFrameworkByDefault = { null, "net7.0", "netstandard2.1" };
-            string?[] implicitUsingsSupportedInFramework = { null, "net7.0" };
-            string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net7.0" };
+            string?[] nullableSupportedInFrameworkByDefault = { null, "net7.0", "net8.0", "netstandard2.1" };
+            string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net7.0", "net8.0" };
+            string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net7.0", "net8.0" };
 
-            string?[] nullableSupportedLanguages = { "8.0", "9.0", "10.0", "11.0", "11", "latest", "latestMajor", "default", "preview" };
-            string?[] topLevelStatementSupportedLanguages = { null, "9.0", "10.0", "11", "11.0", "latest", "latestMajor", "default", "preview" };
-            string?[] implicitUsingsSupportedLanguages = { null, "10.0", "11.0", "11", "latest", "latestMajor", "default", "preview" };
-            string?[] fileScopedNamespacesSupportedLanguages = { "10.0", "11.0", "11", "latest", "latestMajor", "default", "preview" };
+            string?[] nullableSupportedLanguages = { "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
+            string?[] topLevelStatementSupportedLanguages = { null, "9.0", "10.0", "11", "11.0", /*"12",*/ "latest", "latestMajor", "default", "preview" };
+            string?[] implicitUsingsSupportedLanguages = { null, "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
+            string?[] fileScopedNamespacesSupportedLanguages = { "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
 
             string?[] supportedLangs = { null, "C#", "F#", "VB" };
 
@@ -191,7 +202,6 @@ public void NuGetConfigPermissions()
                     IEnumerable<string?> langs = new string?[] { null };
                     if (langVersion == null)
                     {
-                        frameworks = frameworks.Concat(unsupportedFrameworkVersions);
                         langs = supportedLangs;
                     }
 
@@ -212,7 +222,7 @@ public void NuGetConfigPermissions()
 
             object?[]? CreateParams(string templateName, string? langVersion, string? lang, string? framework, bool forceDisableTopLevel)
             {
-                bool supportsTopLevel = topLevelStatementSupportedLanguages.Contains(langVersion) && !unsupportedFrameworkVersions.Contains(framework);
+                bool supportsTopLevel = topLevelStatementSupportedLanguages.Contains(langVersion);
 
                 // If forceDisableTopLevel is requested - then generate params only if it makes sense - for C# console project of a version that
                 //  supports top level statements. Otherwise it doesn't make sense to test this overwritting functionality
@@ -225,7 +235,7 @@ public void NuGetConfigPermissions()
                 {
                     templateName,
                     // buildPass
-                    supportedLanguageVersions.Contains(langVersion) && !unsupportedFrameworkVersions.Contains(framework),
+                    supportedLanguageVersions.Contains(langVersion),
                     framework,
                     langVersion,
                     // langVersionUnsupported
@@ -263,8 +273,8 @@ public async void FeaturesSupport(
             bool supportsImplicitUsings,
             bool supportsFileScopedNs)
         {
-            const string currentDefaultFramework = "net8.0";
-            //string currentDefaultFramework = $"net{Environment.Version.Major}.{Environment.Version.Minor}";
+            // "net8.0";
+            string currentDefaultFramework = $"net{Environment.Version.Major}.{Environment.Version.Minor}";
 
             string workingDir = CreateTemporaryFolder(folderName: $"{name}-{langVersion ?? "null"}-{framework ?? "null"}");
             string outputDir = "MyProject";