From 75ba58bac24a0f8e448eb0198e07868fc6bec5da Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 26 May 2017 09:51:38 -0700 Subject: [PATCH] Re-add some code that was removed during TFM churn --- src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs | 2 +- .../Common/RetryHelper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs index 17c81c0948..3c5423830f 100644 --- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs +++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs @@ -207,7 +207,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal var model = new ErrorPageModel { - RuntimeDisplayName = ".NET Core" + RuntimeDisplayName = RuntimeInformation.FrameworkDescription }; var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly; var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString(); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs index a51004fe9b..66a0c250a6 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } else { - if (exception is HttpRequestException) + if (exception is HttpRequestException || exception is WebException) { logger.LogWarning("Failed to complete the request : {0}.", exception.Message); await Task.Delay(1 * 1000); //Wait for a while before retry.