Skip to content

Commit 8cb5575

Browse files
KenitoIncKenitoInc
authored
Update odl to v7.12.1 (#2691)
1 parent d8d3cea commit 8cb5575

File tree

19 files changed

+76
-64
lines changed

19 files changed

+76
-64
lines changed

‎samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="Microsoft.CSharp" />
91-
<Reference Include="Microsoft.OData.Core, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.11.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
91+
<Reference Include="Microsoft.OData.Core, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.12.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
95-
<Reference Include="Microsoft.OData.Edm, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.11.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
95+
<Reference Include="Microsoft.OData.Edm, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.12.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
99-
<Reference Include="Microsoft.Spatial, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.11.1\lib\net45\Microsoft.Spatial.dll</HintPath>
99+
<Reference Include="Microsoft.Spatial, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎samples/AspNetODataSample.Web/Web.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
7676
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
7777
</dependentAssembly>
78+
<dependentAssembly>
79+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
81+
</dependentAssembly>
7882
</assemblyBinding>
7983
</runtime>
8084
<system.codedom>

‎samples/AspNetODataSample.Web/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
1616
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net461" />
1717
<package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net461" developmentDependency="true" />
18-
<package id="Microsoft.OData.Core" version="7.11.1" targetFramework="net461" />
19-
<package id="Microsoft.OData.Edm" version="7.11.1" targetFramework="net461" />
20-
<package id="Microsoft.Spatial" version="7.11.1" targetFramework="net461" />
18+
<package id="Microsoft.OData.Core" version="7.12.1" targetFramework="net461" />
19+
<package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net461" />
20+
<package id="Microsoft.Spatial" version="7.12.1" targetFramework="net461" />
2121
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
2222
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
2323
<package id="System.Memory" version="4.5.4" targetFramework="net461" />

‎src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
<HintPath>..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
3131
<Private>True</Private>
3232
</Reference>
33-
<Reference Include="Microsoft.OData.Core, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34-
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.11.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
33+
<Reference Include="Microsoft.OData.Core, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.12.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
37-
<Reference Include="Microsoft.OData.Edm, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.11.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
37+
<Reference Include="Microsoft.OData.Edm, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.12.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Microsoft.Spatial, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.11.1\lib\net45\Microsoft.Spatial.dll</HintPath>
41+
<Reference Include="Microsoft.Spatial, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/Microsoft.AspNet.OData/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-13.0.1.0" newVersion="13.0.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎src/Microsoft.AspNet.OData/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net45" developmentDependency="true" />
66
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.OData.Core" version="7.11.1" targetFramework="net45" />
9-
<package id="Microsoft.OData.Edm" version="7.11.1" targetFramework="net45" />
8+
<package id="Microsoft.OData.Core" version="7.12.1" targetFramework="net45" />
9+
<package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net45" />
1010
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net45" developmentDependency="true" />
1111
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net45" developmentDependency="true" />
12-
<package id="Microsoft.Spatial" version="7.11.1" targetFramework="net45" />
12+
<package id="Microsoft.Spatial" version="7.12.1" targetFramework="net45" />
1313
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
1414
</packages>

‎src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="Microsoft.OData.Core" Version="7.11.1" />
45-
<PackageReference Include="Microsoft.OData.Edm" Version="7.11.1" />
46-
<PackageReference Include="Microsoft.Spatial" Version="7.11.1" />
44+
<PackageReference Include="Microsoft.OData.Core" Version="7.12.1" />
45+
<PackageReference Include="Microsoft.OData.Edm" Version="7.12.1" />
46+
<PackageReference Include="Microsoft.Spatial" Version="7.12.1" />
4747
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
4848
<PrivateAssets>all</PrivateAssets>
4949
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
6767
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
6868
</dependentAssembly>
69+
<dependentAssembly>
70+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
71+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
72+
</dependentAssembly>
6973
</assemblyBinding>
7074
</runtime>
7175
</configuration>

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
<HintPath>..\..\..\..\sln\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
38-
<Reference Include="Microsoft.OData.Client, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.11.1\lib\net45\Microsoft.OData.Client.dll</HintPath>
38+
<Reference Include="Microsoft.OData.Client, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.12.1\lib\net45\Microsoft.OData.Client.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="Microsoft.OData.Core, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.11.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
42+
<Reference Include="Microsoft.OData.Core, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="Microsoft.OData.Edm, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.11.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
46+
<Reference Include="Microsoft.OData.Edm, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -59,8 +59,8 @@
5959
<HintPath>..\..\..\..\sln\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Microsoft.Spatial, Version=7.11.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.11.1\lib\net45\Microsoft.Spatial.dll</HintPath>
62+
<Reference Include="Microsoft.Spatial, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net452" />
1111
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net452" />
1212
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
13-
<package id="Microsoft.OData.Client" version="7.11.1" targetFramework="net452" />
14-
<package id="Microsoft.OData.Core" version="7.11.1" targetFramework="net452" />
15-
<package id="Microsoft.OData.Edm" version="7.11.1" targetFramework="net452" />
13+
<package id="Microsoft.OData.Client" version="7.12.1" targetFramework="net452" />
14+
<package id="Microsoft.OData.Core" version="7.12.1" targetFramework="net452" />
15+
<package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net452" />
1616
<package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
1717
<package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
1818
<package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
19-
<package id="Microsoft.Spatial" version="7.11.1" targetFramework="net452" />
19+
<package id="Microsoft.Spatial" version="7.12.1" targetFramework="net452" />
2020
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2121
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

0 commit comments

Comments
 (0)