Skip to content

Commit 75bc236

Browse files
v-smandalikav-smandalika
authored
Merge branch 'main' into v-smandalika-9375980
2 parents 07011f3 + e22dd4e commit 75bc236

File tree

4,935 files changed

+171022
-339146
lines changed

Some content is hidden

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

4,935 files changed

+171022
-339146
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 }}

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ _site/
44
.optemp/
55
_themes*/
66
.vs/
7+
common/
8+
.vscode/
9+
*.ini
10+
.DS_Store
11+
*.db
12+
\.idea/
713
.local/
814

915
.openpublishing.buildcore.ps1
1016
**/node_modules
11-
12-
\.idea/

‎.openpublishing.publish.config.json‎

Lines changed: 16 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,14 @@
4545
"build_entry_point": "docs",
4646
"template_folder": "_themes",
4747
"version": 0,
48-
"customized_tasks": {
49-
"docset_prebuild": [
50-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
51-
]
52-
},
5348
"monikerPath": [
5449
"mapping/monikerMapping.json"
5550
]
5651
},
5752
{
58-
"docset_name": "sharepoint-ps",
59-
"build_source_folder": "sharepoint",
60-
"build_output_subfolder": "sharepoint-ps",
53+
"docset_name": "skype-ps",
54+
"build_source_folder": "skype",
55+
"build_output_subfolder": "skype-ps",
6156
"locale": "en-us",
6257
"monikers": [],
6358
"moniker_ranges": [],
@@ -82,9 +77,9 @@
8277
]
8378
},
8479
{
85-
"docset_name": "skype-ps",
86-
"build_source_folder": "skype",
87-
"build_output_subfolder": "skype-ps",
80+
"docset_name": "spmt-ps",
81+
"build_source_folder": "spmt",
82+
"build_output_subfolder": "spmt-ps",
8883
"locale": "en-us",
8984
"monikers": [],
9085
"moniker_ranges": [],
@@ -99,11 +94,6 @@
9994
"build_entry_point": "docs",
10095
"template_folder": "_themes",
10196
"version": 0,
102-
"customized_tasks": {
103-
"docset_prebuild": [
104-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
105-
]
106-
},
10797
"monikerPath": [
10898
"mapping/monikerMapping.json"
10999
]
@@ -125,15 +115,7 @@
125115
},
126116
"build_entry_point": "docs",
127117
"template_folder": "_themes",
128-
"version": 0,
129-
"customized_tasks": {
130-
"docset_prebuild": [
131-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
132-
]
133-
},
134-
"monikerPath": [
135-
"mapping/monikerMapping.json"
136-
]
118+
"version": 0
137119
},
138120
{
139121
"docset_name": "teams-ps",
@@ -162,33 +144,6 @@
162144
"mapping/monikerMapping.json"
163145
]
164146
},
165-
{
166-
"docset_name": "spmt-ps",
167-
"build_source_folder": "spmt",
168-
"build_output_subfolder": "spmt-ps",
169-
"locale": "en-us",
170-
"monikers": [],
171-
"moniker_ranges": [],
172-
"open_to_public_contributors": true,
173-
"type_mapping": {
174-
"Conceptual": "Content",
175-
"ManagedReference": "Content",
176-
"RestApi": "Content",
177-
"PowershellModule": "Content",
178-
"PowershellCmdlet": "Content"
179-
},
180-
"build_entry_point": "docs",
181-
"template_folder": "_themes",
182-
"version": 0,
183-
"customized_tasks": {
184-
"docset_prebuild": [
185-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
186-
]
187-
},
188-
"monikerPath": [
189-
"mapping/monikerMapping.json"
190-
]
191-
},
192147
{
193148
"docset_name": "whiteboard-ps",
194149
"build_source_folder": "whiteboard",
@@ -220,16 +175,13 @@
220175
"notification_subscribers": [],
221176
"sync_notification_subscribers": [],
222177
"branches_to_filter": [],
223-
"git_repository_branch_open_to_public_contributors": "master",
224-
"skip_source_output_uploading": false,
178+
"git_repository_branch_open_to_public_contributors": "main",
225179
"need_preview_pull_request": true,
226-
"enable_incremental_build": false,
227-
"contribution_branch_mappings": {},
228180
"dependent_repositories": [
229181
{
230182
"path_to_root": "_themes",
231183
"url": "https://github.com/Microsoft/templates.docs.msft",
232-
"branch": "master",
184+
"branch": "main",
233185
"branch_mapping": {}
234186
}
235187
],
@@ -238,12 +190,16 @@
238190
"Publish"
239191
]
240192
},
241-
"need_generate_pdf_url_template": false,
242193
"targets": {
243194
"Pdf": {
244195
"template_folder": "_themes.pdf"
245196
}
246197
},
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,
247203
"need_generate_intellisense": false,
248204
"dependent_packages": [
249205
{
@@ -253,8 +209,5 @@
253209
"target_framework": "net45",
254210
"version": "latest"
255211
}
256-
],
257-
"docs_build_engine": {
258-
"name": "docfx_v3"
259-
}
260-
}
212+
]
213+
}

0 commit comments

Comments
 (0)