From af953b48830ff6c7660ebd352eb6b2e88d3dec80 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Wed, 22 Feb 2017 13:46:47 -0800 Subject: [PATCH] Bump Microsoft.AspNetCore.Server.IntegrationTesting to net452. --- .../Common/RetryHelper.cs | 4 ++-- .../Deployers/ApplicationDeployer.cs | 4 ++-- .../Deployers/ApplicationDeployerFactory.cs | 2 +- .../Deployers/IISDeployer.cs | 2 +- .../Microsoft.AspNetCore.Server.IntegrationTesting.csproj | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs index bc5f5d853e..34b47d6f9c 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting else { if (exception is HttpRequestException -#if NET451 +#if NET452 || exception is System.Net.WebException #endif ) @@ -95,4 +95,4 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs index 718bb54541..689b780a9b 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs @@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo, List> environmentVariables) { var environment = -#if NET451 +#if NET452 startInfo.EnvironmentVariables; #else startInfo.Environment; @@ -140,7 +140,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } } -#if NET451 +#if NET452 protected void SetEnvironmentVariable(System.Collections.Specialized.StringDictionary environment, string name, string value) { #else diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs index 208825eddf..d12b298639 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { case ServerType.IISExpress: return new IISExpressDeployer(deploymentParameters, logger); -#if NET451 +#if NET452 case ServerType.IIS: return new IISDeployer(deploymentParameters, logger); #endif diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs index ecbdeb5500..72739c3185 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET451 +#if NET452 using System; using System.Linq; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj index e16210bfbe..0c9a1e3f04 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj @@ -5,7 +5,7 @@ ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing. 0.3.0 - net451;netstandard1.3 + net452;netstandard1.3 $(NoWarn);CS1591 true aspnetcore;testing @@ -26,7 +26,7 @@ - +