From d8fc2d4009e343065d3d0e15f748846db80e231a Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sun, 15 Apr 2018 15:46:44 -0700
Subject: [PATCH] Fix test failures

* Disable deps file generation in class library project. This workarounds known issue - https://github.com/dotnet/core-setup/issues/3726
* Update RazorProjectRouteModelProvider to not specify a trailing slash. This produces paths with a single slash as opposed to two slashes messing with route creation.
* React to Microsoft.AspNetCore.Mvc.Razor.Extensions.Reference that shows up in the deps file.
---
 build/dependencies.props                                      | 2 +-
 korebuild-lock.txt                                            | 4 ++--
 .../Internal/RazorProjectPageRouteModelProvider.cs            | 2 +-
 .../ApplicationParts/ApplicationAssembliesProviderTest.cs     | 1 +
 .../RazorPagesClassLibrary/RazorPagesClassLibrary.csproj      | 4 ++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index c1d53fc84b..d9400a48e4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -5,7 +5,7 @@
   <PropertyGroup Label="Package Versions">
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>2.1.0-preview3-17018</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.1.0-preview3-17032</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreAntiforgeryPackageVersion>2.1.0-preview3-32233</MicrosoftAspNetCoreAntiforgeryPackageVersion>
     <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview3-32233</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
     <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview3-32233</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index b419d767b9..9508be6972 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview3-17018
-commithash:af264ca131f212b5ba8aafbc5110fc0fc510a2be
+version:2.1.0-preview3-17032
+commithash:d3d9c5682617da4d0a69372aae5d736ed733d156
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
index 15e0c35822..81cf7b6a42 100644
--- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
 {
     public class RazorProjectPageRouteModelProvider : IPageRouteModelProvider
     {
-        private const string AreaRootDirectory = "/Areas/";
+        private const string AreaRootDirectory = "/Areas";
         private readonly RazorProjectFileSystem _razorFileSystem;
         private readonly RazorPagesOptions _pagesOptions;
         private readonly PageRouteModelFactory _routeModelFactory;
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
index 612b60e56b..1904003bdd 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
@@ -464,6 +464,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts
             var excludeAssemblies = new string[]
             {
                 "Microsoft.AspNetCore.Mvc.Core.Test",
+                "Microsoft.AspNetCore.Mvc.Razor.Extensions.Reference",
                 "Microsoft.AspNetCore.Mvc.TestCommon",
                 "Microsoft.AspNetCore.Mvc.TestDiagnosticListener",
                 "Microsoft.AspNetCore.Mvc.WebApiCompatShim",
diff --git a/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
index 99900dc55d..8fa786d637 100644
--- a/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
+++ b/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
@@ -2,10 +2,14 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <!--  Workaround https://github.com/dotnet/core-setup/issues/3726 -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>