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

PR for 7.6 Beta by making Patchhandler and related classes internal #2606

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

PR for 7.6 Beta by making Patchhandler and related classes internal #2606

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0bce83d
Bulk operations8 (#2502)
Sreejithpin Jun 3, 2021
7c3f404
Feature/new add support for odata bind (#2506)
ElizabethOkerio Jun 11, 2021
cebba7f
updates
Sreejithpin Jul 8, 2021
f9acd98
small update
Sreejithpin Jul 9, 2021
627276d
Code review comments
Sreejithpin Jul 27, 2021
6789fb9
update for odataid _temp
Sreejithpin Aug 24, 2021
9286d98
updates
Sreejithpin Aug 26, 2021
0f85f26
updates to use only factory
Sreejithpin Aug 27, 2021
82823d0
updates
Sreejithpin Aug 30, 2021
20ce568
Bulk operations8 (#2502)
Sreejithpin Jun 3, 2021
f18e40f
Feature/new add support for odata bind (#2506)
ElizabethOkerio Jun 11, 2021
5d2926a
updates
Sreejithpin Jul 8, 2021
8fe74af
Code review comments
Sreejithpin Jul 27, 2021
7670ab7
update for odataid _temp
Sreejithpin Aug 24, 2021
cf028e4
updates
Sreejithpin Aug 26, 2021
76aec31
updates to use only factory
Sreejithpin Aug 27, 2021
5d20b2d
updates
Sreejithpin Aug 30, 2021
c42f50f
Squashing Commits
Sreejithpin Aug 30, 2021
0a202ce
Merged updates
Sreejithpin Oct 29, 2021
763e474
Update Microsoft.AspNetCore.OData.PublicApi.bsl
Sreejithpin Oct 29, 2021
8b92a31
Update DeltaTests.cs
Sreejithpin Oct 29, 2021
847c235
test update
Sreejithpin Oct 29, 2021
80d27dd
test update
Sreejithpin Oct 29, 2021
4778fd0
test update
Sreejithpin Oct 29, 2021
524b2c6
test update
Sreejithpin Oct 29, 2021
f0dbf65
Update DeltaTests.cs
Sreejithpin Oct 29, 2021
8b96a5b
Updates for 7.6 release
Sreejithpin Dec 2, 2021
c15e90a
Update WebStack.versions.settings.targets
Sreejithpin Dec 2, 2021
59138c2
updates
Sreejithpin Dec 4, 2021
9fd1ffa
Update app.config
Sreejithpin Dec 4, 2021
502f20c
Updates
Sreejithpin Dec 20, 2021
7d5acdc
Draft PR to experiment with refactoring
mikepizzo Jan 11, 2022
3c790d0
Improve logic for setting id on resourceWrapper using path and key va…
mikepizzo Jan 21, 2022
2d4ac72
Update ODataResourceDeserializer.cs
Sreejithpin Feb 1, 2022
044fa48
New PR for Serializers for Bulk Operation with Updated ContextPath (#…
Sreejithpin Feb 1, 2022
ca4750b
Updates
Sreejithpin Feb 8, 2022
3792f0c
updates for casttype
Sreejithpin Feb 17, 2022
14e5111
updates
Sreejithpin Mar 3, 2022
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
Prev Previous commit
Next Next commit
updates
  • Loading branch information
@Sreejithpin
Sreejithpin committed Oct 28, 2021
commit 82823d0c476d66a22c61c66b183ae5525a211d90
13 changes: 7 additions & 6 deletions samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,17 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.OData.Core, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.9.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.9.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.9.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.9.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.9.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.8.2\lib\net45\Microsoft.Spatial.dll</HintPath>
</Reference>
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.9.1\lib\net45\Microsoft.Spatial.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
Expand Down
6 changes: 5 additions & 1 deletion samples/AspNetODataSample.Web/Web.config
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"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=301879
Expand Down Expand Up @@ -67,6 +67,10 @@
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.9.0.0" newVersion="7.9.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
Expand Down
6 changes: 3 additions & 3 deletions samples/AspNetODataSample.Web/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.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.9.0" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.9.0" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.9.0" targetFramework="net461" />
<package id="Microsoft.OData.Core" version="7.9.1" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.9.1" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.9.1" targetFramework="net461" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public DeltaSet<TStructuralType> Patch(ICollection<TStructuralType> originalColl
/// Patch for DeltaSet, a collection for Delta<typeparamref name="TStructuralType"/>
/// </summary>
/// <returns>DeltaSet response</returns>
public DeltaSet<TStructuralType> Patch(ODataAPIHandlerFactory apiHandlerFactory = null)
public DeltaSet<TStructuralType> Patch(ODataAPIHandlerFactory apiHandlerFactory)
{
IODataAPIHandler apiHandler = apiHandlerFactory.GetHandler(_navigationPath);
ODataAPIHandler<TStructuralType> apiHandlerOfT = apiHandler as ODataAPIHandler<TStructuralType>;
Expand Down
14 changes: 9 additions & 5 deletions src/Microsoft.AspNet.OData.Shared/EdmChangedObjectCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class EdmChangedObjectCollection : Collection<IEdmChangedObject>, IEdmObj
private IEdmEntityType _entityType;
private EdmDeltaCollectionType _edmType;
private IEdmCollectionTypeReference _edmTypeReference;
private NavigationPath _navigationPath;

/// <summary>
/// Initializes a new instance of the <see cref="EdmChangedObjectCollection"/> class.
Expand Down Expand Up @@ -73,6 +74,7 @@ private void Initialize(IEdmEntityType entityType)
_entityType = entityType;
_edmType = new EdmDeltaCollectionType(new EdmEntityTypeReference(_entityType, isNullable: true));
_edmTypeReference = new EdmCollectionTypeReference(_edmType);
_navigationPath = new NavigationPath(entityType.Name, null);
Copy link
Member

@mikepizzo mikepizzo Dec 14, 2021 •
edited by Sreejithpin
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

entityType.Name

is this right? #Resolved

}

/// <summary>
Expand All @@ -91,8 +93,10 @@ internal EdmChangedObjectCollection Patch(ICollection<IEdmStructuredObject> orig
/// Patch for EdmChangedObjectCollection, a collection for IEdmChangedObject
/// </summary>
/// <returns>ChangedObjectCollection response</returns>
public EdmChangedObjectCollection Patch(EdmODataAPIHandler apiHandler, ODataEdmAPIHandlerFactory apiHandlerFactory = null)
{
public EdmChangedObjectCollection Patch(ODataEdmAPIHandlerFactory apiHandlerFactory)
{
EdmODataAPIHandler apiHandler = apiHandlerFactory.GetHandler(_navigationPath);

return CopyChangedValues(apiHandler, apiHandlerFactory);
}

Expand Down Expand Up @@ -252,12 +256,12 @@ private void ApplyODataId(ODataIdContainer container, EdmStructuredObject origin

foreach (string propertyName in structuredObj.GetChangedPropertyNames())
{
ApplyProperties(referencedObj as EdmStructuredObject, original, propertyName, edmApiHandler, apiHandlerFactory);
ApplyProperties(structuredObj, original, propertyName, edmApiHandler, apiHandlerFactory);
}

foreach (string propertyName in structuredObj.GetUnchangedPropertyNames())
{
ApplyProperties(referencedObj as EdmStructuredObject, original, propertyName, edmApiHandler, apiHandlerFactory);
ApplyProperties(structuredObj, original, propertyName, edmApiHandler, apiHandlerFactory);
}
}
}
Expand All @@ -274,7 +278,7 @@ private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject
EdmODataAPIHandler apiHandlerNested = apiHandler.GetNestedHandler(originalObj, propertyName);
if (apiHandlerNested != null)
{
changedColl.Patch(apiHandlerNested, apiHandlerFactory);
changedColl.CopyChangedValues(apiHandlerNested, apiHandlerFactory);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ private static ODataPath GetODataPath(string id, ODataDeserializerContext readCo
}

private static void ApplyODataIDContainer(object resource, ODataResourceWrapper resourceWrapper,
IEdmStructuredTypeReference structuredType, ODataDeserializerContext readContext)
ODataDeserializerContext readContext)
{
//if id null check, add delta case as well c
if (resourceWrapper.ResourceBase?.Id != null)
Expand Down Expand Up @@ -672,7 +672,7 @@ private void ApplyResourceProperties(object resource, ODataResourceWrapper resou
ApplyStructuralProperties(resource, resourceWrapper, structuredType, readContext);
ApplyNestedProperties(resource, resourceWrapper, structuredType, readContext);
ApplyInstanceAnnotations(resource, resourceWrapper, structuredType, readContext);
ApplyODataIDContainer(resource, resourceWrapper, structuredType, readContext);
ApplyODataIDContainer(resource, resourceWrapper, readContext);
}

private void ApplyResourceInNestedProperty(IEdmProperty nestedProperty, object resource,
Expand Down
21 changes: 0 additions & 21 deletions src/Microsoft.AspNet.OData.Shared/KeyProperty.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.AspNet.OData.Shared/Microsoft.AspNet.OData.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<Compile Include="$(MSBuildThisFileDirectory)ODataEdmAPIHandlerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ODataAPIHandlerFactory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)IODataAPIHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)KeyProperty.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PathItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)NavigationPath.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ODataIdContainer.cs" />
Expand Down
8 changes: 8 additions & 0 deletions src/Microsoft.AspNet.OData.Shared/NavigationPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ public class NavigationPath
private ReadOnlyCollection<ODataPathSegment> _pathSegments;
private ConcurrentDictionary<string, PathItem[]> _pathItemCache = new ConcurrentDictionary<string, PathItem[]>();

/// <summary>
/// Constructor which takes and odataId and creates PathItems
/// </summary>
public NavigationPath()
{

}

/// <summary>
/// Constructor which takes and odataId and creates PathItems
/// </summary>
Expand Down
9 changes: 8 additions & 1 deletion src/Microsoft.AspNet.OData/GlobalSuppressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,11 @@
[assembly: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "Microsoft.AspNet.OData.Formatter.Deserialization.ODataResourceDeserializer.#CreateKeyProperties(System.Uri,Microsoft.AspNet.OData.Formatter.Deserialization.ODataDeserializerContext)")]
[assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.AspNet.OData.Formatter.Deserialization.ODataResourceDeserializer.#CreateResourceWrapper(Microsoft.OData.Edm.IEdmTypeReference,Microsoft.AspNet.OData.Formatter.Deserialization.ODataEntityReferenceLinkBase,Microsoft.AspNet.OData.Formatter.Deserialization.ODataDeserializerContext)")]
[assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "Microsoft.AspNet.OData.Formatter.Deserialization.ODataResourceDeserializer.#UpdateResourceWrapper(Microsoft.AspNet.OData.Formatter.Deserialization.ODataResourceWrapper,Microsoft.AspNet.OData.Formatter.Deserialization.ODataDeserializerContext)")]

[assembly: SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Scope = "member", Target = "Microsoft.AspNet.OData.Delta`1.#CopyChangedValues(!0,Microsoft.AspNet.OData.ODataAPIHandler`1<!0>,Microsoft.AspNet.OData.ODataAPIHandlerFactory)")]
[assembly: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "Microsoft.AspNet.OData.Formatter.Deserialization.ODataResourceDeserializer.#GetODataPath(System.String,Microsoft.AspNet.OData.Formatter.Deserialization.ODataDeserializerContext)")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.ODataAPIHandler`1")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.IODataAPIHandler")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.ODataEdmAPIHandlerFactory")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.ODataAPIResponseStatus")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.EdmODataAPIHandler")]
[assembly: SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "API", Scope = "type", Target = "Microsoft.AspNet.OData.ODataAPIHandlerFactory")]
12 changes: 6 additions & 6 deletions src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
<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.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.9.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.9.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.9.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.9.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.9.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.9.1\lib\net45\Microsoft.Spatial.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNet.OData/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,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.9.0" targetFramework="net45" />
<package id="Microsoft.OData.Edm" version="7.9.0" targetFramework="net45" />
<package id="Microsoft.OData.Core" version="7.9.1" targetFramework="net45" />
<package id="Microsoft.OData.Edm" version="7.9.1" 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.9.0" targetFramework="net45" />
<package id="Microsoft.Spatial" version="7.9.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
</packages>
6 changes: 3 additions & 3 deletions src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.OData.Core" Version="7.9.0" />
<PackageReference Include="Microsoft.OData.Edm" Version="7.9.0" />
<PackageReference Include="Microsoft.Spatial" Version="7.9.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.9.1" />
<PackageReference Include="Microsoft.OData.Edm" Version="7.9.1" />
<PackageReference Include="Microsoft.Spatial" Version="7.9.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
22 changes: 11 additions & 11 deletions ...ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
<HintPath>..\..\..\..\sln\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Client, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.9.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
<Reference Include="Microsoft.OData.Client, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.9.1\lib\net45\Microsoft.OData.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Core, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.9.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.9.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.9.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.9.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
Expand All @@ -56,8 +56,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.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.9.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.9.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.9.1\lib\net45\Microsoft.Spatial.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
Expand Down Expand Up @@ -163,9 +163,9 @@
<Compile Include="..\BulkOperation\BulkInsertController.cs">
<Link>BulkOperation\BulkInsertController.cs</Link>
</Compile>
<Compile Include="..\BulkOperation\BulkOperationPatchHandlers.cs">
<Link>BulkOperation\BulkOperationPatchHandlers.cs</Link>
</Compile>
<Compile Include="..\BulkOperation\BulkOperationPatchHandlers.cs">
<Link>BulkOperation\BulkOperationPatchHandlers.cs</Link>
</Compile>
<Compile Include="..\EntitySetAggregation\EntitySetAggregationController.cs">
<Link>EntitySetAggregation\EntitySetAggregationController.cs</Link>
</Compile>
Expand Down
Loading