Skip to content

Commit 4608e96

Browse files
Merge branch 'main' into patch-1
2 parents 4737c13 + fce0f71 commit 4608e96

File tree

3 files changed

+54
-37
lines changed

3 files changed

+54
-37
lines changed

.github/workflows/StaleBranch.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5-
5+
6+
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
7+
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.
8+
# The workflow should not be configured to run after "deletion day" so that users can review the branches were deleted.
9+
# Recommendation: configure cron to run on days 1,15-31 where 1 is what's configured in 'DeleteOnDayOfMonth'. If 'DeleteOnDayOfMonth' is set to something else, update cron to run the two weeks leading up to it.
10+
611
on:
712
schedule:
8-
- cron: "0 9 1 * *"
13+
- cron: "0 9 1,15-31 * *"
914

10-
# workflow_dispatch:
15+
workflow_dispatch:
1116

1217

1318
jobs:

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOCrossTenantCompatibilityStatus.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ Get-SPOCrossTenantCompatibilityStatus -PartnerCrossTenantHostUrl <String> [<Comm
2424

2525
## DESCRIPTION
2626

27-
This cmdlet allows you to determine the compatibility with the partner tenant before cross-tenant migration. You must be a SharePoint Administrator to run it.
27+
This cmdlet allows you to determine the compatibility with the partner tenant before cross-tenant migration. You must be a SharePoint Administrator to run it.
28+
29+
> [!NOTE]
30+
> You must run this command on the source tenant only.
2831
2932
## EXAMPLES
3033

sharepoint/sharepoint-ps/sharepoint-online/New-SPOContainerType.md

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,10 @@ This cmdlet creates a new container type of standard or trial status. The standa
1818

1919
## SYNTAX
2020

21-
### ParamSet1
22-
2321
```powershell
24-
New-SPOContainerType [-ContainerTypeName] <String> [-OwningApplicationId] <String> [-ApplicationRedirectUrl] <String> [-GovernableByAdmin] <Boolean> [<CommonParameters>]
22+
New-SPOContainerType [-ContainerTypeName] <String> -OwningApplicationId <Guid> [-ApplicationRedirectUrl <String>] [-TrialContainerType] [-IsPassThroughBilling] [-IsGovernableByAdmin <Boolean>] [-WhatIf] [-Confirm] [<CommonParameters>]
2523
```
2624

27-
### ParamSet2
28-
29-
```powershell
30-
New-SPOContainerType [-ContainerTypeName] <String> [-OwningApplicationId] <String> [-ApplicationRedirectUrl] <String> [-IsPassThroughBilling] [-GovernableByAdmin] <Boolean> [<CommonParameters>]
31-
```
32-
33-
### ParamSet3
34-
35-
```powershell
36-
New-SPOContainerType [–TrialContainerType] [-ContainerTypeName] <String> [-OwningApplicationId] <String> [-ApplicationRedirectUrl] <String> [-GovernableByAdmin] <Boolean> [<CommonParameters>]
37-
```
3825

3926
## DESCRIPTION
4027

@@ -80,48 +67,47 @@ In Example 4, the cmdlet creates a standard container type, ContosoLegal that ha
8067

8168
## PARAMETERS
8269

83-
### -ContainerTypeName
70+
### -ApplicationRedirectUrl
8471

85-
This parameter names your container type for your SharePoint Embedded application.
72+
This parameter specifies the url of that the application should be redirected to.
8673

8774
```yaml
8875
Type: String
8976
Parameter Sets: (All)
9077
Aliases:
9178
Applicable: SharePoint Online
9279

93-
Required: True
80+
Required: False
9481
Position: Named
9582
Default value: None
9683
Accept pipeline input: False
9784
Accept wildcard characters: False
9885
```
9986
100-
### -OwningApplicationId
87+
### -ContainerTypeName
10188
102-
This parameter specifies the ID of the SharePoint Embedded application.
89+
This parameter names your container type for your SharePoint Embedded application.
10390
10491
```yaml
10592
Type: String
106-
Parameter Sets:
93+
Parameter Sets: (All)
10794
Aliases:
10895
Applicable: SharePoint Online
10996

11097
Required: True
111-
Position: Named
98+
Position: 0
11299
Default value: None
113100
Accept pipeline input: False
114101
Accept wildcard characters: False
115102
```
116103
104+
### –GovernableByAdmin
117105
118-
### –TrialContainerType
119-
120-
This parameter is used to specify that the cmdlet is used to create a trial container type and thereby the billing profile need not be provided.
106+
Using `-GovernableByAdmin`, you can decide whether consuming tenant administrators of the application should be provided management capabilities on Microsoft-enabled administrator support, through SharePoint admin center and PowerShell. When not passed, the value is set to True. When set to False, the consuming tenant administrator can perform only read-only actions on containers of the container type, in both SharePoint admin center and PowerShell.
121107

122108
```yaml
123-
Type: String
124-
Parameter Sets:
109+
Type: Boolean
110+
Parameter Sets: (All)
125111
Aliases:
126112
Applicable: SharePoint Online
127113
@@ -137,8 +123,8 @@ Accept wildcard characters: False
137123
This parameter is used to create a direct to customer billed container type.
138124

139125
```yaml
140-
Type: String
141-
Parameter Sets:
126+
Type: SwitchParameter
127+
Parameter Sets: (All)
142128
Aliases:
143129
Applicable: SharePoint Online
144130
@@ -149,23 +135,46 @@ Accept pipeline input: False
149135
Accept wildcard characters: False
150136
```
151137

152-
### –GovernableByAdmin
138+
### -OwningApplicationId
153139

154-
Using `-GovernableByAdmin`, you can decide whether consuming tenant administrators of the application should be provided management capabilities on Microsoft-enabled administrator support, through SharePoint admin center and PowerShell. By default, the value is set to True. When set to False, the consuming tenant administrator can perform only read-only actions on containers of the container type, in both SharePoint admin center and PowerShell.
140+
This parameter specifies the ID of the SharePoint Embedded application.
155141

156142
```yaml
157-
Type: Boolean
158-
Parameter Sets:
143+
Type: Guid
144+
Parameter Sets: (All)
145+
Aliases:
146+
Applicable: SharePoint Online
147+
148+
Required: True
149+
Position: Named
150+
Default value: None
151+
Accept pipeline input: False
152+
Accept wildcard characters: False
153+
```
154+
155+
156+
### –TrialContainerType
157+
158+
This parameter is used to specify that the cmdlet is used to create a trial container type and thereby the billing profile need not be provided.
159+
160+
```yaml
161+
Type: SwitchParameter
162+
Parameter Sets: (All)
159163
Aliases:
160164
Applicable: SharePoint Online
161165
162166
Required: False
163167
Position: Named
164-
Default value: True
168+
Default value: None
165169
Accept pipeline input: False
166170
Accept wildcard characters: False
167171
```
168172

173+
### CommonParameters
174+
This cmdlet supports the common parameters: `-Debug`, `-ErrorAction`, `-ErrorVariable`, `-InformationAction`, `-InformationVariable`, `-OutVariable`, `-OutBuffer`, `-PipelineVariable`, `-ProgressAction`, `-Verbose`, `-WarningAction`, and `-WarningVariable`. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
175+
176+
177+
169178
## RELATED LINKS
170179

171180
[Getting started with SharePoint Online Management Shell](/powershell/sharepoint/sharepoint-online/connect-sharepoint-online)

0 commit comments

Comments
 (0)