From 8c5592a562c9f3da57bf6f06435904d5ea2f604f Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 09:52:28 -0800
Subject: [PATCH 1/9] Test with Security module.

---
 .../download-openapi-docs.yml                 |  3 -
 .azure-pipelines/weekly-generation.yml        |  9 ++-
 config/ModulesMapping.jsonc                   | 72 +++++++++----------
 tools/GenerateProfiles.ps1                    |  2 +-
 4 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index 3623e0c7708..342c171195a 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -4,12 +4,9 @@
 parameters:
   - name: Branch
     type: string
-    default: "WeeklyOpenApiDocsDownload"
   - name: BaseBranch
     type: string
-    default: "dev"
   - name: BuildAgent
-    default: MsGraphBuildAgentsWindows
     displayName: Build Agent
 
 jobs:
diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index 1b44713bd32..c36860511fd 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -10,15 +10,14 @@ parameters:
 
 variables:
   Branch: "WeeklyOpenApiDocsDownload"
-  BaseBranch: "dev"
-  BUILDAGENT: ${{ parameters.BuildAgent }}
-
-pool: $(BUILDAGENT)
+  BaseBranch: "enhancements/AzDoPipelineImprovements" #TODO: Remove me!
+  BuildAgent: ${{ parameters.BuildAgent }}
 
+pool: $(BuildAgent)
 trigger: none
 pr: none
 schedules:
-  - cron: "0 12 * * WED" # Run every wednesday at noon UTC
+  - cron: "0 12 * * WED" # Run every Wednesday at noon UTC
     displayName: "Weekly PS SDK generation"
     branches:
       include:
diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
index 749d731af61..7e36f5e1e25 100644
--- a/config/ModulesMapping.jsonc
+++ b/config/ModulesMapping.jsonc
@@ -1,39 +1,39 @@
 {
-  "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-  "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
-  "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
-  "ChangeNotifications": "^subscriptions\\.",
-  "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
-  "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$",
-  "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
-  "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
-  "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
-  "DeviceManagement.Actions": "^deviceManagement.Actions$",
-  "DeviceManagement.Functions": "^deviceManagement.Functions$",
-  "DirectoryObjects": "^directoryObjects\\.",
-  "Education": "^education\\.",
-  "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
-  "Financials": "^financials\\.",
-  "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\\.",
-  "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\\.|^deviceManagement.deviceManagementReports$",
-  "SchemaExtensions": "^schemaExtensions\\.",
-  "Search": "^search\\.|^external\\.",
+  // "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
+  // "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
+  // "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+  // "ChangeNotifications": "^subscriptions\\.",
+  // "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
+  // "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$",
+  // "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
+  // "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
+  // "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
+  // "DeviceManagement.Actions": "^deviceManagement.Actions$",
+  // "DeviceManagement.Functions": "^deviceManagement.Functions$",
+  // "DirectoryObjects": "^directoryObjects\\.",
+  // "Education": "^education\\.",
+  // "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
+  // "Financials": "^financials\\.",
+  // "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\\.",
+  // "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\\.|^deviceManagement.deviceManagementReports$",
+  // "SchemaExtensions": "^schemaExtensions\\.",
+  // "Search": "^search\\.|^external\\.",
   "Security": "^security\\.",
-  "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
-  "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
-  "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
-  "Users.Actions": "^users.Actions$",
-  "Users.Functions": "^users.Functions$",
-  "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
+  // "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
+  // "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
+  // "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
+  // "Users.Actions": "^users.Actions$",
+  // "Users.Functions": "^users.Functions$",
+  // "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
 }
\ No newline at end of file
diff --git a/tools/GenerateProfiles.ps1 b/tools/GenerateProfiles.ps1
index af9456d6fc8..d2097e25c6e 100644
--- a/tools/GenerateProfiles.ps1
+++ b/tools/GenerateProfiles.ps1
@@ -21,7 +21,7 @@ try {
 
     $openApiFiles = [ordered]@{}
     foreach ($api in (Get-ChildItem -Path $OpenApiDocsDirectory)) {
-        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName
+        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName | where BaseName -EQ "Security" #TODO: Remove me!
         Write-Host "Parsing $($api.Name) openAPI docs..." -ForegroundColor Yellow
         foreach ($openApiDoc in $openApiDocs){
             $allPaths = @()

From c853d5b375c23fa20bcb6ff145e7276024cecdaa Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 09:54:52 -0800
Subject: [PATCH 2/9] Specify build agent

---
 .azure-pipelines/weekly-generation.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index c36860511fd..03cf506a3dc 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -32,6 +32,7 @@ stages:
         parameters:
           Branch: $(Branch)
           BaseBranch: $(BaseBranch)
+          BuildAgent: $(BuildAgent)
 
   - stage: GenerateServiceModules
     displayName: Generate service modules

From 0ba3cd779a4be1a8ec21ede7ebcc88e3fc09bf3a Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 11:14:29 -0800
Subject: [PATCH 3/9] Enable all modules.

---
 config/ModulesMapping.jsonc | 72 ++++++++++++++++++-------------------
 tools/GenerateProfiles.ps1  |  2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
index 7e36f5e1e25..749d731af61 100644
--- a/config/ModulesMapping.jsonc
+++ b/config/ModulesMapping.jsonc
@@ -1,39 +1,39 @@
 {
-  // "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-  // "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
-  // "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
-  // "ChangeNotifications": "^subscriptions\\.",
-  // "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
-  // "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$",
-  // "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
-  // "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
-  // "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
-  // "DeviceManagement.Actions": "^deviceManagement.Actions$",
-  // "DeviceManagement.Functions": "^deviceManagement.Functions$",
-  // "DirectoryObjects": "^directoryObjects\\.",
-  // "Education": "^education\\.",
-  // "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
-  // "Financials": "^financials\\.",
-  // "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\\.",
-  // "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\\.|^deviceManagement.deviceManagementReports$",
-  // "SchemaExtensions": "^schemaExtensions\\.",
-  // "Search": "^search\\.|^external\\.",
+  "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
+  "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
+  "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+  "ChangeNotifications": "^subscriptions\\.",
+  "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
+  "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$",
+  "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
+  "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
+  "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
+  "DeviceManagement.Actions": "^deviceManagement.Actions$",
+  "DeviceManagement.Functions": "^deviceManagement.Functions$",
+  "DirectoryObjects": "^directoryObjects\\.",
+  "Education": "^education\\.",
+  "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
+  "Financials": "^financials\\.",
+  "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\\.",
+  "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\\.|^deviceManagement.deviceManagementReports$",
+  "SchemaExtensions": "^schemaExtensions\\.",
+  "Search": "^search\\.|^external\\.",
   "Security": "^security\\.",
-  // "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
-  // "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
-  // "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
-  // "Users.Actions": "^users.Actions$",
-  // "Users.Functions": "^users.Functions$",
-  // "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
+  "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
+  "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
+  "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
+  "Users.Actions": "^users.Actions$",
+  "Users.Functions": "^users.Functions$",
+  "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
 }
\ No newline at end of file
diff --git a/tools/GenerateProfiles.ps1 b/tools/GenerateProfiles.ps1
index d2097e25c6e..af9456d6fc8 100644
--- a/tools/GenerateProfiles.ps1
+++ b/tools/GenerateProfiles.ps1
@@ -21,7 +21,7 @@ try {
 
     $openApiFiles = [ordered]@{}
     foreach ($api in (Get-ChildItem -Path $OpenApiDocsDirectory)) {
-        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName | where BaseName -EQ "Security" #TODO: Remove me!
+        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName
         Write-Host "Parsing $($api.Name) openAPI docs..." -ForegroundColor Yellow
         foreach ($openApiDoc in $openApiDocs){
             $allPaths = @()

From 4edd10f803b56156f3fc2ebde97889964a2a56d7 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 11:23:37 -0800
Subject: [PATCH 4/9] Revert submodule update.

---
 .../common-templates/checkout.yml             |  8 +++
 config/ModulesMapping.jsonc                   | 72 +++++++++----------
 tools/GenerateProfiles.ps1                    |  2 +-
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/.azure-pipelines/common-templates/checkout.yml b/.azure-pipelines/common-templates/checkout.yml
index 1a01cf824bf..1b1eee6c1ba 100644
--- a/.azure-pipelines/common-templates/checkout.yml
+++ b/.azure-pipelines/common-templates/checkout.yml
@@ -32,6 +32,14 @@ steps:
         git pull
         git status
 
+  - task: Bash@3
+    displayName: "Update Git Submodules"
+    inputs:
+      targetType: inline
+      script: |
+        git pull --recurse-submodules
+        git submodule update --init --recursive --remote
+
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
     displayName: "Run CredScan"
     inputs:
diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
index 749d731af61..7e36f5e1e25 100644
--- a/config/ModulesMapping.jsonc
+++ b/config/ModulesMapping.jsonc
@@ -1,39 +1,39 @@
 {
-  "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-  "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
-  "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
-  "ChangeNotifications": "^subscriptions\\.",
-  "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
-  "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$",
-  "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
-  "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
-  "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
-  "DeviceManagement.Actions": "^deviceManagement.Actions$",
-  "DeviceManagement.Functions": "^deviceManagement.Functions$",
-  "DirectoryObjects": "^directoryObjects\\.",
-  "Education": "^education\\.",
-  "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
-  "Financials": "^financials\\.",
-  "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\\.",
-  "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\\.|^deviceManagement.deviceManagementReports$",
-  "SchemaExtensions": "^schemaExtensions\\.",
-  "Search": "^search\\.|^external\\.",
+  // "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
+  // "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
+  // "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+  // "ChangeNotifications": "^subscriptions\\.",
+  // "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
+  // "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$",
+  // "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
+  // "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
+  // "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
+  // "DeviceManagement.Actions": "^deviceManagement.Actions$",
+  // "DeviceManagement.Functions": "^deviceManagement.Functions$",
+  // "DirectoryObjects": "^directoryObjects\\.",
+  // "Education": "^education\\.",
+  // "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
+  // "Financials": "^financials\\.",
+  // "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\\.",
+  // "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\\.|^deviceManagement.deviceManagementReports$",
+  // "SchemaExtensions": "^schemaExtensions\\.",
+  // "Search": "^search\\.|^external\\.",
   "Security": "^security\\.",
-  "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
-  "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
-  "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
-  "Users.Actions": "^users.Actions$",
-  "Users.Functions": "^users.Functions$",
-  "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
+  // "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
+  // "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
+  // "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
+  // "Users.Actions": "^users.Actions$",
+  // "Users.Functions": "^users.Functions$",
+  // "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
 }
\ No newline at end of file
diff --git a/tools/GenerateProfiles.ps1 b/tools/GenerateProfiles.ps1
index af9456d6fc8..d2097e25c6e 100644
--- a/tools/GenerateProfiles.ps1
+++ b/tools/GenerateProfiles.ps1
@@ -21,7 +21,7 @@ try {
 
     $openApiFiles = [ordered]@{}
     foreach ($api in (Get-ChildItem -Path $OpenApiDocsDirectory)) {
-        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName
+        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName | where BaseName -EQ "Security" #TODO: Remove me!
         Write-Host "Parsing $($api.Name) openAPI docs..." -ForegroundColor Yellow
         foreach ($openApiDoc in $openApiDocs){
             $allPaths = @()

From e0cc700828c43b01364ce31ea5216453039c2451 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 11:24:48 -0800
Subject: [PATCH 5/9] Skip CI for tests.

---
 .azure-pipelines/common-templates/download-openapi-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index 342c171195a..bb570c1ab56 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -127,7 +127,7 @@ jobs:
           script: |
             git status
             git add .
-            git commit -m 'Weekly OpenApiDocs Download. [run ci]'
+            git commit -m 'Weekly OpenApiDocs Download. [skip ci]'
             git status
             git push --set-upstream origin $(ComputeBranch.WeeklyBranch)
             git status

From 33b9f985a6d410320cde59c1cc4e15d506a29514 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 12:09:44 -0800
Subject: [PATCH 6/9] Run all modules.

---
 .../download-openapi-docs.yml                 |  2 +-
 config/ModulesMapping.jsonc                   | 72 +++++++++----------
 tools/GenerateProfiles.ps1                    |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index bb570c1ab56..342c171195a 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -127,7 +127,7 @@ jobs:
           script: |
             git status
             git add .
-            git commit -m 'Weekly OpenApiDocs Download. [skip ci]'
+            git commit -m 'Weekly OpenApiDocs Download. [run ci]'
             git status
             git push --set-upstream origin $(ComputeBranch.WeeklyBranch)
             git status
diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
index 7e36f5e1e25..749d731af61 100644
--- a/config/ModulesMapping.jsonc
+++ b/config/ModulesMapping.jsonc
@@ -1,39 +1,39 @@
 {
-  // "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
-  // "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
-  // "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
-  // "ChangeNotifications": "^subscriptions\\.",
-  // "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
-  // "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$",
-  // "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
-  // "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
-  // "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
-  // "DeviceManagement.Actions": "^deviceManagement.Actions$",
-  // "DeviceManagement.Functions": "^deviceManagement.Functions$",
-  // "DirectoryObjects": "^directoryObjects\\.",
-  // "Education": "^education\\.",
-  // "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
-  // "Financials": "^financials\\.",
-  // "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\\.",
-  // "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\\.|^deviceManagement.deviceManagementReports$",
-  // "SchemaExtensions": "^schemaExtensions\\.",
-  // "Search": "^search\\.|^external\\.",
+  "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
+  "Bookings": "^solutions\\.|^bookingBusinesses\\.|^bookingCurrencies\\.",
+  "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
+  "ChangeNotifications": "^subscriptions\\.",
+  "CloudCommunications": "^users.onlineMeeting$|^users.presence$|^communications\\.",
+  "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$",
+  "DeviceManagement": "^deviceManagement.(deviceCompliancePolicy.*|deviceConfiguration.*|managedDevice.*|managementCondition.*|microsoftTunnel.*|userExperienceAnalytics.*|windowsInformationProtection.*|deviceManagement|deviceManagement(DerivedCredentialSettings|Intent|ResourceAccessProfileBase|Script|SettingCategory|SettingDefinition|Template|TroubleshootingEvent)|androidForWork(AppConfigurationSchema|Settings)|androidManagedStore(AccountEnterpriseSettings|AppConfigurationSchema)|deviceAndAppManagementAssignmentFilter|deviceCategory|advancedThreatProtectionOnboardingStateSummary|dataSharingConsent|detectedApp|deviceHealthScript|deviceShellScript|embeddedSIMActivationCodePool|groupPolicyConfiguration|macOSSoftwareUpdateAccountSummary|mobileAppTroubleshootingEvent|notificationMessageTemplate|remoteActionAudit|softwareUpdateStatusSummary|windowsMalwareInformation)$",
+  "DeviceManagement.Administration": "^deviceManagement.(virtualEndpoint.*|.*Partner.*|.*Certificate.*|.*role.*|deviceManagement(DomainJoinConnector|ExchangeConnector|ExchangeOnPremisesPolicy)|groupPolicy(Category|Definition|DefinitionFile|MigrationReport|ObjectFile|UploadedDefinitionFile)|auditEvent|cartToClassAssociation|comanagementEligibleDevice|deviceAndAppManagementRoleAssignment|intuneBrandingProfile|iosUpdateDeviceStatus|mobileThreatDefenseConnector|ndesConnector|resourceOperation|restrictedAppsViolation|termsAndConditions)",
+  "DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
+  "DeviceManagement.Actions": "^deviceManagement.Actions$",
+  "DeviceManagement.Functions": "^deviceManagement.Functions$",
+  "DirectoryObjects": "^directoryObjects\\.",
+  "Education": "^education\\.",
+  "Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
+  "Financials": "^financials\\.",
+  "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\\.",
+  "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\\.|^deviceManagement.deviceManagementReports$",
+  "SchemaExtensions": "^schemaExtensions\\.",
+  "Search": "^search\\.|^external\\.",
   "Security": "^security\\.",
-  // "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
-  // "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
-  // "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
-  // "Users.Actions": "^users.Actions$",
-  // "Users.Functions": "^users.Functions$",
-  // "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
+  "Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^sites.permission$|^sites.store$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
+  "Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
+  "Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
+  "Users.Actions": "^users.Actions$",
+  "Users.Functions": "^users.Functions$",
+  "WindowsUpdates": "^admin.windows$|^admin.Actions$|^admin.Functions$"
 }
\ No newline at end of file
diff --git a/tools/GenerateProfiles.ps1 b/tools/GenerateProfiles.ps1
index d2097e25c6e..af9456d6fc8 100644
--- a/tools/GenerateProfiles.ps1
+++ b/tools/GenerateProfiles.ps1
@@ -21,7 +21,7 @@ try {
 
     $openApiFiles = [ordered]@{}
     foreach ($api in (Get-ChildItem -Path $OpenApiDocsDirectory)) {
-        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName | where BaseName -EQ "Security" #TODO: Remove me!
+        $openApiDocs = Get-ChildItem -File -Filter "*.yml" -Path $api.FullName
         Write-Host "Parsing $($api.Name) openAPI docs..." -ForegroundColor Yellow
         foreach ($openApiDoc in $openApiDocs){
             $allPaths = @()

From f84da4956d7a226743fa906d1e770ea2a1191fe4 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Fri, 18 Feb 2022 12:39:25 -0800
Subject: [PATCH 7/9] Set base branch to dev.

---
 .azure-pipelines/weekly-generation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
index 03cf506a3dc..8743eeda6eb 100644
--- a/.azure-pipelines/weekly-generation.yml
+++ b/.azure-pipelines/weekly-generation.yml
@@ -10,7 +10,7 @@ parameters:
 
 variables:
   Branch: "WeeklyOpenApiDocsDownload"
-  BaseBranch: "enhancements/AzDoPipelineImprovements" #TODO: Remove me!
+  BaseBranch: "dev"
   BuildAgent: ${{ parameters.BuildAgent }}
 
 pool: $(BuildAgent)

From f31cc64b8f50771bbe864dc8627f0f4b6e986298 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Tue, 22 Feb 2022 13:36:27 -0800
Subject: [PATCH 8/9] Use PAT for git commands.

---
 .azure-pipelines/common-templates/download-openapi-docs.yml     | 2 +-
 .../generation-templates/generate-command-metadata-template.yml | 2 +-
 .../generation-templates/generate-helpdocs-template.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
index 342c171195a..b0cb0461f33 100644
--- a/.azure-pipelines/common-templates/download-openapi-docs.yml
+++ b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -129,7 +129,7 @@ jobs:
             git add .
             git commit -m 'Weekly OpenApiDocs Download. [run ci]'
             git status
-            git push --set-upstream origin $(ComputeBranch.WeeklyBranch)
+            git push --set-upstream "https://$(GITHUB_TOKEN)@github.com/microsoftgraph/msgraph-sdk-powershell.git" $(ComputeBranch.WeeklyBranch)
             git status
 
 # References
diff --git a/.azure-pipelines/generation-templates/generate-command-metadata-template.yml b/.azure-pipelines/generation-templates/generate-command-metadata-template.yml
index d93f32adf35..dab78ec893b 100644
--- a/.azure-pipelines/generation-templates/generate-command-metadata-template.yml
+++ b/.azure-pipelines/generation-templates/generate-command-metadata-template.yml
@@ -21,5 +21,5 @@ steps:
       git status
       git add "$(System.DefaultWorkingDirectory)/src/Authentication/Authentication/custom/common/MgCommandMetadata.json"
       git commit -m 'Add generated MgCommandMetadata.json. [run ci]'
-      git push
+      git push "https://$(GITHUB_TOKEN)@github.com/microsoftgraph/msgraph-sdk-powershell.git"
       git status
\ No newline at end of file
diff --git a/.azure-pipelines/generation-templates/generate-helpdocs-template.yml b/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
index 4c92637e09b..a44188dd9ee 100644
--- a/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
+++ b/.azure-pipelines/generation-templates/generate-helpdocs-template.yml
@@ -53,5 +53,5 @@ steps:
     targetType: inline
     script: |
       git status
-      git push --set-upstream origin $(ComputeBranch.DocsBranch)
+      git push --set-upstream "https://$(GITHUB_TOKEN)@github.com/microsoftgraph/msgraph-sdk-powershell.git" $(ComputeBranch.DocsBranch)
       git status
\ No newline at end of file

From b6ae0c2575d396c6cd57d5ab98b0ea6b3e6fe187 Mon Sep 17 00:00:00 2001
From: Peter Ombwa <peter.ombwa@microsoft.com>
Date: Tue, 22 Feb 2022 16:52:48 -0800
Subject: [PATCH 9/9] Checkout submodule from checkout task.

---
 .azure-pipelines/common-templates/checkout.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.azure-pipelines/common-templates/checkout.yml b/.azure-pipelines/common-templates/checkout.yml
index 1b1eee6c1ba..df2384a7934 100644
--- a/.azure-pipelines/common-templates/checkout.yml
+++ b/.azure-pipelines/common-templates/checkout.yml
@@ -10,6 +10,7 @@ steps:
   - checkout: self
     clean: true
     fetchDepth: 1
+    submodules: true
     persistCredentials: true
 
   - task: PowerShell@2
@@ -32,13 +33,6 @@ steps:
         git pull
         git status
 
-  - task: Bash@3
-    displayName: "Update Git Submodules"
-    inputs:
-      targetType: inline
-      script: |
-        git pull --recurse-submodules
-        git submodule update --init --recursive --remote
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
     displayName: "Run CredScan"