Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove autoReconcileProxyConflict parameter from restore action of graph.directoryObject #697

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Remove autoReconcileProxyConflict parameter from restore action of graph.directoryObject #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afefc8d
temporary fix for metadata
andrueastman Sep 25, 2024
777e7e8
Merge remote-tracking branch 'origin/master' into andrueastman/tempor…
andrueastman Sep 26, 2024
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
6 changes: 5 additions & 1 deletion transforms/csdl/preprocess_csdl.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,10 @@
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Function[@Name='delta'][edm:Parameter[@Name='token']][edm:Parameter[@Type='Collection(graph.site)']]"/>
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Function[@Name='additionalAccess'][edm:Parameter[@Name='accessPackageId']][edm:Parameter[@Type='Collection(graph.accessPackageAssignment)']][1]"/>

<!-- Remove action parameter -->
<!-- This should be a temp fix, tracking: https://github.com/microsoft/OpenAPI.NET.OData/issues/582 -->
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='restore']/edm:Parameter[@Name='autoReconcileProxyConflict']"/>

<!-- Remove action parameters -->
<!-- This should be a temp fix, tracking: https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator/issues/261 -->
<!-- <xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='createUploadSession']/edm:Parameter[@Name='deferCommit']"/> -->
Expand All @@ -662,7 +666,7 @@
edm:Schema[@Namespace='microsoft.graph']/edm:Function[@IsBound='true'][edm:Parameter[@Type='graph.directoryObject']] |
edm:Schema[@Namespace='microsoft.graph']/edm:Function[@IsBound='true'][edm:Parameter[@Type='Collection(graph.directoryObject)']]">
<xsl:copy>
<xsl:copy-of select="@* | node()" />
<xsl:apply-templates select="@* | node()" />
<Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding"/>
</xsl:copy>
</xsl:template>
Expand Down
7 changes: 7 additions & 0 deletions transforms/csdl/preprocess_csdl_test_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,13 @@
<Parameter Name="method" Type="graph.Json" />
<ReturnType Type="graph.workbookFunctionResult" />
</Action>
<Action Name="restore" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.directoryObject" Nullable="false" />
<Parameter Name="autoReconcileProxyConflict" Type="Edm.Boolean">
<Annotation Term="Org.OData.Core.V1.OptionalParameter" />
</Parameter>
<ReturnType Type="graph.directoryObject" />
</Action>
<Action Name="add" IsBound="true">
<Parameter Name="bindingParameter" Type="Collection(graph.site)" />
<Parameter Name="value" Type="Collection(graph.site)" />
Expand Down
23 changes: 14 additions & 9 deletions transforms/csdl/preprocess_csdl_test_output.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type='text/xsl' href='preprocess_csdl.xsl'?>
<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
<edmx:DataServices>
Expand Down Expand Up @@ -562,11 +562,11 @@
</Collection>
</Annotation>
</Property>
</EntityType>
<EntityType Name="workbookFunctionResult" BaseType="graph.entity">
<Property Name="error" Type="Edm.String" />
<Property Name="value" Type="Edm.Untyped" />
</EntityType>
</EntityType>
<EntityType Name="workbookFunctionResult" BaseType="graph.entity">
<Property Name="error" Type="Edm.String" />
<Property Name="value" Type="graph.Json" />
</EntityType>
<EntityType Name="authenticationEventsFlow" BaseType="graph.entity" Abstract="true" OpenType="true">
<Property Name="conditions" Type="graph.authenticationConditions">
<Annotation Term="Org.OData.Core.V1.Description" String="The conditions representing the context of the authentication request that will be used to decide whether the events policy will be invoked." />
Expand Down Expand Up @@ -1190,11 +1190,16 @@
</Function>
<Action Name="days360" IsBound="true">
<Parameter Name="bindparameter" Type="graph.workbookFunctions" />
<Parameter Name="startDate" Type="Edm.Untyped" />
<Parameter Name="endDate" Type="Edm.Untyped" />
<Parameter Name="method" Type="Edm.Untyped" />
<Parameter Name="startDate" Type="graph.Json" />
<Parameter Name="endDate" Type="graph.Json" />
<Parameter Name="method" Type="graph.Json" />
<ReturnType Type="graph.workbookFunctionResult" />
</Action>
<Action Name="restore" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.directoryObject" Nullable="false" />
<ReturnType Type="graph.directoryObject" />
<Annotation Term="Org.OData.Core.V1.RequiresExplicitBinding" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm" />
</Action>
<Action Name="add" IsBound="true">
<Parameter Name="bindingParameter" Type="Collection(graph.site)" />
<Parameter Name="value" Type="Collection(graph.site)" />
Expand Down
Loading