Skip to content

Commit 6aa4c6f

Browse files
ElizabethOkerioElizabethOkerio
authored
Update version to 7.7.4 and ODL Version (#2831)
* Update version to 7.74 and ODL * update changes
1 parent f2dd44d commit 6aa4c6f

14 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎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.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
91+
<Reference Include="Microsoft.OData.Core, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
95-
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
95+
<Reference Include="Microsoft.OData.Edm, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
99-
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll</HintPath>
99+
<Reference Include="Microsoft.Spatial, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.20.0\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/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.17.0" targetFramework="net461" />
19-
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net461" />
20-
<package id="Microsoft.Spatial" version="7.17.0" targetFramework="net461" />
18+
<package id="Microsoft.OData.Core" version="7.20.0" targetFramework="net461" />
19+
<package id="Microsoft.OData.Edm" version="7.20.0" targetFramework="net461" />
20+
<package id="Microsoft.Spatial" version="7.20.0" 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.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34-
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
33+
<Reference Include="Microsoft.OData.Core, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
37-
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
37+
<Reference Include="Microsoft.OData.Edm, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll</HintPath>
41+
<Reference Include="Microsoft.Spatial, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.20.0\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/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
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.17.0" targetFramework="net45" />
9-
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net45" />
8+
<package id="Microsoft.OData.Core" version="7.20.0" targetFramework="net45" />
9+
<package id="Microsoft.OData.Edm" version="7.20.0" 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.17.0" targetFramework="net45" />
12+
<package id="Microsoft.Spatial" version="7.20.0" targetFramework="net45" />
1313
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
1414
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
1515
<package id="System.Memory" version="4.5.4" targetFramework="net45" />

‎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.17.0" />
45-
<PackageReference Include="Microsoft.OData.Edm" Version="7.17.0" />
46-
<PackageReference Include="Microsoft.Spatial" Version="7.17.0" />
44+
<PackageReference Include="Microsoft.OData.Core" Version="7.20.0" />
45+
<PackageReference Include="Microsoft.OData.Edm" Version="7.20.0" />
46+
<PackageReference Include="Microsoft.Spatial" Version="7.20.0" />
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/Microsoft.Test.E2E.AspNet.OData.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
<HintPath>..\..\..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="Microsoft.OData.Client, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
46+
<Reference Include="Microsoft.OData.Client, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.20.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
50+
<Reference Include="Microsoft.OData.Core, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
54+
<Reference Include="Microsoft.OData.Edm, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -67,8 +67,8 @@
6767
<HintPath>..\..\..\..\sln\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll</HintPath>
70+
<Reference Include="Microsoft.Spatial, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<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
@@ -12,13 +12,13 @@
1212
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
1313
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
1414
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
15-
<package id="Microsoft.OData.Client" version="7.17.0" targetFramework="net452" />
16-
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net452" />
17-
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net452" />
15+
<package id="Microsoft.OData.Client" version="7.20.0" targetFramework="net452" />
16+
<package id="Microsoft.OData.Core" version="7.20.0" targetFramework="net452" />
17+
<package id="Microsoft.OData.Edm" version="7.20.0" targetFramework="net452" />
1818
<package id="Microsoft.Owin" version="4.2.2" targetFramework="net452" />
1919
<package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
2020
<package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
21-
<package id="Microsoft.Spatial" version="7.17.0" targetFramework="net452" />
21+
<package id="Microsoft.Spatial" version="7.20.0" targetFramework="net452" />
2222
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2323
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
2424
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,20 +1867,20 @@
18671867
<Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
18681868
<HintPath>..\..\..\..\sln\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
18691869
</Reference>
1870-
<Reference Include="Microsoft.OData.Client, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1871-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
1870+
<Reference Include="Microsoft.OData.Client, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1871+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.20.0\lib\net45\Microsoft.OData.Client.dll</HintPath>
18721872
<Private>True</Private>
18731873
</Reference>
1874-
<Reference Include="Microsoft.OData.Core, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1875-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
1874+
<Reference Include="Microsoft.OData.Core, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1875+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll</HintPath>
18761876
<Private>True</Private>
18771877
</Reference>
1878-
<Reference Include="Microsoft.OData.Edm, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1879-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
1878+
<Reference Include="Microsoft.OData.Edm, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1879+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll</HintPath>
18801880
<Private>True</Private>
18811881
</Reference>
1882-
<Reference Include="Microsoft.Spatial, Version=7.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1883-
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll</HintPath>
1882+
<Reference Include="Microsoft.Spatial, Version=7.20.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1883+
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll</HintPath>
18841884
<Private>True</Private>
18851885
</Reference>
18861886
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
<package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
6565
<package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
6666
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net461" />
67-
<package id="Microsoft.OData.Client" version="7.17.0" targetFramework="net461" />
68-
<package id="Microsoft.OData.Core" version="7.17.0" targetFramework="net461" />
69-
<package id="Microsoft.OData.Edm" version="7.17.0" targetFramework="net461" />
70-
<package id="Microsoft.Spatial" version="7.17.0" targetFramework="net461" />
67+
<package id="Microsoft.OData.Client" version="7.20.0" targetFramework="net461" />
68+
<package id="Microsoft.OData.Core" version="7.20.0" targetFramework="net461" />
69+
<package id="Microsoft.OData.Edm" version="7.20.0" targetFramework="net461" />
70+
<package id="Microsoft.Spatial" version="7.20.0" targetFramework="net461" />
7171
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
7272
<package id="Remotion.Linq" version="2.2.0" targetFramework="net461" />
7373
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
2727
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
2828
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
29-
<PackageReference Include="Microsoft.OData.Client" Version="7.17.0" />
29+
<PackageReference Include="Microsoft.OData.Client" Version="7.20.0" />
3030
<PackageReference Include="System.Reflection" Version="4.3.0" />
3131
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
3232
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />

0 commit comments

Comments
 (0)