huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2' 

# Conflicts:
#	version.props
This commit is contained in:
N. Taylor Mullen 2018-08-21 15:08:31 -07:00
parent c1fc38a3e8 f624c9aa7b
commit 9e46cb5936
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -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>

11
test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
View File

@ -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()