From bc54599bd4a361f6e9c9637e6a0a6ef9969fe475 Mon Sep 17 00:00:00 2001
From: Vlada Shubina <vshubina@microsoft.com>
Date: Mon, 12 Sep 2022 14:08:35 +0200
Subject: [PATCH] removed misleading error

---
 .../InstantiateCommand.NoMatchHandling.cs      | 18 +++++++-----------
 ...ateTemplateWithUnknownLanguage.verified.txt |  5 -----
 ...antiateTemplateWithUnknownType.verified.txt |  5 -----
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
index 923a8f2a71cd..44f54920705c 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
@@ -18,7 +18,7 @@ internal static List<InvalidTemplateOptionResult> GetInvalidOptions(IEnumerable<
             //we need to process errors only for templates that match on language, type or baseline
             IEnumerable<TemplateResult> templatesToAnalyze = templates.Where(template => template.IsTemplateMatch);
 
-            List<InvalidTemplateOptionResult> invalidOptionsList = new List<InvalidTemplateOptionResult>();
+            List<InvalidTemplateOptionResult> invalidOptionsList = new();
 
             //collect the options with invalid names (unmatched tokens)
             IEnumerable<InvalidTemplateOptionResult> unmatchedOptions = templatesToAnalyze.SelectMany(
@@ -61,7 +61,7 @@ internal static List<InvalidTemplateOptionResult> GetInvalidOptions(IEnumerable<
 
         internal static List<TemplateResult> CollectTemplateMatchInfo(InstantiateCommandArgs args, IEngineEnvironmentSettings environmentSettings, TemplatePackageManager templatePackageManager, TemplateGroup templateGroup)
         {
-            List<TemplateResult> matchInfos = new List<TemplateResult>();
+            List<TemplateResult> matchInfos = new();
             foreach (CliTemplateInfo template in templateGroup.Templates)
             {
                 if (ReparseForTemplate(args, environmentSettings, templatePackageManager, templateGroup, template)
@@ -91,7 +91,7 @@ private static string InvalidOptionsListToString(IEnumerable<InvalidTemplateOpti
                 templates = templates.Where(template => template.IsTemplateMatch);
             }
 
-            StringBuilder invalidParamsErrorText = new StringBuilder(LocalizableStrings.InvalidCommandOptions);
+            StringBuilder invalidParamsErrorText = new(LocalizableStrings.InvalidCommandOptions);
             foreach (InvalidTemplateOptionResult invalidParam in invalidParameterList)
             {
                 invalidParamsErrorText.AppendLine();
@@ -143,7 +143,7 @@ private static NewCommandStatus HandleNoTemplateFoundResult(
             }
             else
             {
-                var tokens = args.ParseResult.Tokens.Select(t => $"'{t.Value}'");
+                IEnumerable<string> tokens = args.ParseResult.Tokens.Select(t => $"'{t.Value}'");
                 reporter.WriteLine(string.Format(LocalizableStrings.Generic_Info_NoMatchingTemplates, string.Join(" ", tokens)).Bold().Red());
             }
             reporter.WriteLine();
@@ -168,7 +168,7 @@ private static void HandleNoMatchOnTemplateBaseOptions(IEnumerable<TemplateResul
             Option<string> typeOption = SharedOptionsFactory.CreateTypeOption();
             Option<string> baselineOption = SharedOptionsFactory.CreateBaselineOption();
 
-            Command reparseCommand = new Command("reparse-only")
+            Command reparseCommand = new("reparse-only")
             {
                 languageOption,
                 typeOption,
@@ -181,11 +181,11 @@ private static void HandleNoMatchOnTemplateBaseOptions(IEnumerable<TemplateResul
 
             ParseResult result = ParserFactory.CreateParser(reparseCommand).Parse(args.RemainingArguments ?? Array.Empty<string>());
             string baseInputParameters = $"'{args.ShortName}'";
-            foreach (var option in new[] { languageOption, typeOption, baselineOption })
+            foreach (Option<string> option in new[] { languageOption, typeOption, baselineOption })
             {
                 if (result.FindResultFor(option) is { } optionResult && optionResult.Token is { } token)
                 {
-                    baseInputParameters = baseInputParameters + $", {token.Value}='{optionResult.GetValueOrDefault<string>()}'";
+                    baseInputParameters += $", {token.Value}='{optionResult.GetValueOrDefault<string>()}'";
                 }
             }
 
@@ -205,10 +205,6 @@ private static void HandleNoMatchOnTemplateBaseOptions(IEnumerable<TemplateResul
             }
 
             Reporter.Error.WriteLine();
-
-            WriteListCommandExample(args, Reporter.Error);
-            WriteSearchCommandExample(args, Reporter.Error);
-            Reporter.Error.WriteLine();
         }
     }
 }
diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownLanguage.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownLanguage.verified.txt
index 48183e425c1b..1d1ad31fe199 100644
--- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownLanguage.verified.txt
+++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownLanguage.verified.txt
@@ -1,10 +1,5 @@
 No templates found matching: 'console', --language='D#'.
 Allowed values for '--language' option are: 'C#', 'F#', 'VB'.
 
-To list installed templates similar to 'console', run:
-   dotnet new list console
-To search for the templates on NuGet.org, run:
-   dotnet new search console
-
 
 For details on the exit code, refer to https://aka.ms/templating-exit-codes#103
\ No newline at end of file
diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownType.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownType.verified.txt
index 402fed8b4b46..96e7fef23d69 100644
--- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownType.verified.txt
+++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplateWithUnknownType.verified.txt
@@ -1,10 +1,5 @@
 No templates found matching: 'console', --type='item'.
 Allowed values for '--type' option are: 'project'.
 
-To list installed templates similar to 'console', run:
-   dotnet new list console
-To search for the templates on NuGet.org, run:
-   dotnet new search console
-
 
 For details on the exit code, refer to https://aka.ms/templating-exit-codes#103
\ No newline at end of file