diff --git a/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj b/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj index 809c62e0a..b252a53f8 100644 --- a/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj +++ b/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj @@ -88,16 +88,16 @@ True - - ..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll + + ..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll + + ..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll + + ..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll True diff --git a/samples/AspNetODataSample.Web/packages.config b/samples/AspNetODataSample.Web/packages.config index 55f248c1b..2a5939c4d 100644 --- a/samples/AspNetODataSample.Web/packages.config +++ b/samples/AspNetODataSample.Web/packages.config @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj b/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj index b33c83606..4f15a6e5c 100644 --- a/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj +++ b/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj @@ -30,16 +30,16 @@ ..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll + + ..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll + + ..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll + + ..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll True diff --git a/src/Microsoft.AspNet.OData/packages.config b/src/Microsoft.AspNet.OData/packages.config index d0bf7c147..998e4ba45 100644 --- a/src/Microsoft.AspNet.OData/packages.config +++ b/src/Microsoft.AspNet.OData/packages.config @@ -5,11 +5,11 @@ - - + + - + diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj index a57d69040..5247dfb1d 100644 --- a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj +++ b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj @@ -41,9 +41,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj index d7cbf9136..266655613 100644 --- a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj +++ b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/Microsoft.Test.E2E.AspNet.OData.csproj @@ -43,16 +43,16 @@ ..\..\..\..\sln\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Client.7.20.0\lib\net45\Microsoft.OData.Client.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll True @@ -67,8 +67,8 @@ ..\..\..\..\sln\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll True - - ..\..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll + + ..\..\..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll True diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config index b4b9377b5..d441e45bd 100644 --- a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config +++ b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config @@ -12,13 +12,13 @@ - - - + + + - + diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj index c0041be24..f95640cda 100644 --- a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj +++ b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj @@ -1867,20 +1867,20 @@ ..\..\..\..\sln\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll - - ..\..\..\..\sln\packages\Microsoft.OData.Client.7.17.0\lib\net45\Microsoft.OData.Client.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Client.7.20.0\lib\net45\Microsoft.OData.Client.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll + + ..\..\..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll True diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config index 22c4ee7a4..f8f2c34f8 100644 --- a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config +++ b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/packages.config @@ -64,10 +64,10 @@ - - - - + + + + diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj index 95afecfd0..123a33d4d 100644 --- a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj +++ b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore3x/Microsoft.Test.E2E.AspNetCore3x.OData.csproj @@ -26,7 +26,7 @@ - + diff --git a/test/UnitTest/Microsoft.AspNet.OData.Test/Microsoft.AspNet.OData.Test.csproj b/test/UnitTest/Microsoft.AspNet.OData.Test/Microsoft.AspNet.OData.Test.csproj index f2d6d2f00..361451f31 100644 --- a/test/UnitTest/Microsoft.AspNet.OData.Test/Microsoft.AspNet.OData.Test.csproj +++ b/test/UnitTest/Microsoft.AspNet.OData.Test/Microsoft.AspNet.OData.Test.csproj @@ -24,16 +24,16 @@ True - - ..\..\..\sln\packages\Microsoft.OData.Core.7.17.0\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\sln\packages\Microsoft.OData.Core.7.20.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\sln\packages\Microsoft.OData.Edm.7.17.0\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\sln\packages\Microsoft.OData.Edm.7.20.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\..\sln\packages\Microsoft.Spatial.7.17.0\lib\net45\Microsoft.Spatial.dll + + ..\..\..\sln\packages\Microsoft.Spatial.7.20.0\lib\net45\Microsoft.Spatial.dll True diff --git a/test/UnitTest/Microsoft.AspNet.OData.Test/packages.config b/test/UnitTest/Microsoft.AspNet.OData.Test/packages.config index 1a3619805..0487c6938 100644 --- a/test/UnitTest/Microsoft.AspNet.OData.Test/packages.config +++ b/test/UnitTest/Microsoft.AspNet.OData.Test/packages.config @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/UnitTest/Microsoft.AspNetCore.OData.Test/Microsoft.AspNetCore.OData.Test.csproj b/test/UnitTest/Microsoft.AspNetCore.OData.Test/Microsoft.AspNetCore.OData.Test.csproj index b9e9fa5f1..3647b0e20 100644 --- a/test/UnitTest/Microsoft.AspNetCore.OData.Test/Microsoft.AspNetCore.OData.Test.csproj +++ b/test/UnitTest/Microsoft.AspNetCore.OData.Test/Microsoft.AspNetCore.OData.Test.csproj @@ -16,9 +16,9 @@ - - - + + + @@ -32,9 +32,9 @@ - - - + + + diff --git a/tools/WebStack.versions.settings.targets b/tools/WebStack.versions.settings.targets index ca64280ca..2bac80822 100644 --- a/tools/WebStack.versions.settings.targets +++ b/tools/WebStack.versions.settings.targets @@ -5,7 +5,7 @@ 7 7 - 3 + 4 @@ -15,7 +15,7 @@ [2.0.1, 3.0.0) 1.0.0 2.0.0 - [7.17.0, 8.0.0) + [7.20.0, 8.0.0) 13.0.1