Skip to content

Commit

Permalink
Upgrade version to v7.7.1 and update ODL version (#2798)
Browse files Browse the repository at this point in the history
  • Loading branch information
KenitoInc authored Jul 23, 2023
1 parent 838f496 commit 2f4dc49
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 63 deletions.
12 changes: 6 additions & 6 deletions samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.OData.Core, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.16.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.16.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.16.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.17.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">
Expand Down
6 changes: 3 additions & 3 deletions samples/AspNetODataSample.Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.0" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.16.0" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.16.0" targetFramework="net461" />
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.17.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" />
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,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.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.16.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.16.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.16.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.17.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">
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.AspNet.OData/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<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.16.0" targetFramework="net45" />
<package id="Microsoft.OData.Edm" version="7.16.0" targetFramework="net45" />
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net45" />
<package id="Microsoft.OData.Edm" version="7.17.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.16.0" targetFramework="net45" />
<package id="Microsoft.Spatial" version="7.17.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
Expand Down
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.16.0" />
<PackageReference Include="Microsoft.OData.Edm" Version="7.16.0" />
<PackageReference Include="Microsoft.Spatial" Version="7.16.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.17.0" />
<PackageReference Include="Microsoft.OData.Edm" Version="7.17.0" />
<PackageReference Include="Microsoft.Spatial" Version="7.17.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,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.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.16.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
<Reference Include="Microsoft.OData.Client, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Core, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.16.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.16.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.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">
Expand All @@ -67,8 +67,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.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.16.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.17.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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,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.16.0" targetFramework="net452" />
<package id="Microsoft.OData.Core" version="7.16.0" targetFramework="net452" />
<package id="Microsoft.OData.Edm" version="7.16.0" targetFramework="net452" />
<package id="Microsoft.OData.Client" version="7.17.0" targetFramework="net452" />
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net452" />
<package id="Microsoft.OData.Edm" version="7.17.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.16.0" targetFramework="net452" />
<package id="Microsoft.Spatial" version="7.17.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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.16.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
<Reference Include="Microsoft.OData.Client, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Core, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.16.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.16.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.16.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.17.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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,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.16.0" targetFramework="net461" />
<package id="Microsoft.OData.Core" version="7.16.0" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.16.0" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.16.0" targetFramework="net461" />
<package id="Microsoft.OData.Client" version="7.17.0" targetFramework="net461" />
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net461" />
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net461" />
<package id="Microsoft.Spatial" version="7.17.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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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.16.0" />
<PackageReference Include="Microsoft.OData.Client" Version="7.17.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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.OData.Core, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.OData.Core.7.16.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.OData.Edm.7.16.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.Spatial.7.16.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.7.137.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand Down
6 changes: 3 additions & 3 deletions test/UnitTest/Microsoft.AspNet.OData.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<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.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="Microsoft.OData.Core" version="7.16.0" targetFramework="net452" />
<package id="Microsoft.OData.Edm" version="7.16.0" targetFramework="net452" />
<package id="Microsoft.Spatial" version="7.16.0" targetFramework="net452" />
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net452" />
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net452" />
<package id="Microsoft.Spatial" version="7.17.0" targetFramework="net452" />
<package id="Moq" version="4.7.137" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
Expand Down
Loading

0 comments on commit 2f4dc49

Please sign in to comment.