update the CreateODataDeltaResourceSetReaderAsync method (#2752)

* update the CreateODataDeltaResourceSetReaderAsync method * update version * update version
OData · Mar 7, 2023 · 8976d24 · 8976d24
1 parent 9a06ab9
commit 8976d24
Show file tree

Hide file tree

Showing 16 changed files with 156 additions and 66 deletions.
diff --git a/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj b/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj
@@ -88,20 +88,20 @@
  <Private>True</Private>
  </Reference>
  <Reference Include="Microsoft.CSharp" />
- <Reference Include="Microsoft.OData.Core, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
+ <Reference Include="Microsoft.OData.Core, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.OData.Core.7.15.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Edm, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+ <Reference Include="Microsoft.OData.Edm, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.15.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.Spatial, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll</HintPath>
+ <Reference Include="Microsoft.Spatial, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.Spatial.7.15.0\lib\net45\Microsoft.Spatial.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\sln\packages\Newtonsoft.Json.15.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

diff --git a/samples/AspNetODataSample.Web/packages.config b/samples/AspNetODataSample.Web/packages.config
@@ -15,9 +15,9 @@
  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net461" />
  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net461" developmentDependency="true" />
- <package id="Microsoft.OData.Core" version="7.12.1" targetFramework="net461" />
- <package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net461" />
- <package id="Microsoft.Spatial" version="7.12.1" targetFramework="net461" />
+ <package id="Microsoft.OData.Core" version="7.15.0" targetFramework="net461" />
+ <package id="Microsoft.OData.Edm" version="7.15.0" targetFramework="net461" />
+ <package id="Microsoft.Spatial" version="7.15.0" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
  <package id="System.Memory" version="4.5.4" targetFramework="net461" />

diff --git a/src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceSetDeserializer.cs b/src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceSetDeserializer.cs
@@ -54,7 +54,8 @@ public override object Read(ODataMessageReader messageReader, Type type, ODataDe
  throw Error.Argument("edmType", SRResources.ArgumentMustBeOfType, EdmTypeKind.Complex + " or " + EdmTypeKind.Entity);
  }
 
- ODataReader resourceSetReader = readContext.IsChangedObjectCollection ? messageReader.CreateODataDeltaResourceSetReader() : messageReader.CreateODataResourceSetReader();
+ // If we want to support '#$delta' context URL, then we need to pass the EntitySet and StructuredType params to the CreateODataDeltaResourceSetReader method. 
+ ODataReader resourceSetReader = readContext.IsChangedObjectCollection ? messageReader.CreateODataDeltaResourceSetReader(readContext.Path?.NavigationSource as IEdmEntitySetBase, edmType.AsEntity() as IEdmStructuredType) : messageReader.CreateODataResourceSetReader();
  object resourceSet = resourceSetReader.ReadResourceOrResourceSet();
  return ReadInline(resourceSet, edmType, readContext);
  }
@@ -76,7 +77,8 @@ public override async Task<object> ReadAsync(ODataMessageReader messageReader, T
  throw Error.Argument("edmType", SRResources.ArgumentMustBeOfType, EdmTypeKind.Complex + " or " + EdmTypeKind.Entity);
  }
 
- ODataReader resourceSetReader = readContext.IsChangedObjectCollection ? await messageReader.CreateODataDeltaResourceSetReaderAsync() : await messageReader.CreateODataResourceSetReaderAsync();
+ // If we want to support '#$delta' context URL, then we need to pass the EntitySet and StructuredType params to the CreateODataDeltaResourceSetReaderAsync method. 
+ ODataReader resourceSetReader = readContext.IsChangedObjectCollection ? await messageReader.CreateODataDeltaResourceSetReaderAsync(readContext.Path?.NavigationSource as IEdmEntitySetBase, edmType.AsEntity() as IEdmStructuredType) : await messageReader.CreateODataResourceSetReaderAsync();
  object resourceSet = await resourceSetReader.ReadResourceOrResourceSetAsync();
  return ReadInline(resourceSet, edmType, readContext);
  }

diff --git a/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj b/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj
@@ -33,16 +33,16 @@
  <HintPath>..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Core, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
+ <Reference Include="Microsoft.OData.Core, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.OData.Core.7.15.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Edm, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+ <Reference Include="Microsoft.OData.Edm, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.15.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.Spatial, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll</HintPath>
+ <Reference Include="Microsoft.Spatial, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\sln\packages\Microsoft.Spatial.7.15.0\lib\net45\Microsoft.Spatial.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/src/Microsoft.AspNet.OData/packages.config b/src/Microsoft.AspNet.OData/packages.config
@@ -6,10 +6,10 @@
  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net45" developmentDependency="true" />
  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net45" />
  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net45" />
- <package id="Microsoft.OData.Core" version="7.13.0" targetFramework="net45" />
- <package id="Microsoft.OData.Edm" version="7.13.0" targetFramework="net45" />
+ <package id="Microsoft.OData.Core" version="7.15.0" targetFramework="net45" />
+ <package id="Microsoft.OData.Edm" version="7.15.0" targetFramework="net45" />
  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net45" developmentDependency="true" />
  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net45" developmentDependency="true" />
- <package id="Microsoft.Spatial" version="7.13.0" targetFramework="net45" />
+ <package id="Microsoft.Spatial" version="7.15.0" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
 </packages>
diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj
@@ -42,9 +42,9 @@
 
  <ItemGroup>
  <PackageReference Include="CompareNETObjects" Version="4.78.0" />
- <PackageReference Include="Microsoft.OData.Core" Version="7.13.0" />
- <PackageReference Include="Microsoft.OData.Edm" Version="7.13.0" />
- <PackageReference Include="Microsoft.Spatial" Version="7.13.0" />
+ <PackageReference Include="Microsoft.OData.Core" Version="7.15.0" />
+ <PackageReference Include="Microsoft.OData.Edm" Version="7.15.0" />
+ <PackageReference Include="Microsoft.Spatial" Version="7.15.0" />
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj b/...ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj
@@ -46,16 +46,16 @@
  <HintPath>..\..\..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Client, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.13.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
+ <Reference Include="Microsoft.OData.Client, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.15.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Core, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
+ <Reference Include="Microsoft.OData.Core, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.15.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Edm, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+ <Reference Include="Microsoft.OData.Edm, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.15.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -70,8 +70,8 @@
  <HintPath>..\..\..\..\sln\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.Spatial, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll</HintPath>
+ <Reference Include="Microsoft.Spatial, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.15.0\lib\net45\Microsoft.Spatial.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config
@@ -13,13 +13,13 @@
  <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
- <package id="Microsoft.OData.Client" version="7.13.0" targetFramework="net452" />
- <package id="Microsoft.OData.Core" version="7.13.0" targetFramework="net452" />
- <package id="Microsoft.OData.Edm" version="7.13.0" targetFramework="net452" />
+ <package id="Microsoft.OData.Client" version="7.15.0" targetFramework="net452" />
+ <package id="Microsoft.OData.Core" version="7.15.0" targetFramework="net452" />
+ <package id="Microsoft.OData.Edm" version="7.15.0" targetFramework="net452" />
  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
- <package id="Microsoft.Spatial" version="7.13.0" targetFramework="net452" />
+ <package id="Microsoft.Spatial" version="7.15.0" targetFramework="net452" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

diff --git a/...crosoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj b/...crosoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj
@@ -1858,20 +1858,20 @@
  <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
  <HintPath>..\..\..\..\sln\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
  </Reference>
- <Reference Include="Microsoft.OData.Client, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.13.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
+ <Reference Include="Microsoft.OData.Client, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.15.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Core, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
+ <Reference Include="Microsoft.OData.Core, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.15.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.OData.Edm, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
+ <Reference Include="Microsoft.OData.Edm, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.15.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Microsoft.Spatial, Version=7.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll</HintPath>
+ <Reference Include="Microsoft.Spatial, Version=7.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.15.0\lib\net45\Microsoft.Spatial.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config
@@ -65,10 +65,10 @@
  <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net461" />
- <package id="Microsoft.OData.Client" version="7.13.0" targetFramework="net461" />
- <package id="Microsoft.OData.Core" version="7.13.0" targetFramework="net461" />
- <package id="Microsoft.OData.Edm" version="7.13.0" targetFramework="net461" />
- <package id="Microsoft.Spatial" version="7.13.0" targetFramework="net461" />
+ <package id="Microsoft.OData.Client" version="7.15.0" targetFramework="net461" />
+ <package id="Microsoft.OData.Core" version="7.15.0" targetFramework="net461" />
+ <package id="Microsoft.OData.Edm" version="7.15.0" targetFramework="net461" />
+ <package id="Microsoft.Spatial" version="7.15.0" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
  <package id="Remotion.Linq" version="2.2.0" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />

diff --git a/...oft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj b/...oft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj
@@ -27,7 +27,7 @@
  <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
- <PackageReference Include="Microsoft.OData.Client" Version="7.13.0" />
+ <PackageReference Include="Microsoft.OData.Client" Version="7.15.0" />
  <PackageReference Include="System.Reflection" Version="4.3.0" />
  <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
  <PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />