From 0802b47f6c11eebf4a0c97f82deb9aaa5ec4b862 Mon Sep 17 00:00:00 2001
From: David W <1511024+marabooy@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:30:56 +0300
Subject: [PATCH] Schema sync 2024-08-21 from 1.3.455.0

---
 schemas/annotated-beta-Prod.csdl | 50 ++++++++++++++++++++++++++++++++
 schemas/beta-Fairfax.csdl        | 20 ++++++++++---
 schemas/beta-Mooncake.csdl       | 12 +++++---
 schemas/beta-Prod.csdl           | 50 ++++++++++++++++++++++++++++++++
 schemas/v1.0-Fairfax.csdl        | 11 ++++---
 schemas/v1.0-Mooncake.csdl       | 11 ++++---
 6 files changed, 138 insertions(+), 16 deletions(-)

diff --git a/schemas/annotated-beta-Prod.csdl b/schemas/annotated-beta-Prod.csdl
index d9a35594..2ceca5e3 100644
--- a/schemas/annotated-beta-Prod.csdl
+++ b/schemas/annotated-beta-Prod.csdl
@@ -4409,6 +4409,7 @@
         <Member Name="saml20" Value="4" />
         <Member Name="unknownFutureValue" Value="8" />
         <Member Name="remoteDesktopToken" Value="16" />
+        <Member Name="refreshToken" Value="32" />
       </EnumType>
       <EnumType Name="incompatiblePrinterSettings">
         <Member Name="show" Value="0" />
@@ -13765,6 +13766,10 @@
         <Property Name="positiveReinforcement" Type="graph.positiveReinforcementNotification" />
         <Property Name="settingType" Type="graph.endUserNotificationSettingType" />
       </ComplexType>
+      <ComplexType Name="enforceAppPIN">
+        <Property Name="excludeTargets" Type="Collection(graph.excludeTarget)" Nullable="false" />
+        <Property Name="includeTargets" Type="Collection(graph.includeTarget)" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="enrollmentTimeDeviceMembershipTarget">
         <Property Name="targetId" Type="Edm.String" />
         <Property Name="targetType" Type="graph.enrollmentTimeDeviceMembershipTargetType" Nullable="false" />
@@ -15378,6 +15383,9 @@
         <Property Name="displayLocationInformationRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
         <Property Name="numberMatchingRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
       </ComplexType>
+      <ComplexType Name="microsoftAuthenticatorPlatformSettings">
+        <Property Name="enforceAppPIN" Type="graph.enforceAppPIN" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="microsoftCustomTrainingSetting" BaseType="graph.trainingSetting">
         <Property Name="completionDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="trainingAssignmentMappings" Type="Collection(graph.microsoftTrainingAssignmentMapping)" />
@@ -21585,6 +21593,7 @@
         <Property Name="description" Type="Edm.String" />
         <Property Name="displayName" Type="Edm.String" />
         <Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="microsoftAuthenticatorPlatformSettings" Type="graph.microsoftAuthenticatorPlatformSettings" Nullable="false" />
         <Property Name="policyMigrationState" Type="graph.authenticationMethodsPolicyMigrationState" />
         <Property Name="policyVersion" Type="Edm.String" />
         <Property Name="reconfirmationInDays" Type="Edm.Int32" />
@@ -25286,6 +25295,8 @@
       <EntityType Name="educationSubmission" BaseType="graph.entity">
         <Property Name="excusedBy" Type="graph.identitySet" />
         <Property Name="excusedDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="lastModifiedBy" Type="graph.identitySet" />
+        <Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="reassignedBy" Type="graph.identitySet" />
         <Property Name="reassignedDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="recipient" Type="graph.educationSubmissionRecipient" />
@@ -40513,12 +40524,36 @@
         <Parameter Name="significance" Type="graph.Json" />
         <ReturnType Type="graph.workbookFunctionResult" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.calendar" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.contact" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.contactFolder" />
+      </Action>
       <Action Name="permanentDelete" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.driveItem" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.event" />
+      </Action>
       <Action Name="permanentDelete" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.fileStorageContainer" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.mailFolder" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.message" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.outlookTask" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.outlookTaskFolder" />
+      </Action>
       <Action Name="permut" IsBound="true">
         <Parameter Name="bindparameter" Type="graph.workbookFunctions" />
         <Parameter Name="number" Type="graph.Json" />
@@ -43794,6 +43829,10 @@
         <Parameter Name="cloudPcId" Type="Edm.String" Unicode="false" />
         <ReturnType Type="Edm.Stream" />
       </Function>
+      <Function Name="getRecentlyModifiedSubmissions" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.educationClass" />
+        <ReturnType Type="Collection(graph.educationSubmission)" />
+      </Function>
       <Function Name="getRecentNotebooks" IsBound="true">
         <Parameter Name="bindingParameter" Type="Collection(graph.notebook)" />
         <Parameter Name="includePersonalNotebooks" Type="Edm.Boolean" Nullable="false" />
@@ -63958,6 +63997,12 @@
       <Annotations Target="microsoft.graph.educationSubmission/excusedDateTime">
         <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
       </Annotations>
+      <Annotations Target="microsoft.graph.educationSubmission/lastModifiedBy">
+        <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
+      </Annotations>
+      <Annotations Target="microsoft.graph.educationSubmission/lastModifiedDateTime">
+        <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
+      </Annotations>
       <Annotations Target="microsoft.graph.educationSubmission/reassignedBy">
         <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
       </Annotations>
@@ -65758,6 +65803,9 @@
       <Annotations Target="microsoft.graph.getManagedDevicesWithFailedOrPendingApps(microsoft.graph.user)">
         <Annotation Term="Org.OData.Core.V1.Description" String="Retrieves the list of devices with failed or pending apps" />
       </Annotations>
+      <Annotations Target="microsoft.graph.getRecentlyModifiedSubmissions(microsoft.graph.educationClass)">
+        <Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding" Bool="true" />
+      </Annotations>
       <Annotations Target="microsoft.graph.getRemediationHistory(microsoft.graph.deviceHealthScript)">
         <Annotation Term="Org.OData.Core.V1.Description" String="Function to get the number of remediations by a device health scripts" />
       </Annotations>
@@ -95964,6 +96012,8 @@
         <Member Name="block" Value="0" />
         <Member Name="allow" Value="1" />
         <Member Name="unknownFutureValue" Value="2" />
+        <Member Name="bypass" Value="3" />
+        <Member Name="alert" Value="4" />
       </EnumType>
       <EnumType Name="forwardingCategory">
         <Member Name="default" Value="0" />
diff --git a/schemas/beta-Fairfax.csdl b/schemas/beta-Fairfax.csdl
index 929c6f15..4b065834 100644
--- a/schemas/beta-Fairfax.csdl
+++ b/schemas/beta-Fairfax.csdl
@@ -3631,6 +3631,7 @@
         <Member Name="saml20" Value="4" />
         <Member Name="unknownFutureValue" Value="8" />
         <Member Name="remoteDesktopToken" Value="16" />
+        <Member Name="refreshToken" Value="32" />
       </EnumType>
       <EnumType Name="incompatiblePrinterSettings">
         <Member Name="show" Value="0" />
@@ -8825,10 +8826,12 @@
         <Property Name="decryptionKey" Type="Edm.String" />
         <Property Name="downloadUrl" Type="Edm.String" />
       </ComplexType>
-      <ComplexType Name="appManagementConfiguration">
+      <ComplexType Name="appManagementApplicationConfiguration" BaseType="graph.appManagementConfiguration" />
+      <ComplexType Name="appManagementConfiguration" Abstract="true">
         <Property Name="keyCredentials" Type="Collection(graph.keyCredentialConfiguration)" />
         <Property Name="passwordCredentials" Type="Collection(graph.passwordCredentialConfiguration)" />
       </ComplexType>
+      <ComplexType Name="appManagementServicePrincipalConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="appMetadata">
         <Property Name="data" Type="Collection(graph.appMetadataEntry)" />
         <Property Name="version" Type="Edm.Int32" Nullable="false" />
@@ -10096,6 +10099,7 @@
         <Property Name="applicationMode" Type="graph.applicationMode" />
         <Property Name="id" Type="Edm.String" />
       </ComplexType>
+      <ComplexType Name="customAppManagementConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="customAppScopeAttributesDictionary" BaseType="graph.Dictionary" OpenType="true" />
       <ComplexType Name="customExtensionAuthenticationConfiguration" Abstract="true" />
       <ComplexType Name="customExtensionCallbackConfiguration" Abstract="true">
@@ -11011,6 +11015,10 @@
         <Property Name="allowMailForwarding" Type="Edm.Boolean" />
         <Property Name="decryptionRightsManagementTemplateId" Type="Edm.String" />
       </ComplexType>
+      <ComplexType Name="enforceAppPIN">
+        <Property Name="excludeTargets" Type="Collection(graph.excludeTarget)" Nullable="false" />
+        <Property Name="includeTargets" Type="Collection(graph.includeTarget)" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="enrollmentTimeDeviceMembershipTarget">
         <Property Name="targetId" Type="Edm.String" />
         <Property Name="targetType" Type="graph.enrollmentTimeDeviceMembershipTargetType" Nullable="false" />
@@ -12357,6 +12365,9 @@
         <Property Name="displayLocationInformationRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
         <Property Name="numberMatchingRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
       </ComplexType>
+      <ComplexType Name="microsoftAuthenticatorPlatformSettings">
+        <Property Name="enforceAppPIN" Type="graph.enforceAppPIN" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="microsoftManagedDesktop">
         <Property Name="managedType" Type="graph.microsoftManagedDesktopType" />
         <Property Name="profile" Type="Edm.String" />
@@ -17073,7 +17084,7 @@
       </EntityType>
       <EntityType Name="appManagementPolicy" BaseType="graph.policyBase">
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="restrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="restrictions" Type="graph.customAppManagementConfiguration" />
         <NavigationProperty Name="appliesTo" Type="Collection(graph.directoryObject)" />
       </EntityType>
       <EntityType Name="appRoleAssignment" BaseType="graph.entity">
@@ -17235,6 +17246,7 @@
         <Property Name="description" Type="Edm.String" />
         <Property Name="displayName" Type="Edm.String" />
         <Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="microsoftAuthenticatorPlatformSettings" Type="graph.microsoftAuthenticatorPlatformSettings" Nullable="false" />
         <Property Name="policyMigrationState" Type="graph.authenticationMethodsPolicyMigrationState" />
         <Property Name="policyVersion" Type="Edm.String" />
         <Property Name="reconfirmationInDays" Type="Edm.Int32" />
@@ -24933,9 +24945,9 @@
         <NavigationProperty Name="includeTargets" Type="Collection(graph.authenticationMethodTarget)" ContainsTarget="true" />
       </EntityType>
       <EntityType Name="tenantAppManagementPolicy" BaseType="graph.policyBase">
-        <Property Name="applicationRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="applicationRestrictions" Type="graph.appManagementApplicationConfiguration" />
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementServicePrincipalConfiguration" />
       </EntityType>
       <EntityType Name="tenantAttachRBAC" BaseType="graph.entity" />
       <EntityType Name="tenantReference">
diff --git a/schemas/beta-Mooncake.csdl b/schemas/beta-Mooncake.csdl
index ee419b09..e68e06d9 100644
--- a/schemas/beta-Mooncake.csdl
+++ b/schemas/beta-Mooncake.csdl
@@ -2964,6 +2964,7 @@
         <Member Name="saml20" Value="4" />
         <Member Name="unknownFutureValue" Value="8" />
         <Member Name="remoteDesktopToken" Value="16" />
+        <Member Name="refreshToken" Value="32" />
       </EnumType>
       <EnumType Name="inferenceClassificationType">
         <Member Name="focused" Value="0" />
@@ -6528,10 +6529,12 @@
         <Property Name="decryptionKey" Type="Edm.String" />
         <Property Name="downloadUrl" Type="Edm.String" />
       </ComplexType>
-      <ComplexType Name="appManagementConfiguration">
+      <ComplexType Name="appManagementApplicationConfiguration" BaseType="graph.appManagementConfiguration" />
+      <ComplexType Name="appManagementConfiguration" Abstract="true">
         <Property Name="keyCredentials" Type="Collection(graph.keyCredentialConfiguration)" />
         <Property Name="passwordCredentials" Type="Collection(graph.passwordCredentialConfiguration)" />
       </ComplexType>
+      <ComplexType Name="appManagementServicePrincipalConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="appMetadata">
         <Property Name="data" Type="Collection(graph.appMetadataEntry)" />
         <Property Name="version" Type="Edm.Int32" Nullable="false" />
@@ -7428,6 +7431,7 @@
       <ComplexType Name="currencyColumn">
         <Property Name="locale" Type="Edm.String" />
       </ComplexType>
+      <ComplexType Name="customAppManagementConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="customAppScopeAttributesDictionary" BaseType="graph.Dictionary" OpenType="true" />
       <ComplexType Name="customExtensionAuthenticationConfiguration" Abstract="true" />
       <ComplexType Name="customExtensionCallbackConfiguration">
@@ -13353,7 +13357,7 @@
       </EntityType>
       <EntityType Name="appManagementPolicy" BaseType="graph.policyBase">
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="restrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="restrictions" Type="graph.customAppManagementConfiguration" />
         <NavigationProperty Name="appliesTo" Type="Collection(graph.directoryObject)" />
       </EntityType>
       <EntityType Name="appRoleAssignment" BaseType="graph.entity">
@@ -20015,9 +20019,9 @@
         <Property Name="temporaryAccessPass" Type="Edm.String" />
       </EntityType>
       <EntityType Name="tenantAppManagementPolicy" BaseType="graph.policyBase">
-        <Property Name="applicationRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="applicationRestrictions" Type="graph.appManagementApplicationConfiguration" />
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementServicePrincipalConfiguration" />
       </EntityType>
       <EntityType Name="tenantAttachRBAC" BaseType="graph.entity" />
       <EntityType Name="tenantReference">
diff --git a/schemas/beta-Prod.csdl b/schemas/beta-Prod.csdl
index d9a35594..2ceca5e3 100644
--- a/schemas/beta-Prod.csdl
+++ b/schemas/beta-Prod.csdl
@@ -4409,6 +4409,7 @@
         <Member Name="saml20" Value="4" />
         <Member Name="unknownFutureValue" Value="8" />
         <Member Name="remoteDesktopToken" Value="16" />
+        <Member Name="refreshToken" Value="32" />
       </EnumType>
       <EnumType Name="incompatiblePrinterSettings">
         <Member Name="show" Value="0" />
@@ -13765,6 +13766,10 @@
         <Property Name="positiveReinforcement" Type="graph.positiveReinforcementNotification" />
         <Property Name="settingType" Type="graph.endUserNotificationSettingType" />
       </ComplexType>
+      <ComplexType Name="enforceAppPIN">
+        <Property Name="excludeTargets" Type="Collection(graph.excludeTarget)" Nullable="false" />
+        <Property Name="includeTargets" Type="Collection(graph.includeTarget)" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="enrollmentTimeDeviceMembershipTarget">
         <Property Name="targetId" Type="Edm.String" />
         <Property Name="targetType" Type="graph.enrollmentTimeDeviceMembershipTargetType" Nullable="false" />
@@ -15378,6 +15383,9 @@
         <Property Name="displayLocationInformationRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
         <Property Name="numberMatchingRequiredState" Type="graph.authenticationMethodFeatureConfiguration" />
       </ComplexType>
+      <ComplexType Name="microsoftAuthenticatorPlatformSettings">
+        <Property Name="enforceAppPIN" Type="graph.enforceAppPIN" Nullable="false" />
+      </ComplexType>
       <ComplexType Name="microsoftCustomTrainingSetting" BaseType="graph.trainingSetting">
         <Property Name="completionDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="trainingAssignmentMappings" Type="Collection(graph.microsoftTrainingAssignmentMapping)" />
@@ -21585,6 +21593,7 @@
         <Property Name="description" Type="Edm.String" />
         <Property Name="displayName" Type="Edm.String" />
         <Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="microsoftAuthenticatorPlatformSettings" Type="graph.microsoftAuthenticatorPlatformSettings" Nullable="false" />
         <Property Name="policyMigrationState" Type="graph.authenticationMethodsPolicyMigrationState" />
         <Property Name="policyVersion" Type="Edm.String" />
         <Property Name="reconfirmationInDays" Type="Edm.Int32" />
@@ -25286,6 +25295,8 @@
       <EntityType Name="educationSubmission" BaseType="graph.entity">
         <Property Name="excusedBy" Type="graph.identitySet" />
         <Property Name="excusedDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="lastModifiedBy" Type="graph.identitySet" />
+        <Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="reassignedBy" Type="graph.identitySet" />
         <Property Name="reassignedDateTime" Type="Edm.DateTimeOffset" />
         <Property Name="recipient" Type="graph.educationSubmissionRecipient" />
@@ -40513,12 +40524,36 @@
         <Parameter Name="significance" Type="graph.Json" />
         <ReturnType Type="graph.workbookFunctionResult" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.calendar" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.contact" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.contactFolder" />
+      </Action>
       <Action Name="permanentDelete" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.driveItem" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.event" />
+      </Action>
       <Action Name="permanentDelete" IsBound="true">
         <Parameter Name="bindingParameter" Type="graph.fileStorageContainer" />
       </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.mailFolder" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.message" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.outlookTask" />
+      </Action>
+      <Action Name="permanentDelete" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.outlookTaskFolder" />
+      </Action>
       <Action Name="permut" IsBound="true">
         <Parameter Name="bindparameter" Type="graph.workbookFunctions" />
         <Parameter Name="number" Type="graph.Json" />
@@ -43794,6 +43829,10 @@
         <Parameter Name="cloudPcId" Type="Edm.String" Unicode="false" />
         <ReturnType Type="Edm.Stream" />
       </Function>
+      <Function Name="getRecentlyModifiedSubmissions" IsBound="true">
+        <Parameter Name="bindingParameter" Type="graph.educationClass" />
+        <ReturnType Type="Collection(graph.educationSubmission)" />
+      </Function>
       <Function Name="getRecentNotebooks" IsBound="true">
         <Parameter Name="bindingParameter" Type="Collection(graph.notebook)" />
         <Parameter Name="includePersonalNotebooks" Type="Edm.Boolean" Nullable="false" />
@@ -63958,6 +63997,12 @@
       <Annotations Target="microsoft.graph.educationSubmission/excusedDateTime">
         <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
       </Annotations>
+      <Annotations Target="microsoft.graph.educationSubmission/lastModifiedBy">
+        <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
+      </Annotations>
+      <Annotations Target="microsoft.graph.educationSubmission/lastModifiedDateTime">
+        <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
+      </Annotations>
       <Annotations Target="microsoft.graph.educationSubmission/reassignedBy">
         <Annotation Term="Org.OData.Core.V1.Computed" Bool="true" />
       </Annotations>
@@ -65758,6 +65803,9 @@
       <Annotations Target="microsoft.graph.getManagedDevicesWithFailedOrPendingApps(microsoft.graph.user)">
         <Annotation Term="Org.OData.Core.V1.Description" String="Retrieves the list of devices with failed or pending apps" />
       </Annotations>
+      <Annotations Target="microsoft.graph.getRecentlyModifiedSubmissions(microsoft.graph.educationClass)">
+        <Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding" Bool="true" />
+      </Annotations>
       <Annotations Target="microsoft.graph.getRemediationHistory(microsoft.graph.deviceHealthScript)">
         <Annotation Term="Org.OData.Core.V1.Description" String="Function to get the number of remediations by a device health scripts" />
       </Annotations>
@@ -95964,6 +96012,8 @@
         <Member Name="block" Value="0" />
         <Member Name="allow" Value="1" />
         <Member Name="unknownFutureValue" Value="2" />
+        <Member Name="bypass" Value="3" />
+        <Member Name="alert" Value="4" />
       </EnumType>
       <EnumType Name="forwardingCategory">
         <Member Name="default" Value="0" />
diff --git a/schemas/v1.0-Fairfax.csdl b/schemas/v1.0-Fairfax.csdl
index 8d7d89f4..af813455 100644
--- a/schemas/v1.0-Fairfax.csdl
+++ b/schemas/v1.0-Fairfax.csdl
@@ -4456,10 +4456,12 @@
         <Property Name="decryptionKey" Type="Edm.String" />
         <Property Name="downloadUrl" Type="Edm.String" />
       </ComplexType>
-      <ComplexType Name="appManagementConfiguration">
+      <ComplexType Name="appManagementApplicationConfiguration" BaseType="graph.appManagementConfiguration" />
+      <ComplexType Name="appManagementConfiguration" Abstract="true">
         <Property Name="keyCredentials" Type="Collection(graph.keyCredentialConfiguration)" />
         <Property Name="passwordCredentials" Type="Collection(graph.passwordCredentialConfiguration)" />
       </ComplexType>
+      <ComplexType Name="appManagementServicePrincipalConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="appRole">
         <Property Name="allowedMemberTypes" Type="Collection(Edm.String)" Nullable="false" />
         <Property Name="description" Type="Edm.String" />
@@ -5141,6 +5143,7 @@
       <ComplexType Name="currencyColumn">
         <Property Name="locale" Type="Edm.String" />
       </ComplexType>
+      <ComplexType Name="customAppManagementConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="customExtensionAuthenticationConfiguration" Abstract="true" />
       <ComplexType Name="customExtensionCallbackConfiguration" Abstract="true">
         <Property Name="timeoutDuration" Type="Edm.Duration" />
@@ -8608,7 +8611,7 @@
       </EntityType>
       <EntityType Name="appManagementPolicy" BaseType="graph.policyBase">
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="restrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="restrictions" Type="graph.customAppManagementConfiguration" />
         <NavigationProperty Name="appliesTo" Type="Collection(graph.directoryObject)" />
       </EntityType>
       <EntityType Name="appRoleAssignment" BaseType="graph.directoryObject">
@@ -12469,9 +12472,9 @@
         <NavigationProperty Name="includeTargets" Type="Collection(graph.authenticationMethodTarget)" ContainsTarget="true" />
       </EntityType>
       <EntityType Name="tenantAppManagementPolicy" BaseType="graph.policyBase">
-        <Property Name="applicationRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="applicationRestrictions" Type="graph.appManagementApplicationConfiguration" />
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementServicePrincipalConfiguration" />
       </EntityType>
       <EntityType Name="tenantRelationship" />
       <EntityType Name="termsAndConditions" BaseType="graph.entity">
diff --git a/schemas/v1.0-Mooncake.csdl b/schemas/v1.0-Mooncake.csdl
index b0247630..92b608c9 100644
--- a/schemas/v1.0-Mooncake.csdl
+++ b/schemas/v1.0-Mooncake.csdl
@@ -2603,10 +2603,12 @@
         <Property Name="decryptionKey" Type="Edm.String" />
         <Property Name="downloadUrl" Type="Edm.String" />
       </ComplexType>
-      <ComplexType Name="appManagementConfiguration">
+      <ComplexType Name="appManagementApplicationConfiguration" BaseType="graph.appManagementConfiguration" />
+      <ComplexType Name="appManagementConfiguration" Abstract="true">
         <Property Name="keyCredentials" Type="Collection(graph.keyCredentialConfiguration)" />
         <Property Name="passwordCredentials" Type="Collection(graph.passwordCredentialConfiguration)" />
       </ComplexType>
+      <ComplexType Name="appManagementServicePrincipalConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="appRole">
         <Property Name="allowedMemberTypes" Type="Collection(Edm.String)" Nullable="false" />
         <Property Name="description" Type="Edm.String" />
@@ -3070,6 +3072,7 @@
       <ComplexType Name="currencyColumn">
         <Property Name="locale" Type="Edm.String" />
       </ComplexType>
+      <ComplexType Name="customAppManagementConfiguration" BaseType="graph.appManagementConfiguration" />
       <ComplexType Name="customExtensionAuthenticationConfiguration" Abstract="true" />
       <ComplexType Name="customExtensionCallbackConfiguration">
         <Property Name="timeoutDuration" Type="Edm.Duration" />
@@ -5601,7 +5604,7 @@
       </EntityType>
       <EntityType Name="appManagementPolicy" BaseType="graph.policyBase">
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="restrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="restrictions" Type="graph.customAppManagementConfiguration" />
         <NavigationProperty Name="appliesTo" Type="Collection(graph.directoryObject)" />
       </EntityType>
       <EntityType Name="appRoleAssignment" BaseType="graph.directoryObject">
@@ -8644,9 +8647,9 @@
         <Property Name="url" Type="Edm.String" />
       </EntityType>
       <EntityType Name="tenantAppManagementPolicy" BaseType="graph.policyBase">
-        <Property Name="applicationRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="applicationRestrictions" Type="graph.appManagementApplicationConfiguration" />
         <Property Name="isEnabled" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementConfiguration" />
+        <Property Name="servicePrincipalRestrictions" Type="graph.appManagementServicePrincipalConfiguration" />
       </EntityType>
       <EntityType Name="tenantRelationship" />
       <EntityType Name="termsAndConditions" BaseType="graph.entity">