Merge pull request #9581 from dotnet/merge/release/8.0.4xx-to-release/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'

Author: DonnaChen888

test/Microsoft.TemplateEngine.Mocks/MockInstallerFactory.cs

@@ -8,7 +8,7 @@ namespace Microsoft.TemplateEngine.Mocks
 {
     public class MockInstallerFactory : IInstallerFactory
     {
-        private Guid _factoryId = new Guid("00000000-0000-0000-0000-000000000000");
+        private readonly Guid _factoryId = new Guid("00000000-0000-0000-0000-000000000000");
 
         public string Name => "MockInstallerFactory";
 

test/Microsoft.TemplateEngine.TestHelper/XunitLoggerProvider.cs

@@ -76,7 +76,7 @@ public void Log<TState>(
 
                 var firstLinePrefix = $"| [{timestamp}] {_category} {logLevel}: ";
                 var lines = formatter(state, exception).Split(NewLineChars, StringSplitOptions.RemoveEmptyEntries);
-                messageBuilder.AppendLine(firstLinePrefix + lines.FirstOrDefault() ?? string.Empty);
+                messageBuilder.AppendLine(firstLinePrefix + (lines.FirstOrDefault() ?? string.Empty));
 
                 var additionalLinePrefix = "|" + new string(' ', firstLinePrefix.Length - 1);
                 foreach (var line in lines.Skip(1))

tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostDataProducer.cs

@@ -77,7 +77,7 @@ public bool Equals(ITemplatePackageInfo? x, ITemplatePackageInfo? y)
                 }
 
                 return x.Name.Equals(y.Name, StringComparison.OrdinalIgnoreCase)
-                    && (x.Version?.Equals(y.Version, StringComparison.OrdinalIgnoreCase) ?? x.Version == y.Version);
+                    && (x.Version?.Equals(y.Version, StringComparison.OrdinalIgnoreCase) ?? (x.Version == y.Version));
             }
 
             public int GetHashCode([DisallowNull] ITemplatePackageInfo obj)

tools/Microsoft.TemplateSearch.TemplateDiscovery/AdditionalData/CliHostTemplateDataLoader.cs

@@ -64,7 +64,7 @@ internal CliHostTemplateData ReadHostSpecificTemplateData(ITemplateInfo template
                 Console.Error.WriteLine(
                     "Failed to load dotnet CLI host data for template {0} from {1}. The host data will be ignored.",
                     templateInfo.ShortNameList?[0] ?? templateInfo.Name,
-                    file?.GetDisplayPath() ?? templateInfo.MountPointUri + templateInfo.HostConfigPlace);
+                    file?.GetDisplayPath() ?? (templateInfo.MountPointUri + templateInfo.HostConfigPlace));
                 Console.Error.WriteLine("Details: {0}", e);
             }
             finally