Skip to content

Commit 20d0da5

Browse files
committed
Merged main into live
2 parents 8f13b43 + f137951 commit 20d0da5

16 files changed

+151
-59
lines changed

.github/policies/auto-merge.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Auto-merge PRs to live labeled with auto-merge
12+
triggerOnOwnActions: true
13+
if:
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: live
19+
then:
20+
- enableAutoMerge:
21+
mergeMethod: Merge
22+
23+
- description: Don't auto-merge PRs with auto-merge label removed
24+
if:
25+
- payloadType: Pull_Request
26+
- labelRemoved:
27+
label: ':octocat: auto-merge'
28+
then:
29+
- disableAutoMerge

.github/policies/label-prs.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Label publish PRs from the microsoft-github-policy-service bot
12+
triggerOnOwnActions: true
13+
if:
14+
- payloadType: Pull_Request
15+
- isAction:
16+
action: Opened
17+
- isActivitySender:
18+
user: microsoft-github-policy-service[bot]
19+
- titleContains:
20+
pattern: Merge main into live
21+
isRegex: False
22+
then:
23+
- addLabel:
24+
label: ':octocat: auto-merge'

.github/policies/scheduled-pr.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: GitOps.PullRequestIssueManagement - Scheduled PRs
2+
description: Creates pull requests on a schedule
3+
resource: repository
4+
5+
where:
6+
configuration:
7+
resourceManagementConfiguration:
8+
scheduledSearches:
9+
- description: Push to live branch (scheduled publish)
10+
frequencies:
11+
- daily:
12+
time: 00:0
13+
filters: []
14+
actions:
15+
- createPullRequest:
16+
head: main
17+
base: live
18+
title: Merge main into live
19+
body: Please don't squash-merge this PR.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: ghogen
77
manager: mijacobs
88
ms.subservice: bridge
99
ms.topic: tutorial
10-
ms.date: 08/11/2022
10+
ms.date: 06/20/2024
1111
---
1212

1313
# Tutorial: Run and debug locally with Bridge to Kubernetes on Visual Studio

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

Lines changed: 48 additions & 39 deletions
Large diffs are not rendered by default.
Loading
Loading
Loading
Loading
Loading
Loading
Loading

docs/azure/toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
items:
12
- name: Develop applications for Azure with Visual Studio
23
href: index.yml
34
expanded: true

docs/deployment/publish-overview.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Publish tool for ASP.NET, .NET Core, & Python apps
33
description: Explore the Publish tool in Visual Studio and deploy ASP.NET, .NET Core, and Python applications with a publishing profile (.pubxml file).
4-
ms.date: 10/14/2021
4+
ms.date: 06/19/2024
55
ms.topic: overview
66
dev_langs:
77
- "FSharp"
@@ -23,14 +23,20 @@ For ASP.NET, .NET Core, and Python apps, you can use the Publish tool to deploy
2323

2424
## What is Publish?
2525

26-
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.
26+
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.
2727

28-
## How does it work?
28+
![Screenshot showing Publish options.](../deployment/media/quickstart-publish.png)
2929

30-
Publish uses *profiles* (.pubxml files) to allow for multiple project configurations and multiple publish targets for a single project.
30+
The deployment options are covered elsewhere in the documentation. See [A first look at deployment](./deploying-applications-services-and-components.md).
31+
32+
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.
3133

3234
![publish profiles](./media/publish-profiles.png)
3335

36+
Under **More actions**, you can find options to delete the publish profile, edit settings, or restore it.
37+
38+
## Publish profile files (.pubxml files)
39+
3440
The contents of the profile are XML and based on MSBuild.
3541

3642
![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
4955

5056
![dependencies during publish](./media/publish-dependencies.png)
5157

52-
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.
58+
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).
5359

5460
## Next steps
5561

docs/extensibility/internals/command-implementation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public int QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, Int
9898
return VSConstants.S_OK;
9999
}
100100
}
101-
return Constants.OLECMDERR_E_NOTSUPPORTED;
102101
}
102+
return Constants.OLECMDERR_E_NOTSUPPORTED;
103103
}
104104
```
105105

@@ -115,9 +115,9 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
115115
{
116116
if (pguidCmdGroup == VSConstants.GUID_VSStandardCommandSet97)
117117
{
118-
if (nCmdID ==(uint) uint)VSConstants.VSStd2KCmdID.RIGHT)
118+
if (nCmdID == (uint)VSConstants.VSStd2KCmdID.RIGHT)
119119
{
120-
//execute the command
120+
// execute the command
121121
return VSConstants.S_OK;
122122
}
123123
}

docs/ide/index.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
author: ghogen
1414
ms.author: ghogen
1515
ms.manager: mijacobs
16-
ms.date: 06/03/2023
16+
ms.date: 06/20/2024
1717
ms.custom: vs-acquisition
1818

1919
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -45,24 +45,28 @@ landingContent:
4545
links:
4646
- text: Start in the code editor
4747
url: ../get-started/tutorial-editor.md
48+
- linkListType: overview
49+
links:
50+
- text: Track versions with Git
51+
url: ../version-control/git-with-visual-studio.md
4852
- linkListType: how-to-guide
4953
links:
5054
- text: Personalize the IDE
5155
url: ../ide/personalizing-the-visual-studio-ide.md
56+
- text: Create a new project
57+
url: create-new-project.md
58+
- text: Search code and features
59+
url: visual-studio-search.md
5260
- text: Compile and build
5361
url: ../ide/compiling-and-building-in-visual-studio.md
54-
- text: Debug code
55-
url: ../debugger/debugger-feature-tour.md
56-
- text: Write tests
57-
url: ../test/getting-started-with-unit-testing.md
58-
- text: Analyze code quality
59-
url: ../code-quality/roslyn-analyzers-overview.md
60-
- text: Publish a web site
61-
url: ../deployment/quickstart-deploy-to-a-web-site.md
62-
- text: Access data
63-
url: ../data-tools/accessing-data-in-visual-studio.md
62+
- text: Run a program
63+
url: ../get-started/csharp/run-program.md
6464
- text: Productivity features
6565
url: ../ide/productivity-features.md
66+
- text: Open a developer command prompt
67+
url: reference/command-prompt-powershell.md
68+
- text: Manage extensions
69+
url: finding-and-using-visual-studio-extensions.md
6670

6771
# Card
6872
- title: Develop in your language

0 commit comments

Comments
 (0)