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

Bump Microsoft.AspNetCore.Server.IntegrationTesting to net452.

This commit is contained in:
Cesar Blum Silveira 2017-02-22 13:46:47 -08:00
parent d5ec0859e5
commit af953b4883
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
else else
{ {
if (exception is HttpRequestException if (exception is HttpRequestException
#if NET451 #if NET452
|| exception is System.Net.WebException || exception is System.Net.WebException
#endif #endif
) )
@ -95,4 +95,4 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
} }
} }
} }
} }

4
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs
View File

@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo, List<KeyValuePair<string, string>> environmentVariables) protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo, List<KeyValuePair<string, string>> environmentVariables)
{ {
var environment = var environment =
#if NET451 #if NET452
startInfo.EnvironmentVariables; startInfo.EnvironmentVariables;
#else #else
startInfo.Environment; 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) protected void SetEnvironmentVariable(System.Collections.Specialized.StringDictionary environment, string name, string value)
{ {
#else #else

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
{ {
case ServerType.IISExpress: case ServerType.IISExpress:
return new IISExpressDeployer(deploymentParameters, logger); return new IISExpressDeployer(deploymentParameters, logger);
#if NET451 #if NET452
case ServerType.IIS: case ServerType.IIS:
return new IISDeployer(deploymentParameters, logger); return new IISDeployer(deploymentParameters, logger);
#endif #endif

2
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // 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;
using System.Linq; using System.Linq;

4
src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
View File

@ -5,7 +5,7 @@
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.</Description> <Description>ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.</Description>
<VersionPrefix>0.3.0</VersionPrefix> <VersionPrefix>0.3.0</VersionPrefix>
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks> <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;testing</PackageTags> <PackageTags>aspnetcore;testing</PackageTags>
@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" /> <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PackageReference Include="Microsoft.Web.Administration" Version="7.0.0" /> <PackageReference Include="Microsoft.Web.Administration" Version="7.0.0" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />