Merge pull request #46449 from dotnet/main

Merge main into live

Author: gewarren

.github/dependabot.yml

@@ -1086,6 +1086,17 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/ai/tutorials/snippets/evaluate-safety" #EvaluateResponseSafety.csproj
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for projects.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
     directory: "/docs/ai/tutorials/snippets/evaluate-with-reporting" #TestAIWithReporting.csproj
     schedule:
@@ -1846,7 +1857,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/logging/log-sampling/code-config" #LogSamplingCodeConfig.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/global/basic" #GlobalLogBufferingBasic.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1857,7 +1868,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/logging/log-sampling/file-config" #LogSamplingFileConfig.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/global/code-based" #GlobalLogBufferingCodeBased.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1868,7 +1879,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/logging/log-sampling/trace-based" #LogSamplingTraceBased.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/global/file-based" #GlobalLogBufferingFileBased.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1879,7 +1890,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/logging/logger-message-generator" #logger-message-generator.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/per-request/basic" #PerRequestLogBufferingBasic.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1890,7 +1901,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/logging/worker-service-options" #worker-service-options.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/per-request/code-based" #PerRequestLogBufferingCodeBased.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1901,7 +1912,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/primitives/change" #tokens.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-buffering/per-request/file-based" #PerRequestLogBufferingFileBased.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1912,18 +1923,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/primitives/string" #tokenizers.csproj
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    open-pull-requests-limit: 5
-    groups:
-      # Group .NET updates together for projects.
-      dotnet:
-        patterns:
-          - "*" # Prefer a single PR per project update.
-  - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/ratelimit/http" #http.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-sampling/code-config" #LogSamplingCodeConfig.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1934,7 +1934,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/background-service" #App.WorkerService.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-sampling/file-config" #LogSamplingFileConfig.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1945,7 +1945,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/cloud-service" #App.CloudService.csproj
+    directory: "/docs/core/extensions/snippets/logging/log-sampling/trace-based" #LogSamplingTraceBased.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1956,7 +1956,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/queue-service" #App.QueueService.csproj
+    directory: "/docs/core/extensions/snippets/logging/logger-message-generator" #logger-message-generator.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1967,7 +1967,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/scoped-service" #App.ScopedService.csproj
+    directory: "/docs/core/extensions/snippets/logging/worker-service-options" #worker-service-options.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1978,7 +1978,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/signal-completion-service/App.SignalCompletionService" #App.SignalCompletionService.csproj
+    directory: "/docs/core/extensions/snippets/primitives/change" #tokens.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -1989,7 +1989,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/timer-service" #App.TimerHostedService.csproj
+    directory: "/docs/core/extensions/snippets/primitives/string" #tokenizers.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2000,7 +2000,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/extensions/snippets/workers/windows-service" #App.WindowsService.csproj
+    directory: "/docs/core/extensions/snippets/ratelimit/http" #http.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2011,7 +2011,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/resilience/snippets/http-resilience" #http-resilience.csproj
+    directory: "/docs/core/extensions/snippets/workers/background-service" #App.WorkerService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2022,7 +2022,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/resilience/snippets/resilience" #resilience.csproj
+    directory: "/docs/core/extensions/snippets/workers/cloud-service" #App.CloudService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2033,7 +2033,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/MSTest.Project" #MSTest.Project.csproj
+    directory: "/docs/core/extensions/snippets/workers/queue-service" #App.QueueService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2044,7 +2044,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/NUnit.TestProject" #NUnit.Project.csproj
+    directory: "/docs/core/extensions/snippets/workers/scoped-service" #App.ScopedService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2055,7 +2055,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/XUnit.TestProject" #XUnit.Project.csproj
+    directory: "/docs/core/extensions/snippets/workers/signal-completion-service/App.SignalCompletionService" #App.SignalCompletionService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2066,7 +2066,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/testing/snippets/testcontext/csharp" #project.csproj
+    directory: "/docs/core/extensions/snippets/workers/timer-service" #App.TimerHostedService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2077,7 +2077,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/testing/snippets/unit-testing-using-mstest/csharp/PrimeService.Tests" #PrimeService.Tests.csproj
+    directory: "/docs/core/extensions/snippets/workers/windows-service" #App.WindowsService.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2088,7 +2088,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/csharp/StringLibraryTest" #StringLibraryTest.csproj
+    directory: "/docs/core/resilience/snippets/http-resilience" #http-resilience.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2099,7 +2099,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/csharp/StringLibraryTestNet8" #StringLibraryTest.csproj
+    directory: "/docs/core/resilience/snippets/resilience" #resilience.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2110,7 +2110,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/vb/StringLibraryTest" #StringLibraryTest.vbproj
+    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/MSTest.Project" #MSTest.Project.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2121,7 +2121,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/whats-new/snippets/dotnet-8/csharp/ConsoleApp" #Project.csproj
+    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/NUnit.TestProject" #NUnit.Project.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2132,7 +2132,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/core/whats-new/snippets/dotnet-9/csharp" #Project.csproj
+    directory: "/docs/core/testing/snippets/order-unit-tests/csharp/XUnit.TestProject" #XUnit.Project.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2143,7 +2143,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/csharp/advanced-topics/interop/snippets/dynamic-iron-python-walkthrough" #ironpythonsample.csproj
+    directory: "/docs/core/testing/snippets/testcontext/csharp" #project.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2154,7 +2154,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/csharp/asynchronous-programming/snippets/async-scenarios" #async-scenarios.csproj
+    directory: "/docs/core/testing/snippets/unit-testing-using-mstest/csharp/PrimeService.Tests" #PrimeService.Tests.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2165,7 +2165,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/csharp/asynchronous-programming/snippets/generate-consume-asynchronous-streams/finished" #IssuePRreport.csproj
+    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/csharp/StringLibraryTest" #StringLibraryTest.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2176,7 +2176,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/csharp/asynchronous-programming/snippets/generate-consume-asynchronous-streams/start" #IssuePRreport.csproj
+    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/csharp/StringLibraryTestNet8" #StringLibraryTest.csproj
     schedule:
       interval: "weekly"
       day: "wednesday"
@@ -2187,7 +2187,7 @@ updates:
         patterns:
           - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
-    directory: "/docs/csharp/language-reference/compiler-messages/snippets/null-warnings" #null-warnings.csproj
+    directory: "/docs/core/tutorials/snippets/library-with-visual-studio/vb/StringLibraryTest" #StringLibraryTest.vbproj
     schedule:
       interval: "weekly"
       day: "wednesday"

.github/policies/close-issues.yml

@@ -47,9 +47,51 @@ configuration:
           - description: Close learn template issues with empty descriptions. (spam)
             if:
               - payloadType: Issues
-              - bodyContains:
-                  pattern: '### Description[\n\r]+\[Enter feedback here\][\n\r]+###'
-                  isRegex: true
+              - or:
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Enter feedback here\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Escriba sus comentarios aquí\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Tapez vos commentaires ici\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Hier Feedback eingeben\][\n\r]+###'
+                    isRegex: true
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Geri bildiriminizi buraya girin\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Ketikkan umpan balik di sini\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Immetti qui i commenti\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Voer hier feedback in\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Insira comentários aqui\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Введите отзыв здесь\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[اكتب ملاحظاتك هنا\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[在此处输入反馈\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[여기에 피드백 입력\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[フィードバックをこちらに入力してください\][\n\r]+###'
+                    isRegex: True
+                - bodyContains:
+                    pattern: '### Description[\n\r]+\[Skriv din feedback här\][\n\r]+###'
             then:
               - addLabel: 'needs-more-info'
               - removeLabel: ':watch: Not Triaged'

docs/ai/quickstarts/includes/ai-templates-azure-openai.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "azureopenai" --VectorStore "local"
+    dotnet new aichatweb --Framework net9.0 --provider azureopenai --vector-store local
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.

docs/ai/quickstarts/includes/ai-templates-github-models.md

@@ -52,7 +52,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework net9.0 --AiServiceProvider githubmodels --VectorStore local
+    dotnet new aichatweb --Framework net9.0 --provider githubmodels --vector-store local
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.

docs/ai/quickstarts/includes/ai-templates-ollama.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "ollama" --VectorStore "local"
+    dotnet new aichatweb --Framework net9.0 --provider ollama --vector-store local
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.

docs/ai/quickstarts/includes/ai-templates-openai.md

@@ -53,7 +53,7 @@ After you install the AI app templates, you can use them to create starter apps
 1. Create a new app with the `dotnet new` command and the following parameters:
 
     ```dotnetcli
-    dotnet new aichatweb --framework "net9.0" --AiServiceProvider "openai" --VectorStore "local"
+    dotnet new aichatweb --Framework net9.0 --provider openai --vector-store local
     ```
 
     The .NET CLI creates a new .NET 9.0 app with the configurations you specified.