Skip to content

Commit 2f8d17b

Browse files
baywetbaywet
authored
Merge pull request #838 from microsoftgraph/schemas/metadata-publishing-2025-06-20
Schema sync 2025-06-20 from 1.4.10.0
2 parents 9c5b454 + 2459a05 commit 2f8d17b

File tree

2 files changed

+140
-0
lines changed

2 files changed

+140
-0
lines changed

‎schemas/annotated-beta-Prod.csdl‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5835,6 +5835,19 @@
58355835
<Member Name="deliverAfterCampaignEnd" Value="2" />
58365836
<Member Name="unknownFutureValue" Value="3" />
58375837
</EnumType>
5838+
<EnumType Name="notificationEventsType" IsFlags="true">
5839+
<Member Name="none" Value="1" />
5840+
<Member Name="restoreAndPolicyUpdates" Value="2" />
5841+
<Member Name="unknownFutureValue" Value="4" />
5842+
</EnumType>
5843+
<EnumType Name="notificationRecipientsType" IsFlags="true">
5844+
<Member Name="none" Value="0" />
5845+
<Member Name="globalAdmins" Value="1" />
5846+
<Member Name="backupAdmins" Value="2" />
5847+
<Member Name="custom" Value="4" />
5848+
<Member Name="allAdmins" Value="8" />
5849+
<Member Name="unknownFutureValue" Value="16" />
5850+
</EnumType>
58385851
<EnumType Name="notificationTemplateBrandingOptions" IsFlags="true">
58395852
<Member Name="none" Value="0" />
58405853
<Member Name="includeCompanyLogo" Value="1" />
@@ -14130,6 +14143,10 @@
1413014143
<Property Name="localUsersOrGroups" Type="Collection(graph.deviceManagementUserRightsLocalUserOrGroup)" />
1413114144
<Property Name="state" Type="graph.stateManagementSetting" Nullable="false" />
1413214145
</ComplexType>
14146+
<ComplexType Name="deviceMetadata">
14147+
<Property Name="deviceType" Type="Edm.String" />
14148+
<Property Name="ipAddress" Type="Edm.String" />
14149+
</ComplexType>
1413314150
<ComplexType Name="deviceOperatingSystemSummary">
1413414151
<Property Name="androidCorporateWorkProfileCount" Type="Edm.Int32" Nullable="false" />
1413514152
<Property Name="androidCount" Type="Edm.Int32" Nullable="false" />
@@ -16373,6 +16390,10 @@
1637316390
<Property Name="oneNoteClientUrl" Type="graph.externalLink" />
1637416391
<Property Name="oneNoteWebUrl" Type="graph.externalLink" />
1637516392
</ComplexType>
16393+
<ComplexType Name="notificationRecipients">
16394+
<Property Name="customRecipients" Type="Collection(graph.emailIdentity)" Nullable="false" />
16395+
<Property Name="role" Type="graph.notificationRecipientsType" Nullable="false" />
16396+
</ComplexType>
1637616397
<ComplexType Name="notifyUserAction" BaseType="graph.dlpActionInfo">
1637716398
<Property Name="actionLastModifiedDateTime" Type="Edm.DateTimeOffset" />
1637816399
<Property Name="emailText" Type="Edm.String" />
@@ -17513,6 +17534,7 @@
1751317534
<ComplexType Name="processContentRequest">
1751417535
<Property Name="activityMetadata" Type="graph.activityMetadata" Nullable="false" />
1751517536
<Property Name="contentEntries" Type="Collection(graph.processContentMetadataBase)" Nullable="false" />
17537+
<Property Name="deviceMetadata" Type="graph.deviceMetadata" Nullable="false" />
1751617538
<Property Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" Nullable="false" />
1751717539
<Property Name="protectedAppMetadata" Type="graph.protectedApplicationMetadata" />
1751817540
</ComplexType>
@@ -23073,6 +23095,7 @@
2307323095
<NavigationProperty Name="driveInclusionRules" Type="Collection(graph.driveProtectionRule)" ContainsTarget="true" />
2307423096
<NavigationProperty Name="driveProtectionUnits" Type="Collection(graph.driveProtectionUnit)" ContainsTarget="true" />
2307523097
<NavigationProperty Name="driveProtectionUnitsBulkAdditionJobs" Type="Collection(graph.driveProtectionUnitsBulkAdditionJob)" ContainsTarget="true" />
23098+
<NavigationProperty Name="emailNotificationsSetting" Type="graph.emailNotificationsSetting" ContainsTarget="true" />
2307623099
<NavigationProperty Name="exchangeProtectionPolicies" Type="Collection(graph.exchangeProtectionPolicy)" ContainsTarget="true" />
2307723100
<NavigationProperty Name="exchangeRestoreSessions" Type="Collection(graph.exchangeRestoreSession)" ContainsTarget="true" />
2307823101
<NavigationProperty Name="mailboxInclusionRules" Type="Collection(graph.mailboxProtectionRule)" ContainsTarget="true" />
@@ -26793,6 +26816,11 @@
2679326816
<Property Name="destinationRoutingReason" Type="graph.mailDestinationRoutingReason" />
2679426817
<Property Name="recipientEmail" Type="Edm.String" Nullable="false" />
2679526818
</EntityType>
26819+
<EntityType Name="emailNotificationsSetting" BaseType="graph.entity">
26820+
<Property Name="additionalEvents" Type="graph.notificationEventsType" Nullable="false" />
26821+
<Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
26822+
<Property Name="recipients" Type="graph.notificationRecipients" Nullable="false" />
26823+
</EntityType>
2679626824
<EntityType Name="embeddedSIMActivationCodePool" BaseType="graph.entity">
2679726825
<Property Name="activationCodeCount" Type="Edm.Int32" Nullable="false" />
2679826826
<Property Name="activationCodes" Type="Collection(graph.embeddedSIMActivationCode)" Nullable="false" />
@@ -31191,6 +31219,30 @@
3119131219
<Property Name="link" Type="graph.sharingLink" />
3119231220
<Property Name="roles" Type="Collection(Edm.String)" />
3119331221
<Property Name="shareId" Type="Edm.String" />
31222+
<Annotation Term="Org.OData.Core.V1.AlternateKeys">
31223+
<Collection>
31224+
<Record Type="Org.OData.Core.V1.AlternateKey">
31225+
<PropertyValue Property="Key">
31226+
<Collection>
31227+
<Record Type="Org.OData.Core.V1.PropertyRef">
31228+
<PropertyValue Property="Alias" String="email" />
31229+
<PropertyValue Property="Name" PropertyPath="email" />
31230+
</Record>
31231+
</Collection>
31232+
</PropertyValue>
31233+
</Record>
31234+
<Record Type="Org.OData.Core.V1.AlternateKey">
31235+
<PropertyValue Property="Key">
31236+
<Collection>
31237+
<Record Type="Org.OData.Core.V1.PropertyRef">
31238+
<PropertyValue Property="Alias" String="userPrincipalName" />
31239+
<PropertyValue Property="Name" PropertyPath="userPrincipalName" />
31240+
</Record>
31241+
</Collection>
31242+
</PropertyValue>
31243+
</Record>
31244+
</Collection>
31245+
</Annotation>
3119431246
</EntityType>
3119531247
<EntityType Name="permissionGrantConditionSet" BaseType="graph.entity">
3119631248
<Property Name="certifiedClientApplicationsOnly" Type="Edm.Boolean" />
@@ -38982,6 +39034,24 @@
3898239034
<Parameter Name="suffix" Type="graph.Json" />
3898339035
<ReturnType Type="graph.workbookFunctionResult" />
3898439036
</Action>
39037+
<Action Name="compute" IsBound="true">
39038+
<Parameter Name="bindingParameter" Type="graph.tenantProtectionScopeContainer" />
39039+
<Parameter Name="activities" Type="graph.userActivityTypes" />
39040+
<Parameter Name="locations" Type="Collection(graph.policyLocation)" />
39041+
<Parameter Name="pivotOn" Type="graph.policyPivotProperty" />
39042+
<Parameter Name="deviceMetadata" Type="graph.deviceMetadata" />
39043+
<Parameter Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" />
39044+
<ReturnType Type="Collection(graph.policyTenantScope)" />
39045+
</Action>
39046+
<Action Name="compute" IsBound="true">
39047+
<Parameter Name="bindingParameter" Type="graph.userProtectionScopeContainer" />
39048+
<Parameter Name="activities" Type="graph.userActivityTypes" />
39049+
<Parameter Name="locations" Type="Collection(graph.policyLocation)" />
39050+
<Parameter Name="pivotOn" Type="graph.policyPivotProperty" />
39051+
<Parameter Name="deviceMetadata" Type="graph.deviceMetadata" />
39052+
<Parameter Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" />
39053+
<ReturnType Type="Collection(graph.policyUserScope)" />
39054+
</Action>
3898539055
<Action Name="computeRightsAndInheritance" IsBound="true">
3898639056
<Parameter Name="bindingParameter" Type="Collection(graph.sensitivityLabel)" />
3898739057
<Parameter Name="delegatedUserEmail" Type="Edm.String" Unicode="false" />

‎schemas/beta-Prod.csdl‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5835,6 +5835,19 @@
58355835
<Member Name="deliverAfterCampaignEnd" Value="2" />
58365836
<Member Name="unknownFutureValue" Value="3" />
58375837
</EnumType>
5838+
<EnumType Name="notificationEventsType" IsFlags="true">
5839+
<Member Name="none" Value="1" />
5840+
<Member Name="restoreAndPolicyUpdates" Value="2" />
5841+
<Member Name="unknownFutureValue" Value="4" />
5842+
</EnumType>
5843+
<EnumType Name="notificationRecipientsType" IsFlags="true">
5844+
<Member Name="none" Value="0" />
5845+
<Member Name="globalAdmins" Value="1" />
5846+
<Member Name="backupAdmins" Value="2" />
5847+
<Member Name="custom" Value="4" />
5848+
<Member Name="allAdmins" Value="8" />
5849+
<Member Name="unknownFutureValue" Value="16" />
5850+
</EnumType>
58385851
<EnumType Name="notificationTemplateBrandingOptions" IsFlags="true">
58395852
<Member Name="none" Value="0" />
58405853
<Member Name="includeCompanyLogo" Value="1" />
@@ -14130,6 +14143,10 @@
1413014143
<Property Name="localUsersOrGroups" Type="Collection(graph.deviceManagementUserRightsLocalUserOrGroup)" />
1413114144
<Property Name="state" Type="graph.stateManagementSetting" Nullable="false" />
1413214145
</ComplexType>
14146+
<ComplexType Name="deviceMetadata">
14147+
<Property Name="deviceType" Type="Edm.String" />
14148+
<Property Name="ipAddress" Type="Edm.String" />
14149+
</ComplexType>
1413314150
<ComplexType Name="deviceOperatingSystemSummary">
1413414151
<Property Name="androidCorporateWorkProfileCount" Type="Edm.Int32" Nullable="false" />
1413514152
<Property Name="androidCount" Type="Edm.Int32" Nullable="false" />
@@ -16373,6 +16390,10 @@
1637316390
<Property Name="oneNoteClientUrl" Type="graph.externalLink" />
1637416391
<Property Name="oneNoteWebUrl" Type="graph.externalLink" />
1637516392
</ComplexType>
16393+
<ComplexType Name="notificationRecipients">
16394+
<Property Name="customRecipients" Type="Collection(graph.emailIdentity)" Nullable="false" />
16395+
<Property Name="role" Type="graph.notificationRecipientsType" Nullable="false" />
16396+
</ComplexType>
1637616397
<ComplexType Name="notifyUserAction" BaseType="graph.dlpActionInfo">
1637716398
<Property Name="actionLastModifiedDateTime" Type="Edm.DateTimeOffset" />
1637816399
<Property Name="emailText" Type="Edm.String" />
@@ -17513,6 +17534,7 @@
1751317534
<ComplexType Name="processContentRequest">
1751417535
<Property Name="activityMetadata" Type="graph.activityMetadata" Nullable="false" />
1751517536
<Property Name="contentEntries" Type="Collection(graph.processContentMetadataBase)" Nullable="false" />
17537+
<Property Name="deviceMetadata" Type="graph.deviceMetadata" Nullable="false" />
1751617538
<Property Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" Nullable="false" />
1751717539
<Property Name="protectedAppMetadata" Type="graph.protectedApplicationMetadata" />
1751817540
</ComplexType>
@@ -23073,6 +23095,7 @@
2307323095
<NavigationProperty Name="driveInclusionRules" Type="Collection(graph.driveProtectionRule)" ContainsTarget="true" />
2307423096
<NavigationProperty Name="driveProtectionUnits" Type="Collection(graph.driveProtectionUnit)" ContainsTarget="true" />
2307523097
<NavigationProperty Name="driveProtectionUnitsBulkAdditionJobs" Type="Collection(graph.driveProtectionUnitsBulkAdditionJob)" ContainsTarget="true" />
23098+
<NavigationProperty Name="emailNotificationsSetting" Type="graph.emailNotificationsSetting" ContainsTarget="true" />
2307623099
<NavigationProperty Name="exchangeProtectionPolicies" Type="Collection(graph.exchangeProtectionPolicy)" ContainsTarget="true" />
2307723100
<NavigationProperty Name="exchangeRestoreSessions" Type="Collection(graph.exchangeRestoreSession)" ContainsTarget="true" />
2307823101
<NavigationProperty Name="mailboxInclusionRules" Type="Collection(graph.mailboxProtectionRule)" ContainsTarget="true" />
@@ -26793,6 +26816,11 @@
2679326816
<Property Name="destinationRoutingReason" Type="graph.mailDestinationRoutingReason" />
2679426817
<Property Name="recipientEmail" Type="Edm.String" Nullable="false" />
2679526818
</EntityType>
26819+
<EntityType Name="emailNotificationsSetting" BaseType="graph.entity">
26820+
<Property Name="additionalEvents" Type="graph.notificationEventsType" Nullable="false" />
26821+
<Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
26822+
<Property Name="recipients" Type="graph.notificationRecipients" Nullable="false" />
26823+
</EntityType>
2679626824
<EntityType Name="embeddedSIMActivationCodePool" BaseType="graph.entity">
2679726825
<Property Name="activationCodeCount" Type="Edm.Int32" Nullable="false" />
2679826826
<Property Name="activationCodes" Type="Collection(graph.embeddedSIMActivationCode)" Nullable="false" />
@@ -31191,6 +31219,30 @@
3119131219
<Property Name="link" Type="graph.sharingLink" />
3119231220
<Property Name="roles" Type="Collection(Edm.String)" />
3119331221
<Property Name="shareId" Type="Edm.String" />
31222+
<Annotation Term="Org.OData.Core.V1.AlternateKeys">
31223+
<Collection>
31224+
<Record Type="Org.OData.Core.V1.AlternateKey">
31225+
<PropertyValue Property="Key">
31226+
<Collection>
31227+
<Record Type="Org.OData.Core.V1.PropertyRef">
31228+
<PropertyValue Property="Alias" String="email" />
31229+
<PropertyValue Property="Name" PropertyPath="email" />
31230+
</Record>
31231+
</Collection>
31232+
</PropertyValue>
31233+
</Record>
31234+
<Record Type="Org.OData.Core.V1.AlternateKey">
31235+
<PropertyValue Property="Key">
31236+
<Collection>
31237+
<Record Type="Org.OData.Core.V1.PropertyRef">
31238+
<PropertyValue Property="Alias" String="userPrincipalName" />
31239+
<PropertyValue Property="Name" PropertyPath="userPrincipalName" />
31240+
</Record>
31241+
</Collection>
31242+
</PropertyValue>
31243+
</Record>
31244+
</Collection>
31245+
</Annotation>
3119431246
</EntityType>
3119531247
<EntityType Name="permissionGrantConditionSet" BaseType="graph.entity">
3119631248
<Property Name="certifiedClientApplicationsOnly" Type="Edm.Boolean" />
@@ -38982,6 +39034,24 @@
3898239034
<Parameter Name="suffix" Type="graph.Json" />
3898339035
<ReturnType Type="graph.workbookFunctionResult" />
3898439036
</Action>
39037+
<Action Name="compute" IsBound="true">
39038+
<Parameter Name="bindingParameter" Type="graph.tenantProtectionScopeContainer" />
39039+
<Parameter Name="activities" Type="graph.userActivityTypes" />
39040+
<Parameter Name="locations" Type="Collection(graph.policyLocation)" />
39041+
<Parameter Name="pivotOn" Type="graph.policyPivotProperty" />
39042+
<Parameter Name="deviceMetadata" Type="graph.deviceMetadata" />
39043+
<Parameter Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" />
39044+
<ReturnType Type="Collection(graph.policyTenantScope)" />
39045+
</Action>
39046+
<Action Name="compute" IsBound="true">
39047+
<Parameter Name="bindingParameter" Type="graph.userProtectionScopeContainer" />
39048+
<Parameter Name="activities" Type="graph.userActivityTypes" />
39049+
<Parameter Name="locations" Type="Collection(graph.policyLocation)" />
39050+
<Parameter Name="pivotOn" Type="graph.policyPivotProperty" />
39051+
<Parameter Name="deviceMetadata" Type="graph.deviceMetadata" />
39052+
<Parameter Name="integratedAppMetadata" Type="graph.integratedApplicationMetadata" />
39053+
<ReturnType Type="Collection(graph.policyUserScope)" />
39054+
</Action>
3898539055
<Action Name="computeRightsAndInheritance" IsBound="true">
3898639056
<Parameter Name="bindingParameter" Type="Collection(graph.sensitivityLabel)" />
3898739057
<Parameter Name="delegatedUserEmail" Type="Edm.String" Unicode="false" />

0 commit comments

Comments
 (0)