From 3cd84a9b0380c623f42bcaf2218ac963adeff501 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 9 May 2019 21:06:27 -0700
Subject: [PATCH] [master] Update dependencies from aspnet/AspNetCore-Tooling
 (#10100)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190508.1
- Microsoft.NET.Sdk.Razor - 3.0.0-preview6.19258.1
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview6.19258.1
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview6.19258.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview6.19258.1

* React to AspNetCore-Tooling Razor diagnostics change.
- It seems like on MacOS the ordering mechanism results in mismatched expectations for the CompilerFailedExceptionFactoryTest.
- thanx @NTaylorMullen !
---
 eng/Version.Details.xml                          | 16 ++++++++--------
 eng/Versions.props                               |  8 ++++----
 .../test/CompilerFailedExceptionFactoryTest.cs   |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 60982eec91..c1099c45a4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,21 +9,21 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview6.19256.2">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview6.19258.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>9736070b8b876ba51f6d3fc24e07d957ce71b7f1</Sha>
+      <Sha>ef31a9683b3eadf84255e95cea061a25208ea483</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview6.19256.2">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview6.19258.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>9736070b8b876ba51f6d3fc24e07d957ce71b7f1</Sha>
+      <Sha>ef31a9683b3eadf84255e95cea061a25208ea483</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview6.19256.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview6.19258.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>9736070b8b876ba51f6d3fc24e07d957ce71b7f1</Sha>
+      <Sha>ef31a9683b3eadf84255e95cea061a25208ea483</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview6.19256.2">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview6.19258.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>9736070b8b876ba51f6d3fc24e07d957ce71b7f1</Sha>
+      <Sha>ef31a9683b3eadf84255e95cea061a25208ea483</Sha>
     </Dependency>
     <Dependency Name="dotnet-ef" Version="3.0.0-preview6.19252.4" Pinned="true">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 80683e4794..3ad7e25563 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -114,10 +114,10 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview6.19252.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview6.19252.4</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview6.19256.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview6.19256.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview6.19256.2</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview6.19256.2</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview6.19258.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview6.19258.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview6.19258.1</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview6.19258.1</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs
index 6bba1c26e1..c32de460c1 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/CompilerFailedExceptionFactoryTest.cs
@@ -34,7 +34,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
             // Assert
             var failure = Assert.Single(compilationResult.CompilationFailures);
             Assert.Equal(viewPath, failure.SourceFilePath);
-            Assert.Collection(failure.Messages,
+            var orderedMessages = failure.Messages.OrderByDescending(messages => messages.Message);
+            Assert.Collection(orderedMessages,
                 message => Assert.StartsWith(
                     @"Unterminated string literal.",
                     message.Message),