Skip to content

Commit 1c9a45a

Browse files
committed
Merge branch 'BulkOps_Odatabind' of https://github.com/OData/WebApi into BulkOps_Odatabind
2 parents a648a4a + b82cd97 commit 1c9a45a

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

src/Microsoft.AspNet.OData.Shared/DeltaOfTStructuralType.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@ internal IDictionary<string, object> DeltaNestedResources
131131
get { return _deltaNestedResources; }
132132
}
133133

134+
internal IDictionary<string, object> DeltaNestedResources
135+
{
136+
get { return _deltaNestedResources; }
137+
}
138+
134139
/// <inheritdoc/>
135140
public override Type ExpectedClrType
136141
=> typeof(TStructuralType);
@@ -158,6 +163,21 @@ public IList<string> UpdatableProperties
158163
internal PropertyInfo InstanceAnnotationsPropertyInfo { get { return _instanceAnnotationsPropertyInfo; } }
159164

160165

166+
/// <summary>
167+
/// Gets the enum type of <see cref="EdmDeltaEntityKind"/>.
168+
/// </summary>
169+
public EdmDeltaEntityKind DeltaKind { get; protected set; }
170+
171+
/// <inheritdoc />
172+
public IODataInstanceAnnotationContainer TransientInstanceAnnotationContainer { get; set; }
173+
174+
/// <inheritdoc />
175+
public ODataIdContainer ODataIdContainer { get; set; }
176+
177+
/// <inheritdoc />
178+
internal PropertyInfo InstanceAnnotationsPropertyInfo { get { return _instanceAnnotationsPropertyInfo; } }
179+
180+
161181
/// <inheritdoc/>
162182
public override void Clear()
163183
{

test/UnitTest/Microsoft.AspNet.OData.Test/PublicApi/Microsoft.AspNet.OData.PublicApi.bsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ public class Microsoft.AspNet.OData.Delta`1 : TypedDelta, IDynamicMetaObjectProv
315315
System.Type ExpectedClrType { public virtual get; }
316316
ODataIdContainer ODataIdContainer { public virtual get; public virtual set; }
317317
System.Type StructuredType { public virtual get; }
318+
IODataInstanceAnnotationContainer TransientInstanceAnnotationContainer { public virtual get; public virtual set; }
318319

319320
System.Collections.Generic.IList`1[[System.String]] UpdatableProperties { public get; }
320321

test/UnitTest/Microsoft.AspNetCore.OData.Test/PublicApi/Microsoft.AspNetCore.OData.PublicApi.bsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ public class Microsoft.AspNet.OData.Delta`1 : TypedDelta, IDynamicMetaObjectProv
330330
System.Type ExpectedClrType { public virtual get; }
331331
ODataIdContainer ODataIdContainer { public virtual get; public virtual set; }
332332
System.Type StructuredType { public virtual get; }
333+
IODataInstanceAnnotationContainer TransientInstanceAnnotationContainer { public virtual get; public virtual set; }
333334

334335
System.Collections.Generic.IList`1[[System.String]] UpdatableProperties { public get; }
335336

test/UnitTest/Microsoft.AspNetCore.OData.Test/PublicApi/Microsoft.AspNetCore3x.OData.PublicApi.bsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ public class Microsoft.AspNet.OData.Delta`1 : TypedDelta, IDynamicMetaObjectProv
334334
System.Type ExpectedClrType { public virtual get; }
335335
ODataIdContainer ODataIdContainer { public virtual get; public virtual set; }
336336
System.Type StructuredType { public virtual get; }
337+
IODataInstanceAnnotationContainer TransientInstanceAnnotationContainer { public virtual get; public virtual set; }
337338

338339
System.Collections.Generic.IList`1[[System.String]] UpdatableProperties { public get; }
339340

0 commit comments

Comments
 (0)