Merge branch 'dev' into patch-1

Author: georgend

.azure-pipelines/generate-auth-module.yml

@@ -36,7 +36,7 @@ jobs:
     displayName: 'Generate and Build Auth Module'
     inputs:
       filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateAuthenticationModule.ps1'
-      arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -EnableSigning'
+      arguments: '-ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -EnableSigning'
       pwsh: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

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

@@ -6,25 +6,27 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - src/Beta/*
-    - config/ModulesMapping.jsonc
+      - src/*
+      - config/ModulesMapping.jsonc
+    exclude:
+      - src/Authentication/*
 pr: none
 variables:
   MODULE_PREFIX: 'Microsoft.Graph'
-  WORKLOAD_MODULE_PATH: 'src\beta\'
-  GRAPH_VERSION: 'beta'
+  WORKLOAD_MODULE_PATH: 'src\'
   AUTH_MODULE_PATH: 'src\Authentication\Authentication\bin\'
   AUTH_MODULE_DLL_PATTERN: 'Microsoft.Graph.Authentication.dll'
 
 jobs:
 - job: MSGraphPSSDKGeneration
   displayName: MS Graph PS SDK Beta Generation
-  timeoutInMinutes: 600
+  timeoutInMinutes: 800
   pool:
-    vmImage: 'windows-latest'
+    name: Microsoft Graph
+    demands: 'Agent.Name -equals PS-Build-Agent'
 
   steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
@@ -51,7 +53,7 @@ jobs:
     displayName: 'Build Auth Modules'
     inputs:
       filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateAuthenticationModule.ps1'
-      arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -BuildWhenEqual -EnableSigning'
+      arguments: '-ArtifactsLocation $(Build.ArtifactStagingDirectory) -Build -BuildWhenEqual -EnableSigning'
       pwsh: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -131,7 +133,7 @@ jobs:
     displayName: 'Generate and Build Graph Resource Modules'
     inputs:
       filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1'
-      arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\ -Build -EnableSigning'
+      arguments: '-ArtifactsLocation $(Build.ArtifactStagingDirectory)\ -Build -EnableSigning'
       pwsh: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -165,7 +167,7 @@ jobs:
     inputs:
       ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet'
       FolderPath: $(WORKLOAD_MODULE_PATH)
-      Pattern: '$(MODULE_PREFIX).*.private.dll, $(MODULE_PREFIX).*.psm1, $(MODULE_PREFIX).*.format.ps1xml, *.ps1'
+      Pattern: '$(MODULE_PREFIX).*.private.dll, $(MODULE_PREFIX).*.psm1, $(MODULE_PREFIX).*.format.ps1xml, ProxyCmdletDefinitions.ps1, load-dependency.ps1'
       signConfigType: inlineSignParams
       inlineOperation: |
        [
@@ -205,7 +207,7 @@ jobs:
                "toolVersion": "1.0"
            }
        ]
-      SessionTimeout: 100
+      SessionTimeout: 160
 
   - task: PowerShell@2
     displayName: 'Pack Modules'
@@ -216,16 +218,16 @@ jobs:
         [HashTable] $ModuleMapping = Get-Content $ModuleMappingConfigPath | ConvertFrom-Json -AsHashTable
         $ModuleMapping.Keys | ForEach-Object {
             $ModuleName = $_
-            $ModuleProjectDir = "$(System.DefaultWorkingDirectory)/src/$(GRAPH_VERSION)/$ModuleName/$ModuleName"
-            & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -GraphVersion $(GRAPH_VERSION) -ArtifactsLocation $(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\
+            $ModuleProjectDir = "$(System.DefaultWorkingDirectory)/src/$ModuleName/$ModuleName"
+            & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -ArtifactsLocation $(Build.ArtifactStagingDirectory)\
         }
       pwsh: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP NuGet CodeSigning'
     inputs:
       ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet'
-      FolderPath: '$(Build.ArtifactStagingDirectory)\$(GRAPH_VERSION)\'
+      FolderPath: '$(Build.ArtifactStagingDirectory)\'
       Pattern: '*.nupkg'
       signConfigType: inlineSignParams
       inlineOperation: |
@@ -250,7 +252,7 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifact Beta Modules
     inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)'
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/'
       ArtifactName: 'drop'
       publishLocation: 'Container'
 

.azure-pipelines/generate-beta-rollup-module.yml

@@ -7,9 +7,8 @@ trigger: none
 pr: none
 variables:
   MODULE_PREFIX: 'Microsoft.Graph'
-  GRAPH_VERSION: 'beta'
   MODULE_NAME: 'Graph'
-  MODULE_PATH: 'src/Beta/Graph/Graph'
+  MODULE_PATH: 'src/Graph/Graph'
 
 jobs:
 - job: MSGraphPSSDKGeneration
@@ -31,7 +30,6 @@ jobs:
     displayName: 'Generate and Build Roll-Up Module'
     inputs:
       filePath: '$(System.DefaultWorkingDirectory)/tools/GenerateRollUpModule.ps1'
-      arguments: '-RepositoryApiKey $(Api_Key) -ArtifactsLocation $(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)/'
       pwsh: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -87,14 +85,14 @@ jobs:
       command: 'pack'
       Configuration: Release
       packagesToPack: '$(System.DefaultWorkingDirectory)/$(MODULE_PATH)/$(MODULE_PREFIX).nuspec'
-      packDestination: '$(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)/'
+      packDestination: '$(Build.ArtifactStagingDirectory)/'
       versioningScheme: 'off'
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP NuGet CodeSigning'
     inputs:
       ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet'
-      FolderPath: '$(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)/'
+      FolderPath: '$(Build.ArtifactStagingDirectory)/'
       Pattern: 'Microsoft.Graph*.nupkg'
       signConfigType: inlineSignParams
       inlineOperation: |
@@ -119,7 +117,7 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifact Microsoft.Graph.nupkg'
     inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(GRAPH_VERSION)'
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/'
       ArtifactName: 'drop'
       publishLocation: 'Container'
 

.azure-pipelines/validate-pr-beta-modules.yml

@@ -23,7 +23,8 @@ jobs:
   displayName: MS Graph PS SDK Beta Validation
   timeoutInMinutes: 600
   pool:
-    vmImage: 'windows-latest'
+    name: Microsoft Graph
+    demands: 'Agent.Name -equals PS-Build-Agent'
 
   steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2

config/ModulesMapping.jsonc

@@ -1,111 +1,37 @@
 {
-    "Analytics": "^activitystatistics\\.|^users.userAnalytics$|^users.officeGraphInsights$",
+    "Applications":"^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
     "Bookings": "^bookingBusinesses\\.|^bookingCurrencies\\.",
-    "CloudCommunications": "^communications\\.",
-    "DevicesApps.DeviceAppManagement": "^deviceAppManagement\\.",
-    "DevicesApps.MobileAppManagement": "^users.managedAppRegistration$|^users.windowsInformationProtectionDeviceRegistration$",
-    "DevicesApps.OfficeConfiguration": "^officeConfiguration\\.",
-    "DevicesApps.SharedResources": "^users.mobileAppTroubleshootingEvent$",
+    "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+    "ChangeNotifications": "^subscriptions\\.",
+    "CloudCommunications": "^users.onlineMeeting$|^users.presence$",
+    "Compliance": "^compliance\\.",
+    "CrossDeviceExperiences": "^users.userActivity$|^users.device$",
+    "Devices.CloudPrint": "^print\\.",
+    "Devices.CorporateManagement": "^deviceAppManagement\\.|^officeConfiguration\\.|^users.mobileAppIntentAndState$|^users.mobileAppTroubleshootingEvent$|^users.windowsInformationProtectionDeviceRegistration$|^users.managedAppRegistration$|^users.managedDevice$|^users.deviceManagementTroubleshootingEvent$|^users.deviceEnrollmentConfiguration$",
+    "DirectoryObjects": "^directoryObjects\\.",
     "Education": "^education\\.",
-    "Files.Drives": "^drives\\.|^drive\\.",
-    "Files.Permissions": "^groups.resourceSpecificPermissionGrant$", // Missing in docs
-    "Files.Shares": "^shares\\.",
+    "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
     "Financials": "^financials\\.",
-    "Groups.Actions": "^groups.Actions$",
-    "Groups.Calendar": "^groups.calendar$|^groups.event$",
-    "Groups.Conversation": "^groups.conversation$",
-    "Groups.ConversationThread": "^groups.conversationThread$",
-    "Groups.DirectoryObject": "^groups.directoryObject$",
-    "Groups.Drive": "^groups.drive$",
-    "Groups.Endpoint": "^groups.endpoint$",
-    "Groups.Extension": "^groups.extension$",
-    "Groups.Functions": "^groups.Functions$",
-    "Groups.Group": "^groups.group$",
-    "Groups.LifecyclePolicies": "^groupLifecyclePolicies\\.",
-    "Groups.OneNote": "^groups.onenote$",
-    "Groups.Planner": "^groups.plannerGroup$",
-    "Groups.ProfilePhoto": "^groups.profilePhoto$",
-    "Groups.Site": "^groups.site$",
-    "Identity.AccessReview": "^accessReviews\\.|^accessReviewDecisions\\.|^businessFlowTemplates\\.|^programControlTypes\\.|^programs\\.|^programControls\\.",
-    "Identity.AdministrativeUnits": "^administrativeUnits\\.|^users.scopedRoleMembership$",
-    "Identity.Application": "^applications\\.|^applicationTemplates\\.",
-    "Identity.AppRoleAssignments": "^appRoleAssignments\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-    "Identity.AuditLogs": "^auditLogs\\.",
-    "Identity.AuthenticationMethods": "^users.authentication$",
-    "Identity.AzureADPIM": "^privilegedRoles\\.|^privilegedRoleAssignments\\.|^privilegedOperationEvents\\.|^privilegedApproval\\.|^privilegedRoleAssignmentRequests\\.",
-    "Identity.CertificateBasedAuthConfiguration": "^certificateBasedAuthConfiguration\\.",
-    "Identity.ConditionalAccess": "^conditionalAccess.namedLocation$|^conditionalAccess.conditionalAccessPolicy$",
-    "Identity.Contracts": "^contracts\\.",
-    "Identity.DataPolicyOperations": "^dataPolicyOperations\\.",
-    "Identity.Devices": "^devices\\.",
-    "Identity.Directory": "^directory\\.",
-    "Identity.DirectoryObjects": "^directoryObjects\\.",
-    "Identity.DirectoryRoles": "^directoryRoles\\.",
-    "Identity.DirectoryRoleTemplates": "^directoryRoleTemplates\\.",
-    "Identity.DirectorySettings": "^settings\\.|^groups.directorySetting$",
-    "Identity.DirectorySettingTemplates": "^directorySettingTemplates\\.",
-    "Identity.Domains": "^domains\\.",
-    "Identity.Invitations": "^invitations\\.",
-    "Identity.OAuth2PermissionGrants": "^oauth2PermissionGrants\\.",
-    "Identity.OnPremisesPublishingProfiles": "^onPremisesPublishingProfiles\\.",
-    "Identity.Organization": "^organization\\.",
-    "Identity.OrganizationContacts": "^contacts\\.",
-    "Identity.Policies": "^policies\\.",
-    "Identity.Protection": "^riskDetections\\.|^riskyUsers\\.|^identityRiskEvents\\.|^impossibleTravelRiskEvents\\.|^leakedCredentialsRiskEvents\\.|^anonymousIpRiskEvents\\.|^suspiciousIpRiskEvents\\.|^unfamiliarLocationRiskEvents\\.|^malwareRiskEvents\\.",
-    "Identity.Providers": "^identityProviders\\.",
-    "Identity.RoleManagement": "^roleManagement\\.",
-    "Identity.ServicePrincipal": "^servicePrincipals\\.",
-    "Identity.SubscribedSkus": "^subscribedSkus\\.",
-    "Identity.TermsOfUse": "^agreements\\.|^agreementAcceptances\\.|^users.agreementAcceptance$",
-    "Identity.TrustFramework": "^trustFramework\\.",
-    "Identity.UserFlows": "^identity.identityUserFlow$",
-    "Notification": "^users.notification$",
-    "OnlineMeetings": "^users.onlineMeeting$",
-    "Places": "^places\\.",
-    "Planner": "^planner\\.",
-    "Reports": "^reports\\.",
+    "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$",
+    "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$",
+    "Identity.Governance": "^accessReviews\\.|^businessFlowTemplates\\.|^programs\\.|^programControls\\.|^programControlTypes\\.|^privilegedRoles\\.|^privilegedRoleAssignments\\.|^privilegedRoleAssignmentRequests\\.|^privilegedApproval\\.|^privilegedOperationEvents\\.|^privilegedAccess\\.|^agreements\\.|^users.agreementAcceptance$|^identityGovernance.entitlementManagement$|^identityGovernance.Functions$|^identityGovernance.Actions$",
+    "Identity.SignIns": "^organization.certificateBasedAuthConfiguration$|^invitations\\.|^identityProviders\\.|^oauth2PermissionGrants\\.|^riskDetections\\.|^riskyUsers\\.|^dataPolicyOperations\\.|^identity.identityUserFlow$|^trustFramework\\.|^informationProtection\\.|^policies\\.|^users.authentication$|^users.informationProtection$|^identity.conditionalAccessRoot$",
+    "Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
+    "Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
+    "People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
+    "PersonalContacts":"^users.contactFolder$|^users.contact$",
+    "Planner": "^planner\\.|^users.plannerUser$|^groups.plannerGroup$",
+    "Reports": "^reports\\.|^auditLogs\\.",
     "SchemaExtensions": "^schemaExtensions\\.",
-    "Search": "^search\\.|^external\\.|^connections\\.",
+    "Search": "^search\\.|^external\\.",
     "Security": "^Security\\.",
-    "Sites.Actions": "^sites.Actions$",
-    "Sites.Drive": "^sites.drive$",
-    "Sites.Functions": "^sites.Functions$",
-    "Sites.List": "^sites.list$",
-    "Sites.OneNote": "^sites.onenote$",
-    "Sites.Pages": "^sites.sitePage$",
-    "Sites.Site": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$",
-    "Subscriptions": "^subscriptions\\.",
-    "Teams.AppCatalogs": "^appCatalogs\\.",
-    "Teams.Chats": "^chats\\.|^users.chat$",
-    "Teams.Team": "^teams\\.|^teamsTemplates\\.|^teamwork\\.|^groups.team$",
-    "Teams.Teamwork": "^users.userTeamwork$",
+    "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
+    "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs$|^users.userTeamwork$|^teamwork\\.|^users.team$|^users.userTeamwork$|^groups.team$",
+    "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$",
     "Users.Actions": "^users.Actions$",
-    "Users.ActivityFeed": "^users.userActivity$",
-    "Users.Calendar": "^users.calendar$|^users.calendarGroup$|^users.event$",
-    "Users.Contacts": "^users.contact$|^users.contactFolder$",
-    "Users.Devices": "^users.device$",
-    "Users.DirectoryObject": "^users.directoryObject$",
-    "Users.Drive": "^users.drive$",
-    "Users.Extensions": "^users.extension$",
-    "Users.FollowedSites": "^users.site$",
-    "Users.Functions": "^users.Functions$",
-    "Users.Groups": "^users.group$|^users.team$",
-    "Users.InformationProtection": "^users.informationProtection$", // Missing in docs
-    "Users.LicenseDetails": "^users.licenseDetails$",
-    "Users.Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
-    "Users.OneNote": "^users.onenote$",
-    "Users.OutlookUser": "^users.outlookUser$",
-    "Users.People": "^users.person$",
-    "Users.Planner": "^users.plannerUser$",
-    "Users.ProfilePhoto": "^users.profilePhoto$",
-    "Users.User": "^users.user$|^users.presence$",
-    "Users.UserSettings": "^users.userSettings$",
+    "Users.Functions": "^users.Functions$"
 
-    // Fails to build.
-    //"DevicesApps.DeviceManagement": "^deviceManagement\\.|^users.deviceEnrollmentConfiguration$|^users.deviceManagementTroubleshootingEvent$|^users.managedDevice$|^users.mobileAppIntentAndState$",
-    // "Workbooks": "^workbooks\\.", - Too large
-
-    // Invalid / No longer supported
-    // "Sites.ListItem": "^sites.baseItem$",
-    // "OnlineMeetings": "^app\\.",
+    // "CloudCommunications": "^communications\\.", // Needs multi-namespace support.
+    // "Devices.CorporateManagement": "^deviceManagement\\.", - Max Limit
+    // "WorkBooks": "^workbooks\\.",// Max limit.
 }