Skip to content

Commit e3807d8

Browse files
authored
Merge branch 'dev' into features/CertThumbprintValidation
2 parents b1e18b0 + 8a83f3d commit e3807d8

File tree

62 files changed

+141185
-569
lines changed

Some content is hidden

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

62 files changed

+141185
-569
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
# Calculate meta-module version
9393
$MetaModule = Find-Module "Microsoft.Graph" -Repository PSGallery
9494
$MetaModuleVersion = [System.Version]($MetaModule.Version)
95-
$NewMetaModuleVersion = "$($MetaModuleVersion.Major).$($MetaModuleVersion.Minor + 1).$($MetaModuleVersion.Build)"
95+
$NewMetaModuleVersion = "$($MetaModuleVersion.Major).$($MetaModuleVersion.Minor).$($MetaModuleVersion.Build + 1)"
9696
# Bump meta-module minor version
9797
Write-Host "Bumping Microsoft.Graph to $NewMetaModuleVersion."
9898
& "$(System.DefaultWorkingDirectory)\tools\SetMetaModuleVersion.ps1" -VersionNumber $NewMetaModuleVersion
@@ -102,7 +102,7 @@ jobs:
102102
try {
103103
$Module = Find-Module "Microsoft.Graph.$_" -Repository PSGallery -ErrorAction Stop
104104
$ModuleVersion = [System.Version]($Module.Version)
105-
$NewModuleVersion = "$($ModuleVersion.Major).$($ModuleVersion.Minor + 1).$($ModuleVersion.Build)"
105+
$NewModuleVersion = "$($ModuleVersion.Major).$($ModuleVersion.Minor).$($ModuleVersion.Build + 1)"
106106
Write-Host "Bumping $_ to $NewModuleVersion."
107107
. "$(System.DefaultWorkingDirectory)\tools\SetServiceModuleVersion.ps1" -VersionNumber $NewModuleVersion -Modules $_
108108
} catch {

.azure-pipelines/install-tools-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
displayName: 'Install AutoRest'
5151
inputs:
5252
command: 'custom'
53-
customCommand: 'install -g autorest@beta'
53+
customCommand: 'install -g autorest@latest'
5454

5555
- task: PowerShell@2
5656
displayName: 'Register PS Repository'

Nuget.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
<packageSources>
44
<clear />
55
<add key="Nuget" value="https://api.nuget.org/v3/index.json" />
6-
<add key="PowerShellSDK_BuildFeed" value="https://pkgs.dev.azure.com/microsoftgraph/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/PowerShellSDK_BuildFeed/nuget/v3/index.json" />
7-
<add key="LocalNugetFeed" value="https://pkgs.dev.azure.com/microsoftgraph/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/b395d603-5c77-4af9-a495-1e3cdbb49e1e/nuget/v2" />
86
</packageSources>
97
</configuration>

config/ModulesMapping.jsonc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Applications":"^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
2+
"Applications": "^applicationTemplates\\.|^applications\\.|^servicePrincipals\\.|^onPremisesPublishingProfiles\\.|^users.appRoleAssignment$|^groups.appRoleAssignment$",
33
"Bookings": "^bookingBusinesses\\.|^bookingCurrencies\\.",
44
"Calendar": "^places\\.|^users.calendar$|^users.calendarGroup$|^users.event$|^groups.calendar$|^groups.event$",
55
"ChangeNotifications": "^subscriptions\\.",
@@ -8,6 +8,11 @@
88
"CrossDeviceExperiences": "^users.userActivity$|^users.device$",
99
"Devices.CloudPrint": "^print\\.",
1010
"Devices.CorporateManagement": "^deviceAppManagement\\.|^officeConfiguration\\.|^users.mobileAppIntentAndState$|^users.mobileAppTroubleshootingEvent$|^users.windowsInformationProtectionDeviceRegistration$|^users.managedAppRegistration$|^users.managedDevice$|^users.deviceManagementTroubleshootingEvent$|^users.deviceEnrollmentConfiguration$",
11+
"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)$",
12+
"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)",
13+
"DeviceManagement.Enrolment": "^deviceManagement.(.*Enrollment.*|.*Autopilot.*|.*depOnboarding.*|importedDeviceIdentity|onPremisesConditionalAccessSettings|windowsFeatureUpdateProfile)$|^roleManagement\\.",
14+
"DeviceManagement.Actions": "^deviceManagement.Actions$",
15+
"DeviceManagement.Functions": "^deviceManagement.Functions$",
1116
"DirectoryObjects": "^directoryObjects\\.",
1217
"Education": "^education\\.",
1318
"Files": "^drives\\.|^shares\\.|^users.drive$|^groups.drive$",
@@ -19,18 +24,17 @@
1924
"Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
2025
"Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
2126
"People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
22-
"PersonalContacts":"^users.contactFolder$|^users.contact$",
27+
"PersonalContacts": "^users.contactFolder$|^users.contact$",
2328
"Planner": "^planner\\.|^users.plannerUser$|^groups.plannerGroup$",
24-
"Reports": "^reports\\.|^auditLogs\\.",
29+
"Reports": "^reports\\.|^auditLogs\\.|^deviceManagement.deviceManagementReports$",
2530
"SchemaExtensions": "^schemaExtensions\\.",
2631
"Search": "^search\\.|^external\\.",
2732
"Security": "^security\\.",
2833
"Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
2934
"Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs.teamsApp$|^users.userTeamwork$|^teamwork\\.|^users.team$|^groups.team$",
3035
"Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
3136
"Users.Actions": "^users.Actions$",
32-
"Users.Functions": "^users.Functions$"
37+
"Users.Functions": "^users.Functions$",
3338

34-
// "Devices.CorporateManagement": "^deviceManagement\\.", - Max Limit
3539
// "WorkBooks": "^workbooks\\.",// Max limit.
36-
}
40+
}

0 commit comments

Comments
 (0)