Merge pull request #43050 from dotnet/main

Merge `main` to `live`.

Author: IEvangelist

.github/policies/auto-merge.yml

@@ -8,37 +8,46 @@ where:
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - description: Approve and auto-squash-merge PRs to main labeled with 'auto-merge'
+    - description: Approve and auto-squash-merge bot PRs to main labeled 'auto-merge'
       triggerOnOwnActions: true
       if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: ':octocat: auto-merge'
-      - targetsBranch:
-          branch: main
+        - payloadType: Pull_Request
+        - labelAdded:
+            label: ':octocat: auto-merge'
+        - targetsBranch:
+            branch: main
+        - or:
+            - isActivitySender:
+                user: azure-sdk
+            - isActivitySender:
+                user: dependabot
+            - isActivitySender:
+                user: dependabot[bot]
       then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      - approvePullRequest:
-          comment: "Approved; this PR will merge when all status checks pass."
+        - enableAutoMerge:
+            mergeMethod: Squash
+        - approvePullRequest:
+            comment: "Approved; this PR will merge when all status checks pass."
 
-    - description: Auto-merge PRs to live labeled with 'auto-merge'
+    - description: Auto-merge policy service bot PRs to live labeled 'auto-merge'
       triggerOnOwnActions: true
       if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: ':octocat: auto-merge'
-      - targetsBranch:
-          branch: live
+        - payloadType: Pull_Request
+        - labelAdded:
+            label: ':octocat: auto-merge'
+        - targetsBranch:
+            branch: live
+        - isActivitySender:
+            user: dotnet-policy-service[bot]
       then:
-      - enableAutoMerge:
-          mergeMethod: Merge
+        - enableAutoMerge:
+            mergeMethod: Merge
 
     - description: Don't auto-merge PRs with 'auto-merge' label removed
       if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: ':octocat: auto-merge'
+        - payloadType: Pull_Request
+        - labelRemoved:
+            label: ':octocat: auto-merge'
       then:
-      - disableAutoMerge
+        - disableAutoMerge
 

.github/policies/label-prs.yml

@@ -64,10 +64,10 @@ configuration:
         if:
           - payloadType: Pull_Request
           - or:
-            - isActivitySender:
-                user: dependabot
-            - isActivitySender:
-                user: dependabot[bot]
+              - isActivitySender:
+                  user: dependabot
+              - isActivitySender:
+                  user: dependabot[bot]
         then:
           - addLabel:
               label: ":octocat: auto-merge"

.github/policies/policy-edits.yml

@@ -0,0 +1,32 @@
+id:
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: Flag PRs that change .github folder files.
+        triggerOnOwnActions: true
+        if:
+          - payloadType: Pull_Request
+          - isAction:
+              action: Opened
+          - filesMatchPattern:
+              pattern: .github/*
+              matchAny: true
+              excludedFiles:
+                - .github/CODEOWNERS
+          - not:
+              or:
+                - activitySenderHasPermission:
+                    permission: admin
+                - activitySenderHasPermission:
+                    permission: write
+        then:
+          - addReply:
+              reply: >-
+                  @${issueAuthor} - This PR edits a file in the .github folder, which is not allowed. CC @dotnet/docs.
+          - closePullRequest

.openpublishing.redirection.core.json

@@ -877,6 +877,14 @@
             "source_path_from_root": "/docs/core/porting/upgrade-assistant-aspnetmvc.md",
             "redirect_url": "/aspnet/core/migration/mvc"
         },
+        {
+            "source_path_from_root": "/docs/core/porting/upgrade-assistant-install-legacy.md",
+            "redirect_url": "/dotnet/core/porting/upgrade-assistant-wcf"
+        },
+        {
+            "source_path_from_root": "/docs/core/porting/upgrade-assistant-uwp-framework.md",
+            "redirect_url": "/windows/apps/windows-app-sdk/migrate-to-windows-app-sdk/upgrade-assistant"
+        },
         {
             "source_path_from_root": "/docs/core/porting/upgrade-assistant-winforms-framework.md",
             "redirect_url": "/dotnet/desktop/winforms/migration/"
@@ -1345,10 +1353,6 @@
         {
             "source_path_from_root": "/docs/fundamentals/networking/tcp/tcp-overview.md",
             "redirect_url": "/dotnet/fundamentals/networking/sockets/tcp-classes"
-        },
-        {
-            "source_path_from_root": "/docs/core/porting/upgrade-assistant-uwp-framework.md",
-            "redirect_url": "/windows/apps/windows-app-sdk/migrate-to-windows-app-sdk/upgrade-assistant"
         }
     ]
 }

README.md

@@ -43,7 +43,7 @@ to clarify expected behavior in our community. For more information, see the [.N
 - [![Markdownlint](https://github.com/dotnet/docs/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/markdownlint.yml):  The current status for the entire repositories Markdown linter status.
 - [![MSDocs build verifier](https://github.com/dotnet/docs/actions/workflows/docs-verifier.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/docs-verifier.yml):  Runs various Markdown verifications, beyond the linter, such as ensuring links and redirects are valid.
 - [![No response](https://github.com/dotnet/docs/actions/workflows/no-response.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/no-response.yml):  If an issue is labeled with `needs-more-info` and the op doesn't respond within 14 days, the issue is closed.
-- [![OPS status checker](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml):  Builds the site for the PR in context, and verifies the build reporting either, `success,` `warnings`, or `error`.
+- [![OPS status checker](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml):  Builds the site for the PR in context, and verifies the build reporting either, `success`, `warnings`, or `error`.
 - [![Snippets 5000](https://github.com/dotnet/docs/actions/workflows/snippets5000.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/snippets5000.yml):  Custom .NET build validation, locates code impacted by a PR, and builds.
 - [![Target supported version](https://github.com/dotnet/docs/actions/workflows/version-sweep.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/version-sweep.yml):  Runs monthly, creating issues on projects that target .NET versions that are out of support.
 - [![Update dependabot.yml](https://github.com/dotnet/docs/actions/workflows/dependabot-bot.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/dependabot-bot.yml):  Automatically updates the `dependabot` configuration weekly, but only if required.

docs/architecture/cloud-native/combine-containers-serverless-approaches.md

@@ -30,7 +30,7 @@ When the project is created, it will include a Dockerfile and the worker runtime
 
 ## How to combine serverless and Kubernetes with KEDA
 
-In this chapter, you've seen that the Azure Functions' platform automatically scales out to meet demand. When deploying containerized functions to AKS, however, you lose the built-in scaling functionality. To the rescue comes [Kubernetes-based Event Driven (KEDA)](/azure/azure-functions/functions-kubernetes-keda). It enables fine-grained autoscaling for `event-driven Kubernetes workloads,` including containerized functions.
+In this chapter, you've seen that the Azure Functions' platform automatically scales out to meet demand. When deploying containerized functions to AKS, however, you lose the built-in scaling functionality. To the rescue comes [Kubernetes-based Event Driven (KEDA)](/azure/azure-functions/functions-kubernetes-keda). It enables fine-grained autoscaling for `event-driven Kubernetes workloads`, including containerized functions.
 
 KEDA provides event-driven scaling functionality to the Functions' runtime in a Docker container. KEDA can scale from zero instances (when no events are occurring) out to `n instances`, based on load. It enables autoscaling by exposing custom metrics to the Kubernetes autoscaler (Horizontal Pod Autoscaler). Using Functions containers with KEDA makes it possible to replicate serverless function capabilities in any Kubernetes cluster.
 

docs/architecture/maui/dependency-injection.md

@@ -55,7 +55,7 @@ There are many dependency injection containers available in .NET; the eShop mult
 
 In .NET MAUI, the `MauiProgram` class will call into the `CreateMauiApp` method to create a `MauiAppBuilder` object. The `MauiAppBuilder` object has a `Services` property of type `IServiceCollection`, which provides a place to register our components, such as views, view models, and services for dependency injection. Any components registered with the `Services` property will be provided to the dependency injection container when the `MauiAppBuilder.Build` method is called.
 
-At runtime, the container must know which implementation of the services are being requested in order to instantiate them for the requested objects. In the eShop multi-platform app, the `IAppEnvironmentService`, `IDialogService` , `INavigationService`, and `ISettingsService` interfaces need to be resolved before it can instantiate a `ProfileViewModel` object. This involves the container performing the following actions:
+At runtime, the container must know which implementation of the services are being requested in order to instantiate them for the requested objects. In the eShop multi-platform app, the `IAppEnvironmentService`, `IDialogService`, `INavigationService`, and `ISettingsService` interfaces need to be resolved before it can instantiate a `ProfileViewModel` object. This involves the container performing the following actions:
 
 - Deciding how to instantiate an object that implements the interface. This is known as *registration*.
 - Instantiating the object that implements the required interface and the `ProfileViewModel` object. This is known as *resolution*.