Skip to content

Commit caedfb7

Browse files
Yixian15Yixian15
authored
Merge branch 'main' into user/yixianpu/add-builtin-font-package-commands
2 parents e9fffa2 + bdf292f commit caedfb7

File tree

132 files changed

+6239
-447
lines changed

Some content is hidden

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

132 files changed

+6239
-447
lines changed

‎.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.redirection.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"redirections": [
3-
{
4-
"source_path": "sharepoint/virtual-folder/sharepoint-online/Add-SPOTenantRestrictedSearchAllowedList.md",
5-
"redirect_url": "/powershell/module/sharepoint-online",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path": "sharepoint/virtual-folder/sharepoint-online/Get-SPOTenantRestrictedSearchAllowedList.md",
10-
"redirect_url": "/powershell/module/sharepoint-online",
11-
"redirect_document_id": false
12-
},
13-
{
14-
"source_path": "sharepoint/virtual-folder/sharepoint-online/Get-SPOTenantRestrictedSearchMode.md",
15-
"redirect_url": "/powershell/module/sharepoint-online",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path": "sharepoint/virtual-folder/sharepoint-online/Remove-SPOTenantRestrictedSearchAllowedList.md",
20-
"redirect_url": "/powershell/module/sharepoint-online",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path": "sharepoint/virtual-folder/sharepoint-online/Set-SPOTenantRestrictedSearchMode.md",
25-
"redirect_url": "/powershell/module/sharepoint-online",
26-
"redirect_document_id": false
27-
}
28-
]
2+
"redirections": [
3+
{
4+
"source_path": "sharepoint/virtual-folder/sharepoint-online/Add-SPOTenantRestrictedSearchAllowedList.md",
5+
"redirect_url": "/powershell/module/sharepoint-online",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "sharepoint/virtual-folder/sharepoint-online/Get-SPOTenantRestrictedSearchAllowedList.md",
10+
"redirect_url": "/powershell/module/sharepoint-online",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "sharepoint/virtual-folder/sharepoint-online/Get-SPOTenantRestrictedSearchMode.md",
15+
"redirect_url": "/powershell/module/sharepoint-online",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "sharepoint/virtual-folder/sharepoint-online/Remove-SPOTenantRestrictedSearchAllowedList.md",
20+
"redirect_url": "/powershell/module/sharepoint-online",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "sharepoint/virtual-folder/sharepoint-online/Set-SPOTenantRestrictedSearchMode.md",
25+
"redirect_url": "/powershell/module/sharepoint-online",
26+
"redirect_document_id": false
27+
}
28+
]
2929
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Anyone who is interested can contribute to the topics. When you contribute, your
66

77
### Quickly update an article using GitHub.com
88

9-
Contributors who only make infrequent or small updates can edit the file directly on GitHub.com without having to install any additional software. This article shows you how. [This two-minute video](https://www.microsoft.com/videoplayer/embed/RE1XQTG) also covers how to contribute.
9+
Contributors who only make infrequent or small updates can edit the file directly on GitHub.com without having to install any additional software. This article shows you how. [This two-minute video](https://learn-video.azurefd.net/vod/player?id=b5167c5a-9c69-499b-99ac-e5467882bc92) also covers how to contribute.
1010

1111
1. Make sure you're signed in to GitHub.com with your GitHub account.
1212
2. Browse to the page you want to edit on Microsoft Learn.

‎sharepoint/docfx.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@
5555
"garycentric",
5656
"v-stchambers",
5757
"v-stsavell",
58-
"American-Dipper"
58+
"American-Dipper",
59+
"padmagit77",
60+
"aditisrivastava07",
61+
"Ruchika-mittal01"
5962
]
6063
},
6164
"fileMetadata": {

‎sharepoint/docs-conceptual/index.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ metadata:
77
title: SharePoint PowerShell # Required; page title displayed in search results. Include the brand. < 60 chars.
88
description: Use PowerShell cmdlets for SharePoint in Microsoft 365 and SharePoint Server # Required; article description that is displayed in search results. < 160 chars.
99
ms.service: sharepoint-online #Required; service per approved list. service slug assigned to your service by ACOM.
10-
ms.subservice: subservice
1110
ms.topic: landing-page # Required
1211
ms.collection: M365-collaboration
1312
author: kaarins #Required; your GitHub user alias, with correct capitalization.
1413
ms.author: kaarins #Required; microsoft alias of author; optional team alias.
1514
ms.date: 03/16/2020 #Required; mm/dd/yyyy format
16-
localization_priority: Priority
15+
ms.localizationpriority: Medium
1716

1817
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
1918

0 commit comments

Comments
 (0)