Skip to content

Commit 491db25

Browse files
author
sijiameng
committed
merge
2 parents 0d1b692 + 959f637 commit 491db25

File tree

87 files changed

+2432
-204
lines changed

Some content is hidden

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

87 files changed

+2432
-204
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 }}

‎sharepoint/docs-conceptual/sharepoint-online/introduction-sharepoint-online-management-shell.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SharePoint Online PowerShell commands can be very efficient for batch operations
1111

1212
## Getting Started with SharePoint Online PowerShell
1313

14-
To use SharePoint Online PowerShell commands, you must have the SharePoint Admin role or Global Administrator role in Microsoft 365.
14+
To use SharePoint Online PowerShell commands, you must have the SharePoint Admin role in Microsoft 365.
1515

1616
You must install the SharePoint Online Management Shell module and connect to the SharePoint Online service. For more information, see [Connect SharePoint Online](connect-sharepoint-online.md).
1717

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOContentSecurityPolicy.md‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
external help file:
3+
Module Name: Microsoft.Online.SharePoint.PowerShell
4+
online version: https://learn.microsoft.com/powershell/module/sharepoint-online/add-spocontentsecuritypolicy
5+
applicable: SharePoint Online
6+
title: Add-SPOContentSecurityPolicy
7+
schema: 2.0.0
8+
author: jaobrie
9+
ms.author: jaobrie
10+
manager: ryannak
11+
ms.reviewer:
12+
---
13+
14+
# Add-SPOContentSecurityPolicy
15+
16+
## SYNOPSIS
17+
18+
Adds a source to the **Content Security Policy** configuration.
19+
20+
## SYNTAX
21+
22+
### Default
23+
24+
```powershell
25+
Add-SPOContentSecurityPolicy [-Source] <String>
26+
```
27+
28+
## DESCRIPTION
29+
30+
Adds a source to the **Content Security Policy** configuration.
31+
The source will be added to the `script-src` directive during construction of the `Content-Security-Policy` header.
32+
In multi-geo environments, **Content Security Policy** configuration is unique to each geo.
33+
34+
## PARAMETERS
35+
36+
### -Source
37+
38+
Source to be added to the **Content Security Policy** configuration.
39+
40+
```yaml
41+
Type: String
42+
Parameter Sets: (All)
43+
Aliases:
44+
Applicable: SharePoint Online
45+
46+
Required: True
47+
Position: 0
48+
Default value: None
49+
Accept pipeline input: False
50+
Accept wildcard characters: False
51+
```
52+
53+
## RELATED LINKS
54+
55+
[Get-SPOContentSecurityPolicy](Get-SPOContentSecurityPolicy.md)
56+
57+
[Remove-SPOContentSecurityPolicy](Remove-SPOContentSecurityPolicy.md)
58+
59+
[Content Security Policy source values](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/Sources#sources)

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOGeoAdministrator.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Add-SPOGeoAdministrator [-ObjectId] <Guid> [<CommonParameters>]
3737
## DESCRIPTION
3838

3939
This cmdlet requires a connection to a multi-geo tenant to run correctly.
40-
You must be a SharePoint Online administrator or Global Administrator to run this cmdlet.
40+
You must be a SharePoint Online administrator to run this cmdlet.
4141

4242
## EXAMPLES
4343

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOListDesign.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ schema: 2.0.0
66
author: reedpamsft
77
ms.author: reedpa
88
ms.reviewer:
9-
ms.topic: List Templates
109
title: Add-SPOListDesign
1110
---
1211

0 commit comments

Comments
 (0)