Skip to content

Commit 383d240

Browse files
github-actions[bot]github-actions[bot]
authored
Merge csdl-fetcher/msgraph into main
2 parents 91381ae + 287eea8 commit 383d240

File tree

2 files changed

+397
-162
lines changed

2 files changed

+397
-162
lines changed

‎csdl/microsoft-graph-beta.csdl.xml‎

Lines changed: 42 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -528,23 +528,6 @@
528528
</Collection>
529529
</Annotation>
530530
</Annotations>
531-
<Annotations Target="microsoft.graph.cloudPcStatus/updatingSingleSignOn">
532-
<Annotation Term="Org.OData.Core.V1.Revisions">
533-
<Collection>
534-
<Record>
535-
<PropertyValue Property="Date" Date="2023-10-12" />
536-
<PropertyValue Property="Description" String="The updatingSingleSignOn member is deprecated and will not be supported starting August 31, 2024. Please use modifyingSingleSignOn instead." />
537-
<PropertyValue Property="Kind">
538-
<EnumMember>
539-
Org.OData.Core.V1.RevisionKind/Deprecated
540-
</EnumMember>
541-
</PropertyValue>
542-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
543-
<PropertyValue Property="Version" String="2023-10/updatingSingleSignOn" />
544-
</Record>
545-
</Collection>
546-
</Annotation>
547-
</Annotations>
548531
<Annotations Target="microsoft.graph.frontlineCloudPcAccessState/noLicensesAvailable">
549532
<Annotation Term="Org.OData.Core.V1.Revisions">
550533
<Collection>
@@ -15420,40 +15403,6 @@
1542015403
</Collection>
1542115404
</Annotation>
1542215405
</Annotations>
15423-
<Annotations Target="microsoft.graph.cloudPcConnectionSettings">
15424-
<Annotation Term="Org.OData.Core.V1.Revisions">
15425-
<Collection>
15426-
<Record>
15427-
<PropertyValue Property="Date" Date="2023-10-12" />
15428-
<PropertyValue Property="Description" String="Starting from August 31, 2024, CloudPcConnectionSettings property will no longer be supported and will be marked as deprecated. Please use CloudPcConnectionSetting instead." />
15429-
<PropertyValue Property="Kind">
15430-
<EnumMember>
15431-
Org.OData.Core.V1.RevisionKind/Deprecated
15432-
</EnumMember>
15433-
</PropertyValue>
15434-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15435-
<PropertyValue Property="Version" String="2023-10/cloudPcConnectionSettings" />
15436-
</Record>
15437-
</Collection>
15438-
</Annotation>
15439-
</Annotations>
15440-
<Annotations Target="microsoft.graph.cloudPcConnectivityResult/updatedDateTime">
15441-
<Annotation Term="Org.OData.Core.V1.Revisions">
15442-
<Collection>
15443-
<Record>
15444-
<PropertyValue Property="Date" Date="2023-10-12" />
15445-
<PropertyValue Property="Description" String="Starting from August 31, 2024, updatedDatetime property will no longer be supported and will be marked as deprecated. Please use lastModifiedDateTime instead." />
15446-
<PropertyValue Property="Kind">
15447-
<EnumMember>
15448-
Org.OData.Core.V1.RevisionKind/Deprecated
15449-
</EnumMember>
15450-
</PropertyValue>
15451-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15452-
<PropertyValue Property="Version" String="2023-10/updatedDatetime" />
15453-
</Record>
15454-
</Collection>
15455-
</Annotation>
15456-
</Annotations>
1545715406
<Annotations Target="microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting/crossRegionDisasterRecoveryEnabled">
1545815407
<Annotation Term="Org.OData.Core.V1.Revisions">
1545915408
<Collection>
@@ -15522,40 +15471,6 @@
1552215471
</Collection>
1552315472
</Annotation>
1552415473
</Annotations>
15525-
<Annotations Target="microsoft.graph.cloudPcStatusDetails">
15526-
<Annotation Term="Org.OData.Core.V1.Revisions">
15527-
<Collection>
15528-
<Record>
15529-
<PropertyValue Property="Date" Date="2023-10-12" />
15530-
<PropertyValue Property="Description" String="Starting from August 31, 2024, statusDetails property will no longer be supported and will be marked as deprecated. Please use statusDetail instead." />
15531-
<PropertyValue Property="Kind">
15532-
<EnumMember>
15533-
Org.OData.Core.V1.RevisionKind/Deprecated
15534-
</EnumMember>
15535-
</PropertyValue>
15536-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15537-
<PropertyValue Property="Version" String="2023-10/cloudPcStatusDetails" />
15538-
</Record>
15539-
</Collection>
15540-
</Annotation>
15541-
</Annotations>
15542-
<Annotations Target="microsoft.graph.cloudPcRemoteActionResult/statusDetails">
15543-
<Annotation Term="Org.OData.Core.V1.Revisions">
15544-
<Collection>
15545-
<Record>
15546-
<PropertyValue Property="Date" Date="2023-10-12" />
15547-
<PropertyValue Property="Description" String="Starting from August 31, 2024, statusDetails property will no longer be supported and will be marked as deprecated. Please use statusDetail instead." />
15548-
<PropertyValue Property="Kind">
15549-
<EnumMember>
15550-
Org.OData.Core.V1.RevisionKind/Deprecated
15551-
</EnumMember>
15552-
</PropertyValue>
15553-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15554-
<PropertyValue Property="Version" String="2023-10/statusDetails" />
15555-
</Record>
15556-
</Collection>
15557-
</Annotation>
15558-
</Annotations>
1555915474
<Annotations Target="microsoft.graph.cloudPcRestorePointSetting/frequencyInHours">
1556015475
<Annotation Term="Org.OData.Core.V1.Revisions">
1556115476
<Collection>
@@ -15624,40 +15539,6 @@
1562415539
</Collection>
1562515540
</Annotation>
1562615541
</Annotations>
15627-
<Annotations Target="microsoft.graph.cloudPC/connectionSettings">
15628-
<Annotation Term="Org.OData.Core.V1.Revisions">
15629-
<Collection>
15630-
<Record>
15631-
<PropertyValue Property="Date" Date="2023-10-12" />
15632-
<PropertyValue Property="Description" String="Starting from August 31, 2024, connectionSettings property will no longer be supported and will be marked as deprecated. Please use onnectionSetting instead." />
15633-
<PropertyValue Property="Kind">
15634-
<EnumMember>
15635-
Org.OData.Core.V1.RevisionKind/Deprecated
15636-
</EnumMember>
15637-
</PropertyValue>
15638-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15639-
<PropertyValue Property="Version" String="2023-10/connectionSettings" />
15640-
</Record>
15641-
</Collection>
15642-
</Annotation>
15643-
</Annotations>
15644-
<Annotations Target="microsoft.graph.cloudPC/statusDetails">
15645-
<Annotation Term="Org.OData.Core.V1.Revisions">
15646-
<Collection>
15647-
<Record>
15648-
<PropertyValue Property="Date" Date="2023-10-12" />
15649-
<PropertyValue Property="Description" String="Starting from August 31, 2024, statusDetails property will no longer be supported and will be marked as deprecated. Please use statusDetail instead." />
15650-
<PropertyValue Property="Kind">
15651-
<EnumMember>
15652-
Org.OData.Core.V1.RevisionKind/Deprecated
15653-
</EnumMember>
15654-
</PropertyValue>
15655-
<PropertyValue Property="RemovalDate" Date="2024-08-31" />
15656-
<PropertyValue Property="Version" String="2023-10/statusDetails" />
15657-
</Record>
15658-
</Collection>
15659-
</Annotation>
15660-
</Annotations>
1566115542
<Annotations Target="microsoft.graph.cloudPcDeviceImage/statusDetails">
1566215543
<Annotation Term="Org.OData.Core.V1.Revisions">
1566315544
<Collection>
@@ -20916,6 +20797,22 @@
2091620797
<Annotations Target="microsoft.graph.callRecords.callRecord/organizer_v2">
2091720798
<Annotation Term="Org.OData.Core.V1.AutoExpand" Bool="true" />
2091820799
</Annotations>
20800+
<Annotations Target="microsoft.graph.teamsAdministration.policyIdentifierDetail">
20801+
<Annotation Term="Org.OData.Core.V1.Revisions">
20802+
<Collection>
20803+
<Record>
20804+
<PropertyValue Property="Date" Date="2024-12-10" />
20805+
<PropertyValue Property="Kind">
20806+
<EnumMember>
20807+
Org.OData.Core.V1.RevisionKind/Deprecated
20808+
</EnumMember>
20809+
</PropertyValue>
20810+
<PropertyValue Property="RemovalDate" Date="2025-12-01" />
20811+
<PropertyValue Property="Version" String="2024-12/PrivatePreview:TeamsAdminPolicyAssignmentAPI" />
20812+
</Record>
20813+
</Collection>
20814+
</Annotation>
20815+
</Annotations>
2091920816
<Annotations Target="microsoft.graph.accessReviewHistoryDefinition/downloadUri">
2092020817
<Annotation Term="Org.OData.Core.V1.Revisions">
2092120818
<Collection>
@@ -53482,7 +53379,6 @@
5348253379
<Member Name="unknownFutureValue" Value="10" />
5348353380
<Member Name="movingRegion" Value="11" />
5348453381
<Member Name="resizePendingLicense" Value="12" />
53485-
<Member Name="updatingSingleSignOn" Value="13" />
5348653382
<Member Name="modifyingSingleSignOn" Value="14" />
5348753383
<Member Name="preparing" Value="16" />
5348853384
</EnumType>
@@ -64190,7 +64086,6 @@
6419064086
<Property Name="aadDeviceId" Type="Edm.String" />
6419164087
<Property Name="allotmentDisplayName" Type="Edm.String" />
6419264088
<Property Name="connectionSetting" Type="graph.cloudPcConnectionSetting" />
64193-
<Property Name="connectionSettings" Type="graph.cloudPcConnectionSettings" />
6419464089
<Property Name="connectivityResult" Type="graph.cloudPcConnectivityResult" />
6419564090
<Property Name="deviceRegionName" Type="Edm.String" />
6419664091
<Property Name="disasterRecoveryCapability" Type="graph.cloudPcDisasterRecoveryCapability" />
@@ -64221,7 +64116,6 @@
6422164116
<Property Name="sharedDeviceDetail" Type="graph.cloudPcFrontlineSharedDeviceDetail" />
6422264117
<Property Name="status" Type="graph.cloudPcStatus" Nullable="false" />
6422364118
<Property Name="statusDetail" Type="graph.cloudPcStatusDetail" />
64224-
<Property Name="statusDetails" Type="graph.cloudPcStatusDetails" />
6422564119
<Property Name="userAccountType" Type="graph.cloudPcUserAccountType" />
6422664120
<Property Name="userDetail" Type="graph.cloudPcEntraUserDetail" />
6422764121
<Property Name="userExperienceType" Type="graph.cloudPcUserExperienceType" />
@@ -67414,9 +67308,6 @@
6741467308
<ComplexType Name="cloudPcConnectionSetting">
6741567309
<Property Name="enableSingleSignOn" Type="Edm.Boolean" Nullable="false" />
6741667310
</ComplexType>
67417-
<ComplexType Name="cloudPcConnectionSettings">
67418-
<Property Name="enableSingleSignOn" Type="Edm.Boolean" Nullable="false" />
67419-
</ComplexType>
6742067311
<ComplexType Name="cloudPcConnectivityEvent">
6742167312
<Property Name="activityId" Type="Edm.String" Nullable="false" />
6742267313
<Property Name="eventDateTime" Type="Edm.DateTimeOffset" Nullable="false" />
@@ -67429,7 +67320,6 @@
6742967320
<Property Name="failedHealthCheckItems" Type="Collection(graph.cloudPcHealthCheckItem)" />
6743067321
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
6743167322
<Property Name="status" Type="graph.cloudPcConnectivityStatus" Nullable="false" />
67432-
<Property Name="updatedDateTime" Type="Edm.DateTimeOffset" Nullable="false" />
6743367323
</ComplexType>
6743467324
<ComplexType Name="cloudPcHealthCheckItem">
6743567325
<Property Name="additionalDetails" Type="Edm.String" />
@@ -67564,18 +67454,12 @@
6756467454
<Property Name="managedDeviceId" Type="Edm.String" />
6756567455
<Property Name="startDateTime" Type="Edm.DateTimeOffset" />
6756667456
<Property Name="statusDetail" Type="graph.cloudPcStatusDetail" />
67567-
<Property Name="statusDetails" Type="graph.cloudPcStatusDetails" />
6756867457
</ComplexType>
6756967458
<ComplexType Name="cloudPcStatusDetail">
6757067459
<Property Name="additionalInformation" Type="Collection(graph.keyValuePair)" />
6757167460
<Property Name="code" Type="Edm.String" />
6757267461
<Property Name="message" Type="Edm.String" />
6757367462
</ComplexType>
67574-
<ComplexType Name="cloudPcStatusDetails">
67575-
<Property Name="additionalInformation" Type="Collection(graph.keyValuePair)" />
67576-
<Property Name="code" Type="Edm.String" />
67577-
<Property Name="message" Type="Edm.String" />
67578-
</ComplexType>
6757967463
<ComplexType Name="cloudPcResizeValidationResult">
6758067464
<Property Name="cloudPcId" Type="Edm.String" />
6758167465
<Property Name="validationResult" Type="graph.cloudPcResizeValidationCode" />
@@ -107727,7 +107611,9 @@
107727107611
<NavigationProperty Name="policy" Type="teamsAdministration.teamsPolicyAssignment" ContainsTarget="true" />
107728107612
<NavigationProperty Name="userConfigurations" Type="Collection(teamsAdministration.teamsUserConfiguration)" ContainsTarget="true" />
107729107613
</EntityType>
107730-
<EntityType Name="teamsPolicyAssignment" BaseType="graph.entity" />
107614+
<EntityType Name="teamsPolicyAssignment" BaseType="graph.entity">
107615+
<NavigationProperty Name="userAssignments" Type="Collection(teamsAdministration.teamsPolicyUserAssignment)" ContainsTarget="true" />
107616+
</EntityType>
107731107617
<EntityType Name="teamsUserConfiguration" BaseType="graph.entity">
107732107618
<Property Name="accountType" Type="teamsAdministration.accountType" />
107733107619
<Property Name="createdDateTime" Type="Edm.DateTimeOffset" Nullable="false" />
@@ -107740,6 +107626,15 @@
107740107626
<Property Name="userPrincipalName" Type="Edm.String" Nullable="false" />
107741107627
<NavigationProperty Name="user" Type="graph.user" />
107742107628
</EntityType>
107629+
<EntityType Name="policyIdentifierDetail" BaseType="graph.entity">
107630+
<Property Name="name" Type="Edm.String" Nullable="false" />
107631+
<Property Name="policyId" Type="Edm.String" Nullable="false" />
107632+
</EntityType>
107633+
<EntityType Name="teamsPolicyUserAssignment" BaseType="graph.entity">
107634+
<Property Name="policyId" Type="Edm.String" />
107635+
<Property Name="policyType" Type="Edm.String" Nullable="false" />
107636+
<Property Name="userId" Type="Edm.String" Nullable="false" />
107637+
</EntityType>
107743107638
<ComplexType Name="assignedTelephoneNumber">
107744107639
<Property Name="assignmentCategory" Type="teamsAdministration.assignmentCategory" Nullable="false" />
107745107640
<Property Name="telephoneNumber" Type="Edm.String" Nullable="false" />
@@ -107754,6 +107649,20 @@
107754107649
<Property Name="groupId" Type="Edm.String" />
107755107650
<Property Name="policyId" Type="Edm.String" Nullable="false" />
107756107651
</ComplexType>
107652+
<Action Name="assign" IsBound="true">
107653+
<Parameter Name="bindingParameter" Type="Collection(teamsAdministration.teamsPolicyUserAssignment)" />
107654+
<Parameter Name="value" Type="Collection(teamsAdministration.teamsPolicyUserAssignment)" Nullable="false" />
107655+
</Action>
107656+
<Action Name="unassign" IsBound="true">
107657+
<Parameter Name="bindingParameter" Type="Collection(teamsAdministration.teamsPolicyUserAssignment)" />
107658+
<Parameter Name="value" Type="Collection(teamsAdministration.teamsPolicyUserAssignment)" Nullable="false" />
107659+
</Action>
107660+
<Function Name="getPolicyId" IsBound="true">
107661+
<Parameter Name="bindingParameter" Type="teamsAdministration.teamsPolicyAssignment" />
107662+
<Parameter Name="type" Type="Edm.String" Nullable="false" Unicode="false" />
107663+
<Parameter Name="name" Type="Edm.String" Nullable="false" Unicode="false" />
107664+
<ReturnType Type="Collection(teamsAdministration.policyIdentifierDetail)" />
107665+
</Function>
107757107666
</Schema>
107758107667
<Schema Namespace="microsoft.graph.industryData" xmlns="http://docs.oasis-open.org/odata/ns/edm">
107759107668
<EnumType Name="additionalClassGroupAttributes">

0 commit comments

Comments
 (0)