Skip to content

Commit 8f0db52

Browse files
mkbond007mkbond007
authored
Merge branch 'main' into patch-26
2 parents c227bd3 + 4133496 commit 8f0db52

11 files changed

+156
-31
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 }}

‎exchange/exchange-ps/exchange/New-Label.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ Accept wildcard characters: False
722722
The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:
723723

724724
- `${Consumer.PrincipalName}`: Required. The value is the user principal name (UPN) of the user.
725+
- `${Device.DateTime}`: Optional. The value is current date/time of the device used to view the document.
725726

726727
This parameter is meaningful only when the ApplyDynamicWatermarkingEnabled parameter value is $true.
727728

‎exchange/exchange-ps/exchange/Remove-AuthenticationPolicy.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,7 @@ Accept wildcard characters: False
6666
### -AllowLegacyExchangeTokens
6767
This parameter is available only in the cloud-based service.
6868
69-
The AllowLegacyExchangeTokens switch specifies whether to allow legacy Exchange tokens. You don't need to specify a value with this switch.
70-
71-
Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.
72-
73-
**Important**:
74-
75-
- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
76-
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.
77-
78-
For more information on the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
69+
This parameter is reserved for internal Microsoft use.
7970
8071
```yaml
8172
Type: SwitchParameter

‎exchange/exchange-ps/exchange/Set-AuthenticationPolicy.md

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -354,16 +354,7 @@ Accept wildcard characters: False
354354
### -AllowLegacyExchangeTokens
355355
This parameter is available only in the cloud-based service.
356356

357-
The AllowLegacyExchangeTokens switch specifies whether to allow legacy Exchange tokens. You don't need to specify a value with this switch.
358-
359-
Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.
360-
361-
**Important**:
362-
363-
- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
364-
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.
365-
366-
For more information on the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
357+
This parameter is reserved for internal Microsoft use.
367358

368359
```yaml
369360
Type: SwitchParameter
@@ -549,16 +540,7 @@ Accept wildcard characters: False
549540
### -BlockLegacyExchangeTokens
550541
This parameter is available only in the cloud-based service.
551542

552-
The BlockLegacyExchangeTokens switch specifies whether to block legacy Exchange tokens. You don't need to specify a value with this switch.
553-
554-
Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.
555-
556-
**Important**:
557-
558-
- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
559-
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.
560-
561-
For more information about the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
543+
This parameter is reserved for internal Microsoft use.
562544

563545
```yaml
564546
Type: SwitchParameter

‎exchange/exchange-ps/exchange/Set-Label.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ Accept wildcard characters: False
720720
The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:
721721

722722
- **"\`${Consumer.PrincipalName}**": Required. The value is the user principal name (UPN) of the user.
723+
- **"\`${Device.DateTime}**": Optional. The value is current date/time of the device used to view the document.
723724

724725
**Tip** The back quotation mark character ( \` ) is required as an escape character for the dollar sign character ( $ ) in PowerShell. For more information, see [Escape characters in Exchange PowerShell](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax#escape-characters-in-exchange-powershell).
725726

‎teams/teams-ps/teams/New-CsTeamsWorkLocationDetectionPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ author: artemiykozlov
1111
# New-CsTeamsWorkLocationDetectionPolicy
1212

1313
## SYNOPSIS
14-
This cmdlet is used to create a new instance of the TeamsWorkLocationDetectionPolicy.
14+
This cmdlet is used to create a new instance of the TeamsWorkLocationDetectionPolicy. The end user experience utilizing this policy is currently under development and has not been made generally available. You can see updates on when it will be generally available at [Microsoft 365 Roadmap | Microsoft 365](https://www.microsoft.com/en-us/microsoft-365/roadmap?msockid=287ab43847c06d0008cca05b46076c18&filters=&searchterms=automatically%2Cset%2Cwork%2Clocation).
1515

1616
## SYNTAX
1717

0 commit comments

Comments
 (0)