Skip to content

Commit 628d8fc

Browse files
committed
Merge branch 'dev' into features/2.0
2 parents d470068 + 3b0ed09 commit 628d8fc

17,055 files changed

Lines changed: 3615868 additions & 1058801 deletions

File tree

Some content is hidden

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

.azure-pipelines/common-templates/download-openapi-docs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ parameters:
88
type: string
99
- name: BuildAgent
1010
displayName: Build Agent
11+
- name: SkipForceRefresh
12+
type: string
1113

1214
jobs:
1315
- job: GetLatestDocs
@@ -45,14 +47,15 @@ jobs:
4547
continueOnError: false
4648
inputs:
4749
filePath: "$(System.DefaultWorkingDirectory)/tools/UpdateOpenApi.ps1"
50+
arguments: -SkipForceRefresh:$$(SkipForceRefresh)
4851
pwsh: true
4952

5053
- task: PowerShell@2
5154
displayName: Download beta OpenApi docs
5255
continueOnError: false
5356
inputs:
5457
filePath: "$(System.DefaultWorkingDirectory)/tools/UpdateOpenApi.ps1"
55-
arguments: "-BetaGraphVersion"
58+
arguments: -BetaGraphVersion -SkipForceRefresh:$$(SkipForceRefresh)
5659
pwsh: true
5760

5861
- task: PowerShell@2

.azure-pipelines/generate-modules-template.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ jobs:
144144
Write-Host $(BUILDNUMBER)
145145
. $(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1 -ArtifactsLocation $(Build.ArtifactStagingDirectory)\ -Build -Test -EnableSigning -ModulePreviewNumber $(BUILDNUMBER) -RepositoryName "LocalNugetFeed" -ExcludeExampleTemplates -ExcludeNotesSection
146146
147+
- task: PowerShell@2
148+
displayName: Find Duplicate Commands
149+
inputs:
150+
targetType: inline
151+
pwsh: true
152+
script: |
153+
. $(System.DefaultWorkingDirectory)/tools/PostGeneration/FindDuplicateCommand.ps1 -SourcePath "$(System.DefaultWorkingDirectory)/src/"
154+
147155
- template: ./generation-templates/generate-helpdocs-template.yml
148156

149157
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

.azure-pipelines/generation-templates/generate-service-modules.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,4 +293,12 @@ jobs:
293293
DOCSBRANCH: $(DocsBranch)
294294
ModulesToGenerate: $(ModulesToGenerate)
295295

296+
- task: PowerShell@2
297+
displayName: Find Duplicate Commands
298+
inputs:
299+
targetType: inline
300+
pwsh: true
301+
script: |
302+
. $(System.DefaultWorkingDirectory)/tools/PostGeneration/FindDuplicateCommand.ps1 -SourcePath "$(System.DefaultWorkingDirectory)/src/"
303+
296304
- template: ../common-templates/security-postchecks-template.yml

.azure-pipelines/weekly-generation.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
55

66
parameters:
77
- name: BuildAgent
8-
default: 1es-windows-ps-compute
98
displayName: Build Agent
9+
default: 1es-windows-ps-compute
10+
- name: BaseBranch
11+
displayName: Base Branch
12+
default: dev
13+
- name: SkipForceRefresh
14+
displayName: Skip Force Refresh
15+
default: false
16+
type: boolean
1017

1118
variables:
1219
Branch: "WeeklyOpenApiDocsDownload"
13-
BaseBranch: "dev"
20+
BaseBranch: ${{ parameters.BaseBranch }}
1421
BuildAgent: ${{ parameters.BuildAgent }}
22+
SkipForceRefresh: ${{ parameters.SkipForceRefresh }}
1523

1624
pool: $(BuildAgent)
1725
trigger: none
@@ -33,6 +41,7 @@ stages:
3341
Branch: $(Branch)
3442
BaseBranch: $(BaseBranch)
3543
BuildAgent: $(BuildAgent)
44+
SkipForceRefresh: $(SkipForceRefresh)
3645

3746
- stage: GenerateServiceModules
3847
displayName: Generate service modules

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @peombwa @ddyett @georgend @shemogumbe @timayabi2020
1+
* @peombwa @ddyett @shemogumbe @timayabi2020

.github/workflows/create-helpdocs-pr-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141
MESSAGE_TITLE: "Docs Generation"
4242
MESSAGE_BODY: "This pull request was automatically created by the GitHub Action,\n\n Contains Help Docs"
43-
REVIEWERS: peombwa,mairissi,ddyett,shemogumbe,darrelmiller
44-
ASSIGNEDTO: georgend
43+
REVIEWERS: peombwa,timayabi2020,mairissi,ddyett,shemogumbe
44+
ASSIGNEDTO: timayabi2020
4545
LABELS: generated
4646
BASE: dev
4747
HEAD: ${{steps.create_branch.outputs.branch}}

.github/workflows/create-openapidocs-pr-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141
MESSAGE_TITLE: Weekly OpenApiDocs Download
4242
MESSAGE_BODY: "This pull request was automatically created by the GitHub Action,\n\n Contains OpenApiDocs Updates from Graph Explorer API"
43-
REVIEWERS: peombwa,ddyett,darrelmiller,georgend,mairissi,shemogumbe
43+
REVIEWERS: peombwa,ddyett,timayabi2020,mairissi,shemogumbe
4444
ASSIGNEDTO: peombwa
4545
LABELS: generated
4646
BASE: dev

config/ModuleMetadata.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"guid": "fceec1eb-c2e8-4b2b-a120-0fab3f0d7b47",
23
"authors": "Microsoft",
34
"owners": "Microsoft",
45
"description": "Microsoft Graph PowerShell module",
@@ -18,9 +19,11 @@
1819
"AzureAD",
1920
"SharePoint",
2021
"Intune",
21-
"AzureAutomationNotSupported"
22+
"AzureAutomationNotSupported",
23+
"PSModule",
24+
"PSIncludes_Cmdlet"
2225
],
2326
"releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
2427
"assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
25-
"version": "1.10.0"
28+
"version": "1.11.0"
2629
}

config/ModulesMapping.jsonc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
"Education": "^education\\.",
1919
"Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
2020
"Financials": "^financials\\.",
21-
"Groups": "^groups.group$|^groups.directoryObject$|^groups.conversation$|^groups.endpoint$|^groups.extension$|^groups.resourceSpecificPermissionGrant$|^groups.profilePhoto$|^groups.conversationThread$|^groupLifecyclePolicies\\.|^users.group$|^groups.directorySetting$|^groups.Actions$|^groups.Functions$",
21+
"Groups": "^groups.group$|^groups.directoryObject$|^groups.conversation$|^groups.endpoint$|^groups.extension$|^groups.groupLifecyclePolicy$|^groups.resourceSpecificPermissionGrant$|^groups.profilePhoto$|^groups.conversationThread$|^groupLifecyclePolicies\\.|^users.group$|^groups.directorySetting$|^groups.Actions$|^groups.Functions$",
2222
"Identity.DirectoryManagement": "^administrativeUnits\\.|^contacts\\.|^devices\\.|^domains\\.|^directoryRoles\\.|^directoryRoleTemplates\\.|^directorySettingTemplates\\.|^settings\\.|^subscribedSkus\\.|^contracts\\.|^directory\\.|^users.scopedRoleMembership$|^organization.organization$|^organization.organizationalBranding$|^organization.organizationSettings$|^organization.Actions$|^organization.extension$",
2323
"Identity.Governance": "^accessReviews\\.|^businessFlowTemplates\\.|^programs\\.|^programControls\\.|^programControlTypes\\.|^privilegedRoles\\.|^privilegedRoleAssignments\\.|^privilegedRoleAssignmentRequests\\.|^privilegedApproval\\.|^privilegedOperationEvents\\.|^privilegedAccess\\.|^agreements\\.|^users.agreementAcceptance$|^identityGovernance\\.",
24-
"Identity.SignIns": "^organization.certificateBasedAuthConfiguration$|^invitations\\.|^identityProviders\\.|^oauth2PermissionGrants\\.|^identityProtection\\.|^dataPolicyOperations\\.|^identity.identityUserFlow$|^trustFramework\\.|^informationProtection\\.|^policies\\.|^users.authentication$|^users.informationProtection$|^identity.conditionalAccessRoot$",
24+
"Identity.SignIns": "^organization.certificateBasedAuthConfiguration$|^invitations\\.|^identityProviders\\.|^oauth2PermissionGrants\\.|^identityProtection\\.|^dataPolicyOperations\\.|^identity\\.|^trustFramework\\.|^informationProtection\\.|^policies\\.|^users.authentication$|^users.informationProtection$",
2525
"Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
26+
"ManagedTenants": "^tenantRelationships.managedTenants$",
2627
"Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
2728
"People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
2829
"PersonalContacts": "^users.contactFolder$|^users.contact$",

0 commit comments

Comments
 (0)