Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/metadata-parser-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
dotnet-version: 9.x

- run: dotnet tool install --global Microsoft.OpenApi.Hidi
- run: dotnet tool install --global Microsoft.OpenApi.Hidi --version 1.6.24
name: Install Hidi

- name: Validate latest XSLT rules
Expand Down
23 changes: 23 additions & 0 deletions schemas/beta-Bleu.csdl
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,12 @@
<Property Name="registrationCampaign" Type="Collection(graph.keyValue)" Nullable="false" />
<Property Name="registrationCampaignRelativeUrl" Type="Edm.String" />
</ComplexType>
<ComplexType Name="contentSensitivityLabelAssignment">
<Property Name="assignmentMethod" Type="graph.sensitivityLabelAssignmentMethod" Nullable="false" />
<Property Name="justificationText" Type="Edm.String" />
<Property Name="sensitivityLabelId" Type="Edm.String" />
<Property Name="tenantId" Type="Edm.String" />
</ComplexType>
<ComplexType Name="conversionUserDetails">
<Property Name="convertedToInternalUserDateTime" Type="Edm.DateTimeOffset" Nullable="false" />
<Property Name="displayName" Type="Edm.String" Nullable="false" />
Expand Down Expand Up @@ -1321,6 +1327,11 @@
<Property Name="publishingTeamName" Type="Edm.String" />
</ComplexType>
<ComplexType Name="plannerUserIds" OpenType="true" />
<ComplexType Name="planUsageRight">
<Property Name="hasSensitivityLabel" Type="Edm.Boolean" Nullable="false" />
<Property Name="planId" Type="Edm.String" Nullable="false" />
<Property Name="usageRights" Type="graph.usageRightsInfo" />
</ComplexType>
<ComplexType Name="preApprovalDetail">
<Property Name="permissions" Type="graph.preApprovedPermissions" Nullable="false" />
<Property Name="scopeType" Type="graph.resourceScopeType" Nullable="false" />
Expand Down Expand Up @@ -1602,6 +1613,13 @@
<Property Name="updateWindowEndTime" Type="Edm.TimeOfDay" />
<Property Name="updateWindowStartTime" Type="Edm.TimeOfDay" />
</ComplexType>
<ComplexType Name="usageRightsInfo">
<Property Name="allowCopy" Type="Edm.Boolean" Nullable="false" />
<Property Name="allowEdit" Type="Edm.Boolean" Nullable="false" />
<Property Name="allowExport" Type="Edm.Boolean" Nullable="false" />
<Property Name="allowPrint" Type="Edm.Boolean" Nullable="false" />
<Property Name="allowView" Type="Edm.Boolean" Nullable="false" />
</ComplexType>
<ComplexType Name="validatingDomains" Abstract="true">
<Property Name="rootDomains" Type="graph.rootDomains" Nullable="false" />
</ComplexType>
Expand Down Expand Up @@ -2493,6 +2511,7 @@
<EntityType Name="plannerPlan" BaseType="graph.plannerDelta">
<Property Name="archivalInfo" Type="graph.plannerArchivalInfo" />
<Property Name="container" Type="graph.plannerPlanContainer" />
<Property Name="contentSensitivityLabelAssignment" Type="graph.contentSensitivityLabelAssignment" />
<Property Name="contexts" Type="graph.plannerPlanContextCollection" />
<Property Name="createdBy" Type="graph.identitySet" />
<Property Name="createdDateTime" Type="Edm.DateTimeOffset" />
Expand Down Expand Up @@ -3325,6 +3344,10 @@
<Parameter Name="bindingParameter" Type="graph.synchronizationSchema" />
<ReturnType Type="Collection(graph.attributeMappingFunctionSchema)" />
</Function>
<Function Name="getUsageRights" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.plannerPlan" />
<ReturnType Type="graph.planUsageRight" />
</Function>
<Function Name="Ping" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.synchronization" />
<ReturnType Type="Edm.String" Unicode="false" />
Expand Down
18 changes: 18 additions & 0 deletions schemas/beta-Delos.csdl
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@
<ComplexType Name="enumeratedScopeSensitivityLabels" BaseType="graph.scopeSensitivityLabels">
<Property Name="sensitivityLabels" Type="Collection(Edm.String)" />
</ComplexType>
<ComplexType Name="extensionSchemaProperty">
<Property Name="name" Type="Edm.String" />
<Property Name="type" Type="Edm.String" />
</ComplexType>
<ComplexType Name="federatedIdentityExpression">
<Property Name="languageVersion" Type="Edm.Int32" Nullable="false" />
<Property Name="value" Type="Edm.String" Nullable="false" />
Expand Down Expand Up @@ -674,6 +678,7 @@
<Property Name="membershipType" Type="Edm.String" />
<Property Name="visibility" Type="Edm.String" />
<NavigationProperty Name="deletedMembers" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
<NavigationProperty Name="members" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="scopedRoleMembers" Type="Collection(graph.scopedRoleMembership)" ContainsTarget="true" />
</EntityType>
Expand Down Expand Up @@ -956,6 +961,7 @@
<Property Name="registrationDateTime" Type="Edm.DateTimeOffset" />
<Property Name="systemLabels" Type="Collection(Edm.String)" Nullable="false" />
<Property Name="trustType" Type="Edm.String" />
<NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
<NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="registeredOwners" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="registeredUsers" Type="Collection(graph.directoryObject)" />
Expand Down Expand Up @@ -1089,6 +1095,7 @@
</Key>
<Property Name="id" Type="Edm.String" Nullable="false" />
</EntityType>
<EntityType Name="extension" BaseType="graph.entity" />
<EntityType Name="extensionProperty" BaseType="graph.directoryObject" OpenType="true">
<Property Name="appDisplayName" Type="Edm.String" />
<Property Name="dataType" Type="Edm.String" Nullable="false" />
Expand Down Expand Up @@ -1169,6 +1176,7 @@
<NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true" />
<NavigationProperty Name="createdOnBehalfOf" Type="graph.directoryObject" />
<NavigationProperty Name="endpoints" Type="Collection(graph.endpoint)" ContainsTarget="true" />
<NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
<NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="members" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="membersWithLicenseErrors" Type="Collection(graph.directoryObject)" />
Expand Down Expand Up @@ -1274,6 +1282,7 @@
<Property Name="verifiedDomains" Type="Collection(graph.verifiedDomain)" Nullable="false" />
<NavigationProperty Name="branding" Type="graph.organizationalBranding" ContainsTarget="true" />
<NavigationProperty Name="certificateBasedAuthConfiguration" Type="Collection(graph.certificateBasedAuthConfiguration)" />
<NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
<NavigationProperty Name="partnerInformation" Type="graph.partnerInformation" ContainsTarget="true" />
</EntityType>
<EntityType Name="organizationalBranding" BaseType="graph.organizationalBrandingProperties">
Expand Down Expand Up @@ -1441,6 +1450,13 @@
<Property Name="preferredAuthenticationProtocol" Type="graph.authenticationProtocol" />
<Property Name="signingCertificate" Type="Edm.String" />
</EntityType>
<EntityType Name="schemaExtension" BaseType="graph.entity">
<Property Name="description" Type="Edm.String" />
<Property Name="owner" Type="Edm.String" Nullable="false" />
<Property Name="properties" Type="Collection(graph.extensionSchemaProperty)" Nullable="false" />
<Property Name="status" Type="Edm.String" Nullable="false" />
<Property Name="targetTypes" Type="Collection(Edm.String)" Nullable="false" />
</EntityType>
<EntityType Name="scopedRoleMembership" BaseType="graph.entity">
<Property Name="administrativeUnitId" Type="Edm.String" Nullable="false" />
<Property Name="roleId" Type="Edm.String" Nullable="false" />
Expand Down Expand Up @@ -1687,6 +1703,7 @@
<NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true" />
<NavigationProperty Name="createdObjects" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="directReports" Type="Collection(graph.directoryObject)" />
<NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
<NavigationProperty Name="licenseDetails" Type="Collection(graph.licenseDetails)" ContainsTarget="true" />
<NavigationProperty Name="manager" Type="graph.directoryObject" />
<NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)" />
Expand Down Expand Up @@ -1976,6 +1993,7 @@
<NavigationPropertyBinding Path="certificateBasedAuthConfiguration" Target="certificateBasedAuthConfiguration" />
</EntitySet>
<EntitySet Name="permissionGrants" EntityType="microsoft.graph.resourceSpecificPermissionGrant" />
<EntitySet Name="schemaExtensions" EntityType="microsoft.graph.schemaExtension" />
<EntitySet Name="scopedRoleMemberships" EntityType="microsoft.graph.scopedRoleMembership" />
<EntitySet Name="servicePrincipals" EntityType="microsoft.graph.servicePrincipal">
<NavigationPropertyBinding Path="appManagementPolicies" Target="policies/appManagementPolicies" />
Expand Down
Loading
Loading