Merge pull request #10289 from MicrosoftDocs/main638545467659934074sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

.github/policies/auto-merge.yml

@@ -0,0 +1,29 @@
+id:
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - description: Auto-merge PRs to live labeled with auto-merge
+      triggerOnOwnActions: true
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: ':octocat: auto-merge'
+      - targetsBranch:
+          branch: live
+      then:
+      - enableAutoMerge:
+          mergeMethod: Merge
+
+    - description: Don't auto-merge PRs with auto-merge label removed
+      if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: ':octocat: auto-merge'
+      then:
+      - disableAutoMerge

.github/policies/label-prs.yml

@@ -0,0 +1,24 @@
+id:
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - description: Label publish PRs from the microsoft-github-policy-service bot
+      triggerOnOwnActions: true
+      if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: microsoft-github-policy-service[bot]
+      - titleContains:
+          pattern: Merge main into live
+          isRegex: False
+      then:
+      - addLabel:
+          label: ':octocat: auto-merge'

.github/policies/scheduled-pr.yml

@@ -0,0 +1,19 @@
+name: GitOps.PullRequestIssueManagement - Scheduled PRs
+description: Creates pull requests on a schedule
+resource: repository
+
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: Push to live branch (scheduled publish)
+      frequencies:
+      - daily:
+          time: 00:0
+      filters: []
+      actions:
+      - createPullRequest:
+          head: main
+          base: live
+          title: Merge main into live
+          body: Please don't squash-merge this PR.

bridge/articles/bridge-to-kubernetes-vs.md

@@ -7,7 +7,7 @@ author: ghogen
 manager: mijacobs
 ms.subservice: bridge
 ms.topic: tutorial 
-ms.date: 08/11/2022
+ms.date: 06/20/2024
 ---
 
 # Tutorial: Run and debug locally with Bridge to Kubernetes on Visual Studio

docs/azure/cloud-services-extended-support.md

@@ -1,3 +1,4 @@
+items:
 - name: Develop applications for Azure with Visual Studio
   href: index.yml
   expanded: true

docs/azure/media/cloud-services-extended-support/diagnostics-settings.png

@@ -1,7 +1,7 @@
 ---
 title: Publish tool for ASP.NET, .NET Core, & Python apps
 description: Explore the Publish tool in Visual Studio and deploy ASP.NET, .NET Core, and Python applications with a publishing profile (.pubxml file).
-ms.date: 10/14/2021
+ms.date: 06/19/2024
 ms.topic: overview
 dev_langs:
   - "FSharp"
@@ -23,14 +23,20 @@ For ASP.NET, .NET Core, and Python apps, you can use the Publish tool to deploy
 
 ## What is Publish?
 
-The Publish tool helps you deploy your application to various destinations. Get started by right-clicking your project in Solution Explorer and selecting **Publish** from the context menu.
+The Publish tool helps you deploy your application to various destinations. Get started by right-clicking your project in Solution Explorer and selecting **Publish** from the context menu. If you haven't published the project previously, you're asked to choose what service you want to publish to, which could be an IIS server, an Azure service like App Service, a Docker container registry, or an FTP server.
 
-## How does it work?
+![Screenshot showing Publish options.](../deployment/media/quickstart-publish.png)
 
-Publish uses *profiles* (.pubxml files) to allow for multiple project configurations and multiple publish targets for a single project.
+The deployment options are covered elsewhere in the documentation. See [A first look at deployment](./deploying-applications-services-and-components.md).
+
+If you've already published the project, you'll see the **Publish** screen, which provides links to the deployed resources, information about the deployment, and a **Publish** button to republish the application. You can also use the **New** button to go through the publish process again, which creates a new publish profile. Publish uses *profiles* (`.pubxml` files) to allow for multiple project configurations and multiple publish targets for a single project.
 
 ![publish profiles](./media/publish-profiles.png)
 
+Under **More actions**, you can find options to delete the publish profile, edit settings, or restore it.
+
+## Publish profile files (.pubxml files)
+
 The contents of the profile are XML and based on MSBuild.
 
 ![publish profile example contents](./media/publish-profile-example-contents.png)
@@ -49,7 +55,7 @@ When you use the Publish tool to deploy your application to Azure, you get the o
 
 ![dependencies during publish](./media/publish-dependencies.png)
 
-The idea is that you may want to connect to a different SQL database or a different Storage account or a different Key Vault for different environments like testing, QA, pre-prod, and so forth.
+The idea is that you may want to connect to a different SQL database or a different Storage account or a different Key Vault for different environments like testing, QA, pre-prod, and so forth. See [Visual Studio Connected Services](../azure/overview-connected-services.md).
 
 ## Next steps
 

docs/azure/media/cloud-services-extended-support/extended-support-dialog.png

@@ -13,7 +13,7 @@ metadata:
   author: ghogen
   ms.author: ghogen
   ms.manager: mijacobs
-  ms.date: 06/03/2023
+  ms.date: 06/20/2024
   ms.custom: vs-acquisition
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -45,24 +45,28 @@ landingContent:
         links:
           - text: Start in the code editor
             url: ../get-started/tutorial-editor.md
+      - linkListType: overview
+        links:
+          - text: Track versions with Git
+            url: ../version-control/git-with-visual-studio.md
       - linkListType: how-to-guide
         links:
           - text: Personalize the IDE
             url: ../ide/personalizing-the-visual-studio-ide.md
+          - text: Create a new project
+            url: create-new-project.md
+          - text: Search code and features
+            url: visual-studio-search.md
           - text: Compile and build
             url: ../ide/compiling-and-building-in-visual-studio.md
-          - text: Debug code
-            url: ../debugger/debugger-feature-tour.md
-          - text: Write tests
-            url: ../test/getting-started-with-unit-testing.md
-          - text: Analyze code quality
-            url: ../code-quality/roslyn-analyzers-overview.md
-          - text: Publish a web site
-            url: ../deployment/quickstart-deploy-to-a-web-site.md
-          - text: Access data
-            url: ../data-tools/accessing-data-in-visual-studio.md
+          - text: Run a program
+            url: ../get-started/csharp/run-program.md
           - text: Productivity features
             url: ../ide/productivity-features.md
+          - text: Open a developer command prompt
+            url: reference/command-prompt-powershell.md
+          - text: Manage extensions
+            url: finding-and-using-visual-studio-extensions.md
 
   # Card
   - title: Develop in your language

docs/azure/media/cloud-services-extended-support/publish-commands-on-menu.png

@@ -1,7 +1,7 @@
 ---
 title: Manage application settings (.NET)
 description: Manage application settings that aren't included in the application code but are needed at runtime with the Visual Studio IDE.
-ms.date: 05/31/2024
+ms.date: 06/20/2024
 ms.topic: conceptual
 f1_keywords:
 - msvse_settingsdesigner.err.nameblank
@@ -111,4 +111,7 @@ For general information about accessing application settings through the `Settin
 
 ## Related content
 
-- [Access application settings (.NET Framework)](/dotnet/visual-basic/developing-apps/programming/app-settings/accessing-application-settings)
+- [Add an app.config file (C#)](how-to-add-app-config-file.md)
+- [Configure apps (.NET Framework)](/dotnet/framework/configure-apps/index)
+- [Access application settings (Visual Basic)](/dotnet/visual-basic/developing-apps/programming/app-settings/accessing-application-settings)
+- [Using application settings and user settings (Windows Forms)](/dotnet/framework/winforms/advanced/using-application-settings-and-user-settings)