diff --git a/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj b/samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj index d602164144..a7250f286c 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.12.2\lib\net45\Microsoft.OData.Core.dll + + ..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll + + ..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll + + ..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll True diff --git a/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj b/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj index 026eb67593..f4a0d74f56 100644 --- a/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj +++ b/src/Microsoft.AspNet.OData/Microsoft.AspNet.OData.csproj @@ -33,16 +33,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.12.2\lib\net45\Microsoft.OData.Core.dll + + ..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll + + ..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll + + ..\..\sln\packages\Microsoft.Spatial.7.13.0\lib\net45\Microsoft.Spatial.dll True diff --git a/src/Microsoft.AspNet.OData/packages.config b/src/Microsoft.AspNet.OData/packages.config index 1c9b8177c9..196ba8899f 100644 --- a/src/Microsoft.AspNet.OData/packages.config +++ b/src/Microsoft.AspNet.OData/packages.config @@ -6,10 +6,10 @@ - - + + - + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj index 073b329e8b..02bc647729 100644 --- a/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj +++ b/src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj @@ -42,9 +42,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 f26146d159..2b7416ef0a 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 @@ -46,16 +46,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.12.2\lib\net45\Microsoft.OData.Client.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Client.7.13.0\lib\net45\Microsoft.OData.Client.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll True @@ -70,8 +70,8 @@ ..\..\..\..\sln\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll True - - ..\..\..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll + + ..\..\..\..\sln\packages\Microsoft.Spatial.7.13.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 51d319a09d..8d3e4de41a 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 @@ -13,13 +13,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 1602733856..5a79d73f82 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 @@ -1858,20 +1858,20 @@ ..\..\..\..\sln\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll - - ..\..\..\..\sln\packages\Microsoft.OData.Client.7.12.2\lib\net45\Microsoft.OData.Client.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Client.7.13.0\lib\net45\Microsoft.OData.Client.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Core.7.12.2\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll + + ..\..\..\..\sln\packages\Microsoft.Spatial.7.13.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 599d3b625c..26eba61acf 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 @@ -65,10 +65,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 3004804f9c..26108477a2 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 @@ -27,7 +27,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 81c539497a..0b7dec5954 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.12.2\lib\net45\Microsoft.OData.Core.dll + + ..\..\..\sln\packages\Microsoft.OData.Core.7.13.0\lib\net45\Microsoft.OData.Core.dll True - - ..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll + + ..\..\..\sln\packages\Microsoft.OData.Edm.7.13.0\lib\net45\Microsoft.OData.Edm.dll True - - ..\..\..\sln\packages\Microsoft.Spatial.7.12.2\lib\net45\Microsoft.Spatial.dll + + ..\..\..\sln\packages\Microsoft.Spatial.7.13.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 ad64e70060..e8f3a06814 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 0b343ba0bb..41e014625b 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 @@ - - - + + + @@ -33,9 +33,9 @@ - - - + + + diff --git a/tools/WebStack.versions.settings.targets b/tools/WebStack.versions.settings.targets index 7fb10b9a32..d12f7a5e18 100644 --- a/tools/WebStack.versions.settings.targets +++ b/tools/WebStack.versions.settings.targets @@ -5,7 +5,7 @@ 7 6 - 2 + 3 @@ -15,7 +15,7 @@ [2.0.1, 3.0.0) 1.0.0 2.0.0 - [7.12.2, 8.0.0) + [7.13.0, 8.0.0) 13.0.1