Merge in 'release/6.0' changes

src/Http/Routing/src/EndpointMiddleware.cs

 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
@@ -90,7 +88,7 @@ namespace Microsoft.AspNetCore.Routing
             throw new InvalidOperationException($"Endpoint {endpoint.DisplayName} contains authorization metadata, " +
                 "but a middleware was not found that supports authorization." +
                 Environment.NewLine +
-                "Configure your application startup by adding app.UseAuthorization() inside the call to Configure(..) in the application startup code. The call to app.UseAuthorization() must appear between app.UseRouting() and app.UseEndpoints(...).");
+                "Configure your application startup by adding app.UseAuthorization() in the application startup code. If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseAuthorization() must go between them.");
         }
 
         private static void ThrowMissingCorsMiddlewareException(Endpoint endpoint)
@@ -98,7 +96,7 @@ namespace Microsoft.AspNetCore.Routing
             throw new InvalidOperationException($"Endpoint {endpoint.DisplayName} contains CORS metadata, " +
                 "but a middleware was not found that supports CORS." +
                 Environment.NewLine +
-                "Configure your application startup by adding app.UseCors() inside the call to Configure(..) in the application startup code. The call to app.UseCors() must appear between app.UseRouting() and app.UseEndpoints(...).");
+                "Configure your application startup by adding app.UseCors() in the application startup code. If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseCors() must go between them.");
         }
 
         private static partial class Log

src/Http/Routing/test/FunctionalTests/EndpointRoutingIntegrationTest.cs

@@ -20,13 +20,13 @@ namespace Microsoft.AspNetCore.Routing.FunctionalTests
         private static readonly RequestDelegate TestDelegate = async context => await Task.Yield();
         private static readonly string AuthErrorMessage = "Endpoint / contains authorization metadata, but a middleware was not found that supports authorization." +
             Environment.NewLine +
-            "Configure your application startup by adding app.UseAuthorization() inside the call to Configure(..) in the application startup code. " +
-            "The call to app.UseAuthorization() must appear between app.UseRouting() and app.UseEndpoints(...).";
+            "Configure your application startup by adding app.UseAuthorization() in the application startup code. " +
+            "If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseAuthorization() must go between them.";
 
         private static readonly string CORSErrorMessage = "Endpoint / contains CORS metadata, but a middleware was not found that supports CORS." +
             Environment.NewLine +
-            "Configure your application startup by adding app.UseCors() inside the call to Configure(..) in the application startup code. " +
-            "The call to app.UseCors() must appear between app.UseRouting() and app.UseEndpoints(...).";
+            "Configure your application startup by adding app.UseCors() in the application startup code. " +
+            "If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseCors() must go between them.";
 
         [Fact]
         public async Task AuthorizationMiddleware_WhenNoAuthMetadataIsConfigured()

src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs

 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Moq;
-using Xunit;
 
 namespace Microsoft.AspNetCore.Routing
 {
@@ -101,8 +97,8 @@ namespace Microsoft.AspNetCore.Routing
             // Arrange
             var expected = "Endpoint Test contains authorization metadata, but a middleware was not found that supports authorization." +
                 Environment.NewLine +
-                "Configure your application startup by adding app.UseAuthorization() inside the call to Configure(..) in the application startup code. " +
-                "The call to app.UseAuthorization() must appear between app.UseRouting() and app.UseEndpoints(...).";
+                "Configure your application startup by adding app.UseAuthorization() in the application startup code. " +
+                "If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseAuthorization() must go between them.";
             var httpContext = new DefaultHttpContext
             {
                 RequestServices = new ServiceProvider()
@@ -198,8 +194,8 @@ namespace Microsoft.AspNetCore.Routing
             // Arrange
             var expected = "Endpoint Test contains CORS metadata, but a middleware was not found that supports CORS." +
                 Environment.NewLine +
-                "Configure your application startup by adding app.UseCors() inside the call to Configure(..) in the application startup code. " +
-                "The call to app.UseCors() must appear between app.UseRouting() and app.UseEndpoints(...).";
+                "Configure your application startup by adding app.UseCors() in the application startup code. " +
+                "If there are calls to app.UseRouting() and app.UseEndpoints(...), the call to app.UseCors() must go between them.";
             var httpContext = new DefaultHttpContext
             {
                 RequestServices = new ServiceProvider()

src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json

@@ -12,9 +12,9 @@
     "language": "",
     "type": "item"
   },
-  "groupIdentity": "Microsoft.Web.Grpc.Protobuf.6.0",
+  "groupIdentity": "Microsoft.Web.Grpc.Protobuf",
   "precedence": "600",
-  "identity": "Microsoft.Web.Grpc.Protobuf",
+  "identity": "Microsoft.Web.Grpc.Protobuf.6.0",
   "shortname": "proto",
   "sourceName": "protobuf",
   "primaryOutputs": [

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/cs-CZ/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "Webové rozhraní API pro ASP.NET Core",
     "description": "Šablona projektu pro vytvoření aplikace ASP.NET Core s ukázkovým kontrolerem pro službu RESTful HTTP. Tato šablona se dá použít i pro zobrazení a kontrolery ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Povolit podporu _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Povolit podporu _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Povolení podpory OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Používání kontrolérů (pokud chcete používat minimální rozhraní API, zrušte zaškrtnutí)",
+    "parameter.UseMinimalAPIs.description": "Určuje, jestli se místo kontrolérů mají používat minimální rozhraní API."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/de-DE/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core-Web-API",
     "description": "Eine Projektvorlage zum Erstellen einer ASP.NET Core-Anwendung mit einem Beispielcontroller für einen RESTful HTTP-Dienst. Diese Vorlage kann auch für ASP.NET Core-MVC-Ansichten und -Controller verwendet werden.",
-    "parameter.DisableOpenAPI.name": "_OpenAPI-Unterstützung aktivieren"
+    "parameter.DisableOpenAPI.name": "_OpenAPI-Unterstützung aktivieren",
+    "parameter.DisableOpenAPI.description": "Aktiviert OpenAPI-Unterstützung (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Controller verwenden (deaktivieren, um minimale APIs zu verwenden)",
+    "parameter.UseMinimalAPIs.description": "Gibt an, ob minimale APIs anstelle von Controllern verwendet werden sollen."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/es-ES/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API",
     "description": "Una plantilla de proyecto para crear una aplicación ASP.NET Core con un controlador de ejemplo para un servicio RESTful HTTP. Esta plantilla también puede usarse para controladores y vistas de ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Habilitar compatibilidad con _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Habilitar compatibilidad con _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Habilitar la compatibilidad con OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Usar controladores (desactivar para usar API mínimas)",
+    "parameter.UseMinimalAPIs.description": "Indica si se deben usar API minimas en lugar de controladores."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/fr-FR/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "API web ASP.NET Core",
     "description": "Modèle de projet permettant de créer une application ASP.NET Core avec un exemple de contrôleur pour un service HTTP RESTful. Vous pouvez également utiliser ce modèle pour les vues et contrôleurs ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Activer la prise en charge d'_OpenAPI"
+    "parameter.DisableOpenAPI.name": "Activer la prise en charge d'_OpenAPI",
+    "parameter.DisableOpenAPI.description": "Active la prise en charge d'OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Utiliser des contrôleurs (décocher pour utiliser un minimum d'API)",
+    "parameter.UseMinimalAPIs.description": "S'il faut utiliser des API minimales au lieu de contrôleurs."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ide.host.json

@@ -40,6 +40,9 @@
       "name": {
         "text": "Enable _OpenAPI support"
       },
+      "description": {
+        "text": "Enables OpenAPI (Swagger) support"
+      },
       "invertBoolean": true,
       "isVisible": true,
       "defaultValue": true

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/it-IT/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "API Web ASP.NET Core",
     "description": "Modello di progetto per la creazione di un'applicazione ASP.NET Core con un controller di esempio per un servizio HTTP RESTful. È possibile usare questo modello anche per i controller e le viste di ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Abilita supporto _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Abilita supporto _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Abilita supporto OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Usa i controller (deseleziona per usare il numero minimo di API)",
+    "parameter.UseMinimalAPIs.description": "Indica se usare le API minimal invece dei controller."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ja-JP/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API",
     "description": "RESTful HTTP サービスのサンプル コントローラーで ASP.NET Core アプリケーションを作成するためのプロジェクト テンプレートです。このテンプレートは ASP.NET Core MVC のビューとコントローラーでも使用できます。",
-    "parameter.DisableOpenAPI.name": "OpenAPI サポートを有効にする(_O)"
+    "parameter.DisableOpenAPI.name": "OpenAPI サポートを有効にする(_O)",
+    "parameter.DisableOpenAPI.description": "OpenAPI (Swagger) サポートを有効にする",
+    "parameter.UseMinimalAPIs.name": "コントローラーを使用する (最小限の API を使用する場合はオフにします)",
+    "parameter.UseMinimalAPIs.description": "コントローラーの代わりに最小限の API を使用するかどうか。"
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ko-KR/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API",
     "description": "RESTful HTTP 서비스용 예제 컨트롤러를 사용하여 ASP.NET Core 애플리케이션을 만드는 데 사용되는 프로젝트 템플릿입니다. 이 템플릿은 ASP.NET Core MVC 뷰 및 컨트롤러에도 사용할 수 있습니다.",
-    "parameter.DisableOpenAPI.name": "OpenAPI 지원 사용(_O)"
+    "parameter.DisableOpenAPI.name": "OpenAPI 지원 사용(_O)",
+    "parameter.DisableOpenAPI.description": "OpenAPI(Swagger) 지원 사용",
+    "parameter.UseMinimalAPIs.name": "컨트롤러 사용(최소 API 사용 선택 취소)",
+    "parameter.UseMinimalAPIs.description": "컨트롤러 대신 최소 API를 사용할지 여부"
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pl-PL/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "Internetowy interfejs API platformy ASP.NET Core",
     "description": "Szablon projektu służący do tworzenia aplikacji platformy ASP.NET Core z przykładowym kontrolerem obsługującym usługę HTTP RESTful. Tego szablonu można także użyć dla widoków i kontrolerów platformy ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Włącz obsługę interfejsu _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Włącz obsługę interfejsu _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Włącza obsługę interfejsu OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Użyj kontrolerów (usuń zaznaczenie, aby używać minimalnej ilości interfejsów API)",
+    "parameter.UseMinimalAPIs.description": "Określa, czy używać minimalnej ilości interfejsów API zamiast kontrolerów."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pt-BR/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "API Web do ASP.NET Core",
     "description": "Um modelo de projeto para criar um aplicativo ASP.NET Core com um Controlador de exemplo para um serviço HTTP RESTful. Esse modelo também pode ser usado para Controladores e Exibições do ASP.NET Core MVC.",
-    "parameter.DisableOpenAPI.name": "Habilitar o suporte a _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Habilitar o suporte a _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Habilita o suporte a OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Usar controladores (desmarque para usar APIs mínimas)",
+    "parameter.UseMinimalAPIs.description": "Se usar APIs mínimas em vez de controladores."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ru-RU/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "Веб-API ASP.NET Core",
     "description": "Шаблон проекта для создания приложения ASP.NET Core с образцом контроллера для службы HTTP RESTful. Этот шаблон можно также использовать для представлений MVC и контроллеров ASP.NET Core.",
-    "parameter.DisableOpenAPI.name": "Включить поддержку _OpenAPI"
+    "parameter.DisableOpenAPI.name": "Включить поддержку _OpenAPI",
+    "parameter.DisableOpenAPI.description": "Включает поддержку OpenAPI (Swagger)",
+    "parameter.UseMinimalAPIs.name": "Использовать контроллеры (снимите флажок, чтобы использовать минимальные API)",
+    "parameter.UseMinimalAPIs.description": "Использование минимальных API вместо контроллеров."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/tr-TR/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API'si",
     "description": "RESTful HTTP hizmetine ait örnek bir Denetleyici içeren bir ASP.NET Core uygulaması oluşturmaya yönelik proje şablonu. Bu şablon aynı zamanda ASP.NET Core MVC Görünümleri ve Denetleyicileri için de kullanılabilir.",
-    "parameter.DisableOpenAPI.name": "_OpenAPI desteğini etkinleştir"
+    "parameter.DisableOpenAPI.name": "_OpenAPI desteğini etkinleştir",
+    "parameter.DisableOpenAPI.description": "OpenAPI (Swagger) desteğini etkinleştirir",
+    "parameter.UseMinimalAPIs.name": "Denetleyicileri kullan (minimal API’leri kullanmak için onay işaretini kaldırın)",
+    "parameter.UseMinimalAPIs.description": "Denetleyiciler yerine minimal API’lerin kullanılıp kullanılmayacağını belirtir."
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-CN/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API",
     "description": "用于创建包含 RESTful HTTP 服务示例控制器的 ASP.NET Core 应用程序的项目模板。此模板还可以用于 ASP.NET Core MVC 视图和控制器。",
-    "parameter.DisableOpenAPI.name": "启用 OpenAPI 支持(_O)"
+    "parameter.DisableOpenAPI.name": "启用 OpenAPI 支持(_O)",
+    "parameter.DisableOpenAPI.description": "启用 OpenAI (Swagger)支持",
+    "parameter.UseMinimalAPIs.name": "使用控制器(取消选中以使用最小 API)",
+    "parameter.UseMinimalAPIs.description": "是否使用最小 API 而不是控制器。"
   }
 }
\ No newline at end of file

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-TW/strings.json

@@ -3,6 +3,9 @@
   "strings": {
     "name": "ASP.NET Core Web API",
     "description": "用於建立 ASP.NET Core 應用程式的專案範本，附有 RESTful HTTP 服務的控制器範例。此範本也可用於 ASP.NET Core MVC 的檢視及控制器。",
-    "parameter.DisableOpenAPI.name": "啟用 OpenAPI 支援(_O)"
+    "parameter.DisableOpenAPI.name": "啟用 OpenAPI 支援(_O)",
+    "parameter.DisableOpenAPI.description": "啟用 OpenAPI (Swagger) 支援",
+    "parameter.UseMinimalAPIs.name": "使用控制器 (取消勾選以使用最低 API)",
+    "parameter.UseMinimalAPIs.description": "是否要使用迷你 API 而不是控制器。"
   }
 }
\ No newline at end of file

src/Security/Authorization/Policy/src/AuthorizationAppBuilderExtensions.cs

 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Policy;
 using Microsoft.Extensions.DependencyInjection;
@@ -42,8 +41,7 @@ namespace Microsoft.AspNetCore.Builder
             {
                 throw new InvalidOperationException(Resources.FormatException_UnableToFindServices(
                     nameof(IServiceCollection),
-                    nameof(PolicyServiceCollectionExtensions.AddAuthorization),
-                    "ConfigureServices(...)"));
+                    nameof(PolicyServiceCollectionExtensions.AddAuthorization)));
             }
         }
     }

src/Security/Authorization/Policy/src/Resources.resx

@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Exception_UnableToFindServices" xml:space="preserve">
-    <value>Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.</value>
+    <value>Unable to find the required services. Please add all the required services by calling '{0}.{1}' in the application startup code.</value>
   </data>
 </root>
\ No newline at end of file