Skip to content

Commit 5831ca9

Browse files
habbeshabbes
authored
Update release version to 7.5.16 and ODL version to 7.12.2 (#2698)
1 parent 8cb5575 commit 5831ca9

13 files changed

Lines changed: 60 additions & 60 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.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>
91+
<Reference Include="Microsoft.OData.Core, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
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>
95+
<Reference Include="Microsoft.OData.Edm, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
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>
99+
<Reference Include="Microsoft.Spatial, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.12.2\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">

‎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.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>
33+
<Reference Include="Microsoft.OData.Core, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34+
<HintPath>..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
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>
37+
<Reference Include="Microsoft.OData.Edm, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
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>
41+
<Reference Include="Microsoft.Spatial, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.12.2\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,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.12.1" targetFramework="net45" />
9-
<package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net45" />
8+
<package id="Microsoft.OData.Core" version="7.12.2" targetFramework="net45" />
9+
<package id="Microsoft.OData.Edm" version="7.12.2" 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.12.1" targetFramework="net45" />
12+
<package id="Microsoft.Spatial" version="7.12.2" 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.12.1" />
45-
<PackageReference Include="Microsoft.OData.Edm" Version="7.12.1" />
46-
<PackageReference Include="Microsoft.Spatial" Version="7.12.1" />
44+
<PackageReference Include="Microsoft.OData.Core" Version="7.12.2" />
45+
<PackageReference Include="Microsoft.OData.Edm" Version="7.12.2" />
46+
<PackageReference Include="Microsoft.Spatial" Version="7.12.2" />
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
@@ -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.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>
38+
<Reference Include="Microsoft.OData.Client, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.12.2\lib\net45\Microsoft.OData.Client.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
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>
42+
<Reference Include="Microsoft.OData.Core, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
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>
46+
<Reference Include="Microsoft.OData.Edm, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\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.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
62+
<Reference Include="Microsoft.Spatial, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.12.2\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.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" />
13+
<package id="Microsoft.OData.Client" version="7.12.2" targetFramework="net452" />
14+
<package id="Microsoft.OData.Core" version="7.12.2" targetFramework="net452" />
15+
<package id="Microsoft.OData.Edm" version="7.12.2" 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.12.1" targetFramework="net452" />
19+
<package id="Microsoft.Spatial" version="7.12.2" 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" />

‎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
@@ -1846,20 +1846,20 @@
18461846
<Reference Include="Microsoft.Net.Http.Headers, Version=2.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
18471847
<HintPath>..\..\..\..\sln\packages\Microsoft.Net.Http.Headers.2.0.3\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
18481848
</Reference>
1849-
<Reference Include="Microsoft.OData.Client, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1850-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.12.1\lib\net45\Microsoft.OData.Client.dll</HintPath>
1849+
<Reference Include="Microsoft.OData.Client, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1850+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Client.7.12.2\lib\net45\Microsoft.OData.Client.dll</HintPath>
18511851
<Private>True</Private>
18521852
</Reference>
1853-
<Reference Include="Microsoft.OData.Core, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1854-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
1853+
<Reference Include="Microsoft.OData.Core, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1854+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
18551855
<Private>True</Private>
18561856
</Reference>
1857-
<Reference Include="Microsoft.OData.Edm, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1858-
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
1857+
<Reference Include="Microsoft.OData.Edm, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1858+
<HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
18591859
<Private>True</Private>
18601860
</Reference>
1861-
<Reference Include="Microsoft.Spatial, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1862-
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
1861+
<Reference Include="Microsoft.Spatial, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
1862+
<HintPath>..\..\..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll</HintPath>
18631863
<Private>True</Private>
18641864
</Reference>
18651865
<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
@@ -61,10 +61,10 @@
6161
<package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
6262
<package id="Microsoft.Net.Http.Headers" version="2.0.3" targetFramework="net461" />
6363
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net461" />
64-
<package id="Microsoft.OData.Client" version="7.12.1" targetFramework="net461" />
65-
<package id="Microsoft.OData.Core" version="7.12.1" targetFramework="net461" />
66-
<package id="Microsoft.OData.Edm" version="7.12.1" targetFramework="net461" />
67-
<package id="Microsoft.Spatial" version="7.12.1" targetFramework="net461" />
64+
<package id="Microsoft.OData.Client" version="7.12.2" targetFramework="net461" />
65+
<package id="Microsoft.OData.Core" version="7.12.2" targetFramework="net461" />
66+
<package id="Microsoft.OData.Edm" version="7.12.2" targetFramework="net461" />
67+
<package id="Microsoft.Spatial" version="7.12.2" targetFramework="net461" />
6868
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
6969
<package id="Remotion.Linq" version="2.2.0" targetFramework="net461" />
7070
<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.12.1" />
29+
<PackageReference Include="Microsoft.OData.Client" Version="7.12.2" />
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" />

‎test/UnitTest/Microsoft.AspNet.OData.Test/Microsoft.AspNet.OData.Test.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
<Private>True</Private>
2525
</Reference>
2626
<Reference Include="Microsoft.CSharp" />
27-
<Reference Include="Microsoft.OData.Core, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
28-
<HintPath>..\..\..\sln\packages\Microsoft.OData.Core.7.12.1\lib\net45\Microsoft.OData.Core.dll</HintPath>
27+
<Reference Include="Microsoft.OData.Core, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
28+
<HintPath>..\..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll</HintPath>
2929
<Private>True</Private>
3030
</Reference>
31-
<Reference Include="Microsoft.OData.Edm, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
32-
<HintPath>..\..\..\sln\packages\Microsoft.OData.Edm.7.12.1\lib\net45\Microsoft.OData.Edm.dll</HintPath>
31+
<Reference Include="Microsoft.OData.Edm, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
32+
<HintPath>..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
3333
<Private>True</Private>
3434
</Reference>
35-
<Reference Include="Microsoft.Spatial, Version=7.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36-
<HintPath>..\..\..\sln\packages\Microsoft.Spatial.7.12.1\lib\net45\Microsoft.Spatial.dll</HintPath>
35+
<Reference Include="Microsoft.Spatial, Version=7.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36+
<HintPath>..\..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="Moq, Version=4.7.137.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)