Skip to content

Commit fd0b26e

Browse files
chrisdachrisda
authored
Merge branch 'main' into patch-421
2 parents 61fa2d6 + 89b97b6 commit fd0b26e

File tree

1,377 files changed

+49556
-34197
lines changed

Some content is hidden

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

1,377 files changed

+49556
-34197
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: New feedback experience
4+
url: https://learn.microsoft.com/office/new-feedback
5+
about: We’re transitioning our feedback experience away from GitHub Issues. For more information, select Open.

‎.github/workflows/AutoLabelAssign.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Assign and label PR
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
18+
with:
19+
WorkflowId: ${{ github.event.workflow_run.id }}
20+
OrgRepo: ${{ github.repository }}
21+
secrets:
22+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
23+
24+
label-assign:
25+
name: Run assign and label
26+
needs: [download-payload]
27+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
28+
with:
29+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
30+
AutoAssignUsers: 1
31+
AutoLabel: 1
32+
ExcludedUserList: '["user1", "user2"]'
33+
ExcludedBranchList: '["branch1", "branch2"]'
34+
secrets:
35+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/AutoLabelMsftContributor.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}

‎.github/workflows/BackgroundTasks.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Save payload data
16+
env:
17+
PayloadJson: ${{ toJSON(github) }}
18+
AccessToken: ${{ github.token }}
19+
run: |
20+
mkdir -p ./pr
21+
echo $PayloadJson > ./pr/PayloadJson.json
22+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: PayloadJson
26+
path: pr/

‎.github/workflows/LiveMergeCheck.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/PrFileCount.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR file count less than limit
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, labeled, unlabeled, edited]
11+
12+
jobs:
13+
14+
file-count:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ProtectedFiles.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: PR has no protected files
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on: [pull_request_target]
9+
10+
jobs:
11+
12+
protected-files:
13+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
14+
with:
15+
PayloadJson: ${{ toJSON(github) }}
16+
secrets:
17+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.openpublishing.build.ps1

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

‎.openpublishing.publish.config.json

Lines changed: 22 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
]
5151
},
5252
{
53-
"docset_name": "sharepoint-ps",
54-
"build_source_folder": "sharepoint",
55-
"build_output_subfolder": "sharepoint-ps",
53+
"docset_name": "skype-ps",
54+
"build_source_folder": "skype",
55+
"build_output_subfolder": "skype-ps",
5656
"locale": "en-us",
5757
"monikers": [],
5858
"moniker_ranges": [],
@@ -66,12 +66,20 @@
6666
},
6767
"build_entry_point": "docs",
6868
"template_folder": "_themes",
69-
"version": 0
69+
"version": 0,
70+
"customized_tasks": {
71+
"docset_prebuild": [
72+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
73+
]
74+
},
75+
"monikerPath": [
76+
"mapping/monikerMapping.json"
77+
]
7078
},
7179
{
72-
"docset_name": "skype-ps",
73-
"build_source_folder": "skype",
74-
"build_output_subfolder": "skype-ps",
80+
"docset_name": "spmt-ps",
81+
"build_source_folder": "spmt",
82+
"build_output_subfolder": "spmt-ps",
7583
"locale": "en-us",
7684
"monikers": [],
7785
"moniker_ranges": [],
@@ -86,11 +94,6 @@
8694
"build_entry_point": "docs",
8795
"template_folder": "_themes",
8896
"version": 0,
89-
"customized_tasks": {
90-
"docset_prebuild": [
91-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
92-
]
93-
},
9497
"monikerPath": [
9598
"mapping/monikerMapping.json"
9699
]
@@ -141,28 +144,6 @@
141144
"mapping/monikerMapping.json"
142145
]
143146
},
144-
{
145-
"docset_name": "spmt-ps",
146-
"build_source_folder": "spmt",
147-
"build_output_subfolder": "spmt-ps",
148-
"locale": "en-us",
149-
"monikers": [],
150-
"moniker_ranges": [],
151-
"open_to_public_contributors": true,
152-
"type_mapping": {
153-
"Conceptual": "Content",
154-
"ManagedReference": "Content",
155-
"RestApi": "Content",
156-
"PowershellModule": "Content",
157-
"PowershellCmdlet": "Content"
158-
},
159-
"build_entry_point": "docs",
160-
"template_folder": "_themes",
161-
"version": 0,
162-
"monikerPath": [
163-
"mapping/monikerMapping.json"
164-
]
165-
},
166147
{
167148
"docset_name": "whiteboard-ps",
168149
"build_source_folder": "whiteboard",
@@ -195,10 +176,7 @@
195176
"sync_notification_subscribers": [],
196177
"branches_to_filter": [],
197178
"git_repository_branch_open_to_public_contributors": "main",
198-
"skip_source_output_uploading": false,
199179
"need_preview_pull_request": true,
200-
"enable_incremental_build": false,
201-
"contribution_branch_mappings": {},
202180
"dependent_repositories": [
203181
{
204182
"path_to_root": "_themes",
@@ -212,12 +190,16 @@
212190
"Publish"
213191
]
214192
},
215-
"need_generate_pdf_url_template": false,
216193
"targets": {
217194
"Pdf": {
218195
"template_folder": "_themes.pdf"
219196
}
220197
},
198+
"docs_build_engine": {},
199+
"skip_source_output_uploading": false,
200+
"enable_incremental_build": false,
201+
"contribution_branch_mappings": {},
202+
"need_generate_pdf_url_template": false,
221203
"need_generate_intellisense": false,
222204
"dependent_packages": [
223205
{
@@ -227,8 +209,5 @@
227209
"target_framework": "net45",
228210
"version": "latest"
229211
}
230-
],
231-
"docs_build_engine": {
232-
"name": "docfx_v3"
233-
}
234-
}
212+
]
213+
}

0 commit comments

Comments
 (0)