Skip to content

Repo sync for protected branch #10289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
86f3d81
edit pass
ktoliver Jun 18, 2024
105a0b9
Review and update, add more about basic Publish operations
ghogen Jun 19, 2024
6a6e79f
edits
ktoliver Jun 20, 2024
e6fe3a6
last edits
ktoliver Jun 20, 2024
3fec9a2
Review and update date
ghogen Jun 20, 2024
cc7b17e
Merge pull request #12697 from ktoliver/261624-vs
ShawnJackson Jun 20, 2024
57e60d9
Update index.yml
ghogen Jun 20, 2024
e9fa2ba
Merge pull request #12711 from MicrosoftDocs/ghogen-patch-46
prmerger-automator[bot] Jun 20, 2024
3a202bb
Merge pull request #12710 from MicrosoftDocs/repo_sync_working_branch
Albertyang0 Jun 20, 2024
94f472a
Fix per user feedback, add another link
anandmeg Jun 20, 2024
0f8b011
Add GitOps policy for scheduled publish PR
ghogen Jun 20, 2024
17d8ca3
Merge pull request #12706 from ghogen/publish-overview-updates
JamesJBarnett Jun 20, 2024
5601340
Add policy files to label and merge PRs
ghogen Jun 20, 2024
fdcaff2
Update .github/policies/scheduled-pr.yml
ghogen Jun 20, 2024
c597b74
Add addl related links
anandmeg Jun 20, 2024
34a2e6b
Merge pull request #12716 from ghogen/policy-automation3
ghogen Jun 20, 2024
89dbf37
Update bot username
ghogen Jun 20, 2024
d1cedd7
Merge pull request #12718 from ghogen/policy-automation3
ghogen Jun 20, 2024
d644861
Update docs/ide/index.yml
ghogen Jun 20, 2024
4a5f509
Update time to 0 (midnight UTC or 5 pm Redmond time)
ghogen Jun 20, 2024
0cf632c
Merge pull request #12719 from MicrosoftDocs/ghogen-patch-51
ghogen Jun 20, 2024
f137951
Merge pull request #12712 from MicrosoftDocs/ghogen-patch-48
prmerger-automator[bot] Jun 20, 2024
20d0da5
Merged main into live
mijacobs Jun 21, 2024
ddb1d2d
Merge pull request #12714 from anandmeg/uuf-226276
prmerger-automator[bot] Jun 21, 2024
f29c263
Merged main into live
mijacobs Jun 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/policies/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -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
24 changes: 24 additions & 0 deletions .github/policies/label-prs.yml
Original file line number Diff line number Diff line change
@@ -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'
19 changes: 19 additions & 0 deletions .github/policies/scheduled-pr.yml
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion bridge/articles/bridge-to-kubernetes-vs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
87 changes: 48 additions & 39 deletions docs/azure/cloud-services-extended-support.md

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/azure/toc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
items:
- name: Develop applications for Azure with Visual Studio
href: index.yml
expanded: true
Expand Down
16 changes: 11 additions & 5 deletions docs/deployment/publish-overview.md
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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)
Expand All @@ -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

Expand Down
26 changes: 15 additions & 11 deletions docs/ide/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions docs/ide/managing-application-settings-dotnet.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)