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

Re-add some code that was removed during TFM churn

This commit is contained in:
Nate McMaster 2017-05-26 09:51:38 -07:00
parent 03bdb40f8a
commit 75ba58bac2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
View File

@ -207,7 +207,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var model = new ErrorPageModel var model = new ErrorPageModel
{ {
RuntimeDisplayName = ".NET Core" RuntimeDisplayName = RuntimeInformation.FrameworkDescription
}; };
var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly; var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString(); var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
View File

@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
} }
else else
{ {
if (exception is HttpRequestException) if (exception is HttpRequestException || exception is WebException)
{ {
logger.LogWarning("Failed to complete the request : {0}.", exception.Message); logger.LogWarning("Failed to complete the request : {0}.", exception.Message);
await Task.Delay(1 * 1000); //Wait for a while before retry. await Task.Delay(1 * 1000); //Wait for a while before retry.