Skip to content

Commit 445be33

Browse files
authored
Merge branch 'dev' into 2973-filter-is-incorrectly-handling-special-characters
2 parents de00d01 + 6b6d981 commit 445be33

File tree

47 files changed

+111
-100
lines changed

Some content is hidden

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

47 files changed

+111
-100
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
44
parameters:
55
- name: BuildAgent
6-
default: 1es-windows-ps-compute
6+
default: 1es-windows-ps-compute-m
77
displayName: Build Agent
88
- name: Test
99
type: boolean

.azure-pipelines/generation-templates/generate-helpdocs-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
type: string
1010
default: ""
1111
- name: BUILDAGENT
12-
default: 1es-windows-ps-compute
12+
default: 1es-windows-ps-compute-m
1313
displayName: Build Agent
1414

1515
steps:

.azure-pipelines/weekly-generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
1010
parameters:
1111
- name: BuildAgent
1212
displayName: Build Agent
13-
default: 1es-windows-ps-compute
13+
default: 1es-windows-ps-compute-m
1414
- name: BaseBranch
1515
displayName: Base Branch
1616
default: dev

src/Applications/beta/examples/Add-MgBetaApplicationPassword.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
```powershell
44
5-
Connect-MgBetaGraph -Scopes 'Application.ReadWrite.All'
5+
Connect-MgGraph -Scopes 'Application.ReadWrite.All'
66
77
$appObjectId = 'eaf1e531-0d58-4874-babe-b9a9f436e6c3'
88
@@ -31,7 +31,7 @@ Add a password to an application that expires in six months from the current dat
3131

3232
```powershell
3333
34-
Connect-MgBetaGraph -Scopes 'Application.ReadWrite.All'
34+
Connect-MgGraph -Scopes 'Application.ReadWrite.All'
3535
3636
$appObjectId = 'eaf1e531-0d58-4874-babe-b9a9f436e6c3'
3737

src/Applications/beta/examples/Get-MgBetaApplication.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### Example 1: Get a list of applications
22

33
```powershell
4-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
4+
Connect-MgGraph -Scopes 'Application.Read.All'
55
Get-MgBetaApplication |
66
Format-List Id, DisplayName, AppId, SignInAudience, PublisherDomain
77
@@ -16,12 +16,12 @@ This examples gets a list of all the applications.
1616

1717
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#application-resource-permissions).
1818

19-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
19+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
2020

2121
### Example 2: Get an application by Id
2222

2323
```powershell
24-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
24+
Connect-MgGraph -Scopes 'Application.Read.All'
2525
Get-MgBetaApplication -Filter "AppId eq '39b09640-ec3e-44c9-b3de-f52db4e1cf66'" |
2626
Format-List Id, DisplayName, AppId, SignInAudience, PublisherDomain
2727
@@ -35,12 +35,12 @@ This examples gets the application by the specified Id.
3535

3636
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#application-resource-permissions).
3737

38-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
38+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
3939

4040
### Example 3: Get a count of all applications
4141

4242
```powershell
43-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
43+
Connect-MgGraph -Scopes 'Application.Read.All'
4444
Get-MgBetaApplication -ConsistencyLevel eventual -Count appCount
4545
4646
Id DisplayName AppId SignInAudience PublisherDomain
@@ -56,12 +56,12 @@ This example gets a list of all applications. The $appCount variable contains th
5656

5757
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#application-resource-permissions).
5858

59-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
59+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
6060

6161
### Example 4: Use -Search to get all the applications whose display name contains 'Test' including a count of the returned users
6262

6363
```powershell
64-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
64+
Connect-MgGraph -Scopes 'Application.Read.All'
6565
Get-MgBetaApplication -ConsistencyLevel eventual -Count appCount -Search '"DisplayName:Test"'
6666
6767
Id DisplayName AppId SignInAudience PublisherDomain
@@ -74,12 +74,12 @@ This example returns all applications whose display name contains 'Test'. The $a
7474

7575
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#application-resource-permissions).
7676

77-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
77+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
7878

7979
### Example 5: Use -Filter to get all the applications with a display name that starts with 'New' including a count of the returned users, with the results ordered by display name
8080

8181
```powershell
82-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
82+
Connect-MgGraph -Scopes 'Application.Read.All'
8383
Get-MgBetaApplication -ConsistencyLevel eventual -Count appCount -Filter "startsWith(DisplayName, 'New')" -OrderBy DisplayName
8484
8585
Id DisplayName AppId SignInAudience PublisherDomain
@@ -92,4 +92,4 @@ This example returns all applications whose display name starts with 'New'. The
9292

9393
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#application-resource-permissions).
9494

95-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
95+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.

src/Applications/beta/examples/Get-MgBetaServicePrincipal.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### Example 1: Get all service principals from the directory
22

33
```powershell
4-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
4+
Connect-MgGraph -Scopes 'Application.Read.All'
55
Get-MgBetaServicePrincipal
66
77
Id : 304ae362-7953-4d08-8e15-aeece4d01017c
@@ -19,12 +19,12 @@ This example retrieves all service principals from the directory.
1919

2020
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#applicationreadall).
2121

22-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
22+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
2323

2424
### Example 2: Get the service principal by display name
2525

2626
```powershell
27-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
27+
Connect-MgGraph -Scopes 'Application.Read.All'
2828
Get-MgBetaServicePrincipal -Filter "DisplayName eq 'Power BI Service'" |
2929
Format-List Id, DisplayName,AppId, SignInAudience
3030
@@ -38,12 +38,12 @@ This example gets the service principal by display name.
3838

3939
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#applicationreadall).
4040

41-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
41+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
4242

4343
### Example 3: Get a count of the service principals
4444

4545
```powershell
46-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
46+
Connect-MgGraph -Scopes 'Application.Read.All'
4747
Get-MgBetaServicePrincipal -ConsistencyLevel eventual -Count spCount
4848
4949
Id DisplayName AppId SignInAudience PublisherName
@@ -58,12 +58,12 @@ This example returns a list of all the service principals. $spCount variable con
5858

5959
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#applicationreadall).
6060

61-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
61+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
6262

6363
### Example 4: Use -Filter and -Top to get five service principals with a display name that starts with 'a' including a count of returned objects
6464

6565
```powershell
66-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
66+
Connect-MgGraph -Scopes 'Application.Read.All'
6767
Get-MgBetaServicePrincipal -ConsistencyLevel eventual -Count spCount -Filter "startsWith(DisplayName, 'a')" -Top 5
6868
6969
Id DisplayName AppId SignInAudience PublisherName
@@ -79,12 +79,12 @@ This example filters service principals whose display name starts with 'a' and c
7979

8080
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#applicationreadall).
8181

82-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
82+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
8383

8484
### Example 5: Use -Search to get service principals with display names that contain the letters 'Team' including a count of returned objects
8585

8686
```powershell
87-
Connect-MgBetaGraph -Scopes 'Application.Read.All'
87+
Connect-MgGraph -Scopes 'Application.Read.All'
8888
Get-MgBetaServicePrincipal -ConsistencyLevel eventual -Count spCount -Search '"DisplayName:Team"'
8989
9090
Id DisplayName AppId SignInAudience PublisherName
@@ -102,4 +102,4 @@ This example returns all service principals whose display name contains the word
102102

103103
To learn about other permissions for this resource, see the [Application permissions reference](/graph/permissions-reference#applicationreadall).
104104

105-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
105+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes Application.Read.All, Application.ReadWrite.All`.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
### Example
2+
3+
```powershell
4+
5+
Import-Module Microsoft.Graph.Beta.Applications
6+
7+
Get-MgBetaServicePrincipalSynchronizationTemplate -ServicePrincipalId $servicePrincipalId
8+
9+
```
10+
This example will### example
11+
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +0,0 @@
1-
### Example
2-
3-
```powershell
4-
5-
Import-Module Microsoft.Graph.Applications
6-
7-
Get-MgServicePrincipalSynchronizationTemplate -ServicePrincipalId $servicePrincipalId
8-
9-
```
10-
This example will### example
11-
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Example 1: Code snippet
1+
### Example 1: Get all provisioned Cloud PCs and their default properties
22

33
```powershell
44
@@ -7,5 +7,16 @@ Import-Module Microsoft.Graph.Beta.DeviceManagement.Functions
77
Get-MgBetaDeviceManagementVirtualEndpointCloudPcProvisionedCloudPc
88
99
```
10-
This example shows how to use the Get-MgBetaDeviceManagementVirtualEndpointCloudPcProvisionedCloudPc Cmdlet.
10+
This example will get all provisioned cloud pcs and their default properties
11+
12+
### Example 2: Get all provisioned Cloud PCs and specific properties
13+
14+
```powershell
15+
16+
Import-Module Microsoft.Graph.Beta.DeviceManagement.Functions
17+
18+
Get-MgBetaDeviceManagementVirtualEndpointCloudPcProvisionedCloudPc -Property "id,displayName,powerState,connectivityResult,lastLoginResult,lastRemoteActionResult,osVersion,provisioningPolicyName,userAccountType"
19+
20+
```
21+
This example will get all provisioned cloud pcs and specific properties
1122

src/Groups/beta/examples/Get-MgBetaGroup.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### Example 1: Get a list of groups
22

33
```powershell
4-
Connect-MgBetaGraph -Scopes 'Group.Read.All'
4+
Connect-MgGraph -Scopes 'Group.Read.All'
55
Get-MgBetaGroup |
66
Format-List Id, DisplayName, Description, GroupTypes
77
@@ -20,12 +20,12 @@ This example retrieves a list of groups.
2020

2121
To learn about the permissions for this resource, see the [Group permissions reference](/graph/permissions-reference#groupmemberreadall).
2222

23-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes GroupMember.Read.All, Group.Read.All`.
23+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes GroupMember.Read.All, Group.Read.All`.
2424

2525
### Example 2: Get a group by the display name
2626

2727
```powershell
28-
Connect-MgBetaGraph -Scopes 'Group.Read.All'
28+
Connect-MgGraph -Scopes 'Group.Read.All'
2929
Get-MgBetaGroup -Filter "DisplayName eq 'Business Development'" |
3030
Format-List Id, DisplayName, Description, GroupTypes
3131
@@ -39,12 +39,12 @@ This example gets a group by the specified display name.
3939

4040
To learn about the permissions for this resource, see the [Group permissions reference](/graph/permissions-reference#groupmemberreadall).
4141

42-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes GroupMember.Read.All, Group.Read.All`.
42+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes GroupMember.Read.All, Group.Read.All`.
4343

4444
### Example 3: Get a count of all groups
4545

4646
```powershell
47-
Connect-MgBetaGraph -Scopes 'Group.Read.All'
47+
Connect-MgGraph -Scopes 'Group.Read.All'
4848
Get-MgBetaGroup -ConsistencyLevel eventual -Count groupCount
4949
5050
Id DisplayName Description GroupTypes AccessType
@@ -62,12 +62,12 @@ The example gets a list of all groups. The $groupCount variable contains the cou
6262

6363
To learn about the permissions for this resource, see the [Group permissions reference](/graph/permissions-reference#groupmemberreadall).
6464

65-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes GroupMember.Read.All, Group.Read.All`.
65+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes GroupMember.Read.All, Group.Read.All`.
6666

6767
### Example 4: Use -Search to get all the groups whose display name contains 'Market' including a count of the returned users
6868

6969
```powershell
70-
Connect-MgBetaGraph -Scopes 'Group.Read.All'
70+
Connect-MgGraph -Scopes 'Group.Read.All'
7171
Get-MgBetaGroup -ConsistencyLevel eventual -Count groupCount -Search '"DisplayName:Market"'
7272
7373
Id DisplayName Description GroupTypes AccessType
@@ -81,12 +81,12 @@ This example returns all groups whose display name contains 'Market'. The $group
8181

8282
To learn about other permissions for this resource, see the [Group permissions reference](/graph/permissions-reference#groupmemberreadall).
8383

84-
To consent to any of these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes GroupMember.Read.All, Group.Read.All`.
84+
To consent to any of these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes GroupMember.Read.All, Group.Read.All`.
8585

8686
### Example 5: Use -Filter to get all the applications with a display name that starts with 'A' including a count of the returned users, with the results ordered by display name
8787

8888
```powershell
89-
Connect-MgBetaGraph -Scopes 'Group.Read.All'
89+
Connect-MgGraph -Scopes 'Group.Read.All'
9090
Get-MgBetaGroup -ConsistencyLevel eventual -Count groupCount -Filter "startsWith(DisplayName, 'A')" -OrderBy DisplayName
9191
9292
Id DisplayName Description GroupTypes AccessType
@@ -100,4 +100,4 @@ This example returns all groups whose display name starts with 'A'. The $groupCo
100100

101101
To learn about other permissions for this resource, see the [Group permissions reference](/graph/permissions-reference#groupmemberreadall).
102102

103-
To consent to these permissions run `Connect-MgBetaGraph -Scopes Permission`. For example, `Connect-MgBetaGraph -Scopes GroupMember.Read.All, Group.Read.All`.
103+
To consent to these permissions run `Connect-MgGraph -Scopes Permission`. For example, `Connect-MgGraph -Scopes GroupMember.Read.All, Group.Read.All`.

0 commit comments

Comments
 (0)