From ea681786bd4fade1f8a76910ae979b66102e1dd9 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 21 Aug 2018 13:33:51 -0700
Subject: [PATCH 1/2] Update package branding for 2.2.0-preview2

---
 build/dependencies.props | 4 ++--
 version.props            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 7fbb2a958b..e1fbf0322d 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,7 +7,7 @@
       is not otherwise referenced. They avoid unnecessary changes to the Universe build graph or to product
       dependencies. Do not use these properties elsewhere.
     -->
-  
+
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
     <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>
@@ -108,6 +108,6 @@
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Pinned" />
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+  <PropertyGroup Label="Package Versions: Pinned" />
 </Project>
diff --git a/version.props b/version.props
index 4d7257694d..d623e08663 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.2.0</VersionPrefix>
-    <VersionSuffix>preview1</VersionSuffix>
+    <VersionSuffix>preview2</VersionSuffix>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
     <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
 
@@ -11,7 +11,7 @@
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
 
     <ExperimentalVersionPrefix>0.2.0</ExperimentalVersionPrefix>
-    <ExperimentalVersionSuffix>preview1</ExperimentalVersionSuffix>
+    <ExperimentalVersionSuffix>preview2</ExperimentalVersionSuffix>
 
     <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' == 'rtm' ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
     <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>

From f624c9aa7b3735f613ae059a26fe180f4155c89c Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 20 Aug 2018 12:01:09 -0700
Subject: [PATCH 2/2] Add flaky test logging for
 `CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions`.

#8281
---
 .../HtmlGenerationWithCultureTest.cs                  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
index 9b1d1f5cbe..d028f5ec24 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
@@ -6,9 +6,12 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.Dom.Html;
+using AngleSharp.Extensions;
+using AngleSharp.Html;
 using HtmlGenerationWebSite;
 using Microsoft.AspNetCore.Hosting;
 using Xunit;
+using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
 {
@@ -149,6 +152,14 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             // Assert - 3
             Assert.Equal("fr-FR", culture);
             Assert.Equal("14", correlationId);
+
+            if (cachedCorrelationId != "10")
+            {
+                // This is logging to investigate potential flakiness in this test tracked by https://github.com/aspnet/Mvc/issues/8281
+                var documentContent = document.ToHtml(new HtmlMarkupFormatter());
+                throw new XunitException($"Unexpected correlation Id, reading values from document:{Environment.NewLine}{documentContent}");
+            }
+
             Assert.Equal("10", cachedCorrelationId);
 
             void ReadValuesFromDocument()