From a20b3e6e377b738360d796bd0479a0d51d3703fc Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 23 Oct 2015 14:10:52 -0700 Subject: [PATCH] React to Testing changes --- .../Deployers/ApplicationDeployer.cs | 8 ++++---- src/Microsoft.AspNet.Server.Testing/project.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs index 8e9541199b..a8dfd0e17a 100644 --- a/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs +++ b/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs @@ -238,9 +238,9 @@ namespace Microsoft.AspNet.Server.Testing protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo) { var environment = -#if NET451 +#if DNX451 startInfo.EnvironmentVariables; -#elif DOTNET5_4 +#elif DNXCORE50 startInfo.Environment; #endif @@ -260,10 +260,10 @@ namespace Microsoft.AspNet.Server.Testing } } -#if DNX451 || NET451 +#if DNX451 protected void SetEnvironmentVariable(System.Collections.Specialized.StringDictionary environment, string name, string value) { -#elif DNXCORE50 || DOTNET5_4 +#elif DNXCORE50 protected void SetEnvironmentVariable(System.Collections.Generic.IDictionary environment, string name, string value) { #endif diff --git a/src/Microsoft.AspNet.Server.Testing/project.json b/src/Microsoft.AspNet.Server.Testing/project.json index 4d3ddd3fd1..66ee97d55c 100644 --- a/src/Microsoft.AspNet.Server.Testing/project.json +++ b/src/Microsoft.AspNet.Server.Testing/project.json @@ -11,7 +11,7 @@ "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" }, "frameworks": { - "net451": { + "dnx451": { "dependencies": { "Microsoft.Web.Administration": "7.0.0" }, @@ -20,7 +20,7 @@ "System.Xml": "" } }, - "dotnet5.4": { + "dnxcore50": { "dependencies": { "System.Diagnostics.Process": "4.0.0-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",