Skip to content

Commit 3678685

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/visualstudio-docs-pr into broken-link-fix-Mikejo5000
2 parents c05e924 + b71ebe9 commit 3678685

File tree

3,823 files changed

+71078
-42214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,823 files changed

+71078
-42214
lines changed

.docutune/config/docutune-visualstudio-docs-pr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
"*-caution-*",
5353
"abbreviation-linq-language-integrated-query",
5454
"casing-prefixes",
55-
"product-microsoft-visual-studio"
55+
"product-microsoft-visual-studio",
56+
"formatting-minimum-0002",
57+
"invalid-compound-word-verb-0002-005"
5658
]
5759
}

.github/policies/auto-merge.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,29 @@ name: GitOps.PullRequestIssueManagement
33
description: GitOps.PullRequestIssueManagement primitive
44
owner:
55
resource: repository
6-
disabled: false
6+
disabled: true
77
where:
88
configuration:
99
resourceManagementConfiguration:
1010
eventResponderTasks:
1111
- description: Auto-merge PRs to live labeled with auto-merge
1212
triggerOnOwnActions: true
1313
if:
14-
- payloadType: Pull_Request
15-
- labelAdded:
16-
label: ':octocat: auto-merge'
17-
- targetsBranch:
18-
branch: live
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: live
19+
- isActivitySender:
20+
user: microsoft-github-policy-service[bot]
1921
then:
20-
- enableAutoMerge:
21-
mergeMethod: Merge
22+
- enableAutoMerge:
23+
mergeMethod: Merge
2224

2325
- description: Don't auto-merge PRs with auto-merge label removed
2426
if:
25-
- payloadType: Pull_Request
26-
- labelRemoved:
27-
label: ':octocat: auto-merge'
27+
- payloadType: Pull_Request
28+
- labelRemoved:
29+
label: ':octocat: auto-merge'
2830
then:
29-
- disableAutoMerge
31+
- disableAutoMerge

.github/policies/label-prs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: GitOps.PullRequestIssueManagement
33
description: GitOps.PullRequestIssueManagement primitive
44
owner:
55
resource: repository
6-
disabled: false
6+
disabled: true
77
where:
88
configuration:
99
resourceManagementConfiguration:
@@ -22,3 +22,5 @@ configuration:
2222
then:
2323
- addLabel:
2424
label: ':octocat: auto-merge'
25+
- removeLabel:
26+
label: 'do-not-merge'

.github/policies/scheduled-pr.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,42 @@
11
name: GitOps.PullRequestIssueManagement - Scheduled PRs
22
description: Creates pull requests on a schedule
33
resource: repository
4-
4+
disabled: true
55
where:
66
configuration:
77
resourceManagementConfiguration:
88
scheduledSearches:
9-
- description: Push to live branch (scheduled publish)
9+
- description: Push to live branch (scheduled 10 AM publish)
1010
frequencies:
1111
- daily:
12-
time: 00:0
12+
time: 17:00
1313
filters: []
1414
actions:
1515
- createPullRequest:
1616
head: main
1717
base: live
1818
title: Merge main into live
1919
body: Please don't squash-merge this PR.
20+
- description: Push to live branch (scheduled publish 5 PM)
21+
frequencies:
22+
- daily:
23+
time: 1:00
24+
filters: []
25+
actions:
26+
- createPullRequest:
27+
head: main
28+
base: live
29+
title: Merge main into live
30+
body: Please don't squash-merge this PR.
31+
- description: Push to live branch (scheduled publish 1 AM)
32+
frequencies:
33+
- daily:
34+
time: 9:00
35+
filters: []
36+
actions:
37+
- createPullRequest:
38+
head: main
39+
base: live
40+
title: Merge main into live
41+
body: Please don't squash-merge this PR.
42+

.github/workflows/clean-repo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515

1616
steps:
17-
- uses: actions/checkout@v4.1.7
17+
- uses: actions/checkout@v4.2.2
1818

1919
# Call clean repo
2020
- name: Clean repo
@@ -39,7 +39,7 @@ jobs:
3939

4040
# Create the PR for the work done by the "clean repo" tool
4141
- name: create-pull-request
42-
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
42+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
4343
with:
4444
branch: create-cleanrepo-pull-request/patch
4545
title: "Monthly chores: Automated repo cleanup"

.github/workflows/whats-new.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2222

2323
- name: "Print manual run reason"
2424
if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -41,7 +41,7 @@ jobs:
4141
savefile: './docs/ide/whats-new-visual-studio-docs.md'
4242

4343
- name: create-pull-request
44-
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
44+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
4545
with:
4646
branch: create-whatsnew-pull-request/patch
4747
title: "What's new article"

.openpublishing.build.ps1

Lines changed: 0 additions & 17 deletions
This file was deleted.

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"moniker_ranges": [],
1111
"open_to_public_contributors": true,
1212
"type_mapping": {
13-
"Conceptual": "Content"
13+
"Conceptual": "Content",
14+
"ZonePivotGroups": "Toc"
1415
},
1516
"build_entry_point": "docs",
1617
"template_folder": "_themes"

0 commit comments

Comments
 (0)