[automated] Merge branch 'release/10.0.2xx' => 'main' (#51851)

Author: DonnaChen888

NuGet.config

@@ -4,6 +4,9 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-pub-dotnet-dotnet-b0f34d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-b0f34d51/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->
@@ -40,6 +43,10 @@
   <disabledPackageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
+    <add key="darc-int-dotnet-dotnet-b0f34d5" value="true" />
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/Version.Details.props

@@ -1,10 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is auto-generated by the Maestro dependency flow system.
 Do not edit it manually, as it will get overwritten by automation.
 This file should be imported by eng/Versions.props
 -->
 <Project>
   <PropertyGroup>
+    <!-- dotnet/templating dependencies -->
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>
+    <MicrosoftTemplateEngineEdgePackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineEdgePackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
+    <MicrosoftTemplateEngineTestHelperPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineTestHelperPackageVersion>
+    <MicrosoftTemplateEngineUtilsPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateEngineUtilsPackageVersion>
+    <MicrosoftTemplateSearchCommonPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateSearchCommonPackageVersion>
+    <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>10.0.200-preview.25563.5</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
     <!-- dotnet/dotnet dependencies -->
     <dotnetdevcertsPackageVersion>10.0.0-rc.3.25567.101</dotnetdevcertsPackageVersion>
     <dotnetuserjwtsPackageVersion>10.0.0-rc.3.25567.101</dotnetuserjwtsPackageVersion>

eng/Versions.props

@@ -38,8 +38,8 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>21</VersionFeature80>
-    <VersionFeature90>10</VersionFeature90>
+    <VersionFeature80>22</VersionFeature80>
+    <VersionFeature90>11</VersionFeature90>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

src/BuiltInTools/Web.Middleware/WebSocketScriptInjection.js

@@ -208,6 +208,11 @@ setTimeout(async function () {
     console.debug('Reporting Hot Reload diagnostics.');
 
     document.querySelectorAll('#dotnet-compile-error').forEach(el => el.remove());
+
+    if (diagnostics.length == 0) {
+      return;
+    }
+
     const el = document.body.appendChild(document.createElement('div'));
     el.id = 'dotnet-compile-error';
     el.setAttribute('style', 'z-index:1000000; position:fixed; top: 0; left: 0; right: 0; bottom: 0; background-color: rgba(0,0,0,0.5); color:black; overflow: scroll;');

src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CollectionExtensions.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.TemplateEngine.Cli;
+
+internal static class CollectionExtensions
+{
+    public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> items)
+    {
+        foreach (T item in items)
+        {
+            collection.Add(item);
+        }
+    }
+}