Bump Microsoft.OWin to 4.0 and Microsoft.AspNetCore.Mvc.Core 2.0.1 (#2694)

* Bump Microsoft.OWin to 4.0 and Microsoft.AspNetCore.Mvc.Core 2.0.1

* Fix the failing test case

Author: xuzhg

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

@@ -24,7 +24,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
     <!-- Define the Items for .NET Standard 2.0 -->
     <PackageReference Include="Desktop.Analyzers" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
     <!-- PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="1.1.0" /> -->
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />

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

@@ -47,8 +47,8 @@
       <HintPath>..\..\..\..\sln\packages\Microsoft.OData.Edm.7.12.2\lib\net45\Microsoft.OData.Edm.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\sln\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\sln\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

@@ -13,7 +13,7 @@
   <package id="Microsoft.OData.Client" version="7.12.2" targetFramework="net452" />
   <package id="Microsoft.OData.Core" version="7.12.2" targetFramework="net452" />
   <package id="Microsoft.OData.Edm" version="7.12.2" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Spatial" version="7.12.2" targetFramework="net452" />

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/QueryComposition/ComplextTypeCollectionTests.cs

@@ -73,13 +73,8 @@ public async Task PageSizeWorksOnCollectionOfComplexProperty()
             Assert.Equal("XXX/odata/$metadata#ComplextTypeCollectionTests_Persons(1)/PersonInfos".Replace("XXX", BaseAddress.ToLowerInvariant()),
                 result["@odata.context"]);
 
-#if NETCORE
             Assert.Equal("XXX/odata/ComplextTypeCollectionTests_Persons(1)/PersonInfos?$skip=2".Replace("XXX", BaseAddress.ToLowerInvariant()),
                 result["@odata.nextLink"]);
-#else
-            Assert.Equal("XXX/odata/ComplextTypeCollectionTests_Persons%281%29/PersonInfos?$skip=2".Replace("XXX", BaseAddress.ToLowerInvariant()),
-                result["@odata.nextLink"]);
-#endif
 
             JArray personInfos = result["value"] as JArray;
             Assert.NotNull(personInfos);

test/UnitTest/Microsoft.AspNetCore.OData.Test/Microsoft.AspNetCore.OData.Test.csproj

@@ -27,9 +27,9 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />