microsoftgraph · peombwa · Nov 17, 2020 · Nov 19, 2020 · Nov 20, 2020 · Nov 25, 2020
diff --git a/.azure-pipelines/common-templates/download-openapi-docs.yml b/.azure-pipelines/common-templates/download-openapi-docs.yml
@@ -8,11 +8,14 @@ parameters:
   - name: BaseBranch
     type: string
     default: "dev"
+  - name: BuildAgent
+    default: MsGraphBuildAgentsWindows
+    displayName: Build Agent
 
 jobs:
   - job: GetLatestDocs
     displayName: Download OpenApiDocs
-    pool: MsGraphDevXAzureAgents
+    pool: $(BuildAgent)
     steps:
       - template: ./checkout.yml
 
@@ -92,7 +95,7 @@ jobs:
             # Calculate meta-module version
             $MetaModule = Find-Module "Microsoft.Graph" -Repository PSGallery
             $MetaModuleVersion = [System.Version]($MetaModule.Version)
-            $NewMetaModuleVersion = "$($MetaModuleVersion.Major).$($MetaModuleVersion.Minor + 1).$($MetaModuleVersion.Build)"
+            $NewMetaModuleVersion = "$($MetaModuleVersion.Major).$($MetaModuleVersion.Minor).$($MetaModuleVersion.Build + 1)"
             # Bump meta-module minor version
             Write-Host "Bumping Microsoft.Graph to $NewMetaModuleVersion."
             & "$(System.DefaultWorkingDirectory)\tools\SetMetaModuleVersion.ps1" -VersionNumber $NewMetaModuleVersion
@@ -102,7 +105,7 @@ jobs:
               try {
                 $Module = Find-Module "Microsoft.Graph.$_" -Repository PSGallery -ErrorAction Stop
                 $ModuleVersion = [System.Version]($Module.Version)
-                $NewModuleVersion = "$($ModuleVersion.Major).$($ModuleVersion.Minor + 1).$($ModuleVersion.Build)"
+                $NewModuleVersion = "$($ModuleVersion.Major).$($ModuleVersion.Minor).$($ModuleVersion.Build + 1)"
                 Write-Host "Bumping $_ to $NewModuleVersion."
                 . "$(System.DefaultWorkingDirectory)\tools\SetServiceModuleVersion.ps1" -VersionNumber $NewModuleVersion -Modules $_
               } catch {

diff --git a/.azure-pipelines/generate-auth-module-template.yml b/.azure-pipelines/generate-auth-module-template.yml
@@ -29,8 +29,7 @@ parameters:
 jobs:
 - job: MsGraphPSSDKAuthModuleGeneration
   displayName: Microsoft Graph PowerShell SDK Auth Module Generation
-  pool: MsGraphDevXAzureAgents
-
+
   steps:
   - template: ./install-tools-template.yml
 

diff --git a/.azure-pipelines/generate-modules-template.yml b/.azure-pipelines/generate-modules-template.yml
@@ -37,7 +37,6 @@ parameters:
 jobs:
 - job: MsGraphPSSDKServiceModulesGeneration
   displayName: Microsoft Graph PowerShell SDK Service Module Generation
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
 
   steps:
@@ -231,7 +230,7 @@ jobs:
         $ModuleMapping.Keys | ForEach-Object {
             $ModuleName = $_
             $ModuleProjectDir = "$(System.DefaultWorkingDirectory)/src/$ModuleName/$ModuleName"
-            & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -ArtifactsLocation $(Build.ArtifactStagingDirectory)\
+            & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -ArtifactsLocation $(Build.ArtifactStagingDirectory)\ -ExcludeMarkdownDocsFromNugetPackage
         }
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

diff --git a/.azure-pipelines/generate-rollup-module-template.yml b/.azure-pipelines/generate-rollup-module-template.yml
@@ -33,7 +33,6 @@ parameters:
 jobs:
 - job: MsGraphPSSDKRollUpModuleGeneration
   displayName: Microsoft Graph PowerShell SDK Roll-Up Module Generation
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
 
   steps:

diff --git a/.azure-pipelines/generation-templates/generate-service-modules.yml b/.azure-pipelines/generation-templates/generate-service-modules.yml
@@ -20,10 +20,10 @@ parameters:
   - name: PublishToFeed
     type: boolean
     default: false
+
 jobs:
   - job: GenerateServiceModules
     displayName: Service module generation
-    pool: MsGraphDevXAzureAgents
     timeoutInMinutes: 360
     condition: and(succeeded(), ne(stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['OpenAPIDocDiff.ModulesWithChanges'], ''))
     variables:
@@ -229,7 +229,7 @@ jobs:
             $ModuleMapping.Keys | ForEach-Object {
                 $ModuleName = $_
                 $ModuleProjectDir = "$(System.DefaultWorkingDirectory)/src/$ModuleName/$ModuleName"
-                & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -ArtifactsLocation $(Build.ArtifactStagingDirectory)\
+                & $(System.DefaultWorkingDirectory)/tools/PackModule.ps1 -Module $ModuleName -ArtifactsLocation $(Build.ArtifactStagingDirectory)\  -ExcludeMarkdownDocsFromNugetPackage
             }
 
       - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

diff --git a/.azure-pipelines/install-tools-template.yml b/.azure-pipelines/install-tools-template.yml
@@ -14,6 +14,12 @@ steps:
         debugMode: false
         version: 3.x
 
+    - task: UseDotNet@2
+      displayName: 'Use .NET Core SDK 5.x'
+      inputs:
+        debugMode: false
+        version: 5.x
+
     - task: NuGetToolInstaller@1
       displayName: 'Install Nuget 5.7'
       inputs:
@@ -28,7 +34,6 @@ steps:
         targetType: inline
         script: |
           dotnet tool update --global PowerShell
-          pwsh
 
     - task: PowerShell@2
       displayName: 'Version Check'
@@ -50,7 +55,7 @@ steps:
       displayName: 'Install AutoRest'
       inputs:
         command: 'custom'
-        customCommand: 'install -g autorest@beta'
+        customCommand: 'install -g autorest@latest'
 
     - task: PowerShell@2
       displayName: 'Register PS Repository'

diff --git a/.azure-pipelines/integrated-pipeline.yml b/.azure-pipelines/integrated-pipeline.yml
@@ -1,6 +1,19 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+parameters:
+  - name: BuildAgent
+    default: MsGraphBuildAgentsWindows
+    displayName: Build Agent
+
+  - name: AzureSubscription
+    default: "Microsoft Graph Build Agents (Win+Lin)"
+    displayName: Azure Subscription
+
+  - name: KeyVault
+    default: "msgraph-build-keyvault"
+    displayName: Build Key vault
+
 variables:
   AUTH_MODULE_NAME: 'Authentication'
   AUTH_MODULE_PATH: 'src\Authentication\Authentication'
@@ -17,8 +30,11 @@ variables:
   GitUserEmail: 'GraphTooling@service.microsoft.com'
   GitUserName: 'Microsoft Graph DevX Tooling'
   BUILDNUMBER: -1
+  BUILDAGENT: ${{ parameters.BuildAgent }}
+  AZURESUBSCRIPTION: ${{ parameters.AzureSubscription }}
+  KEYVAULT: ${{ parameters.KeyVault }}
 
-pool: MsGraphDevXAzureAgents
+pool: $(BUILDAGENT)
 
 trigger:
     branches:
@@ -54,8 +70,8 @@ stages:
     steps:
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Microsoft Graph Build Agents'
-        KeyVaultName: 'msgraph-build-vault'
+        azureSubscription: $(AZURESUBSCRIPTION)
+        KeyVaultName: $(KEYVAULT)
         SecretsFilter: '*'
         RunAsPreJob: true
 

diff --git a/.azure-pipelines/security-postchecks-template.yml b/.azure-pipelines/security-postchecks-template.yml
@@ -4,9 +4,6 @@
 jobs:
 - job: MsGraphPSSDKSecurityPostChecks
   displayName: Microsoft Graph PowerShell SDK Security Post Checks
-  pool: 
-    image: windows-latest
-  timeoutInMinutes: 600
 
   steps:
   - task: CodesignValidation@0

diff --git a/.azure-pipelines/security-prechecks-template.yml b/.azure-pipelines/security-prechecks-template.yml
@@ -5,9 +5,7 @@
 jobs:
 - job: MsGraphPSSDKSecurityPreChecks
   displayName: Microsoft Graph PowerShell SDK Security Pre Checks
-  pool: MsGraphDevXAzureAgents
   timeoutInMinutes: 600
-
   steps:
   - task: CredScan@2
     displayName: 'Run CredScan'

diff --git a/.azure-pipelines/weekly-generation.yml b/.azure-pipelines/weekly-generation.yml
@@ -1,12 +1,21 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
-pool: MsGraphDevXAzureAgents
+
+parameters:
+  - name: BuildAgent
+    default: MsGraphBuildAgentsWindows
+    displayName: Build Agent
 
 variables:
   Branch: "WeeklyOpenApiDocsDownload"
   BaseBranch: "dev"
+  BUILDAGENT: ${{ parameters.BuildAgent }}
+
+pool: $(BUILDAGENT)
+
 trigger: none
 pr: none
 schedules:

diff --git a/Nuget.config b/Nuget.config
@@ -3,7 +3,5 @@
   <packageSources>
     <clear />
     <add key="Nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="PowerShellSDK_BuildFeed" value="https://pkgs.dev.azure.com/microsoftgraph/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/PowerShellSDK_BuildFeed/nuget/v3/index.json" />
-    <add key="LocalNugetFeed" value="https://pkgs.dev.azure.com/microsoftgraph/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/b395d603-5c77-4af9-a495-1e3cdbb49e1e/nuget/v2" />
   </packageSources>
 </configuration>
diff --git a/config/ModuleMetadata.json b/config/ModuleMetadata.json
@@ -22,5 +22,5 @@
   ],
   "releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
   "assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
-  "version": "1.3.1"
+  "version": "1.4.1"
 }
diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
@@ -1,5 +1,5 @@
 {
-    "Applications":"^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
+    "Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
     "Bookings": "^bookingBusinesses\\.|^bookingCurrencies\\.",
     "Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
     "ChangeNotifications": "^subscriptions\\.",
@@ -8,6 +8,11 @@
     "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.(.*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$",
@@ -19,18 +24,17 @@
     "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$",
+    "PersonalContacts": "^users.contactFolder$|^users.contact$",
     "Planner": "^planner\\.|^users.plannerUser$|^groups.plannerGroup$",
-    "Reports": "^reports\\.|^auditLogs\\.",
+    "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$|^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$"
+    "Users.Functions": "^users.Functions$",
 
-    // "Devices.CorporateManagement": "^deviceManagement\\.", - Max Limit
     // "WorkBooks": "^workbooks\\.",// Max limit.
-}
+}