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

React to Testing changes

This commit is contained in:
Pranav K 2015-10-23 14:10:52 -07:00
parent 56256a013b
commit a20b3e6e37
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -238,9 +238,9 @@ namespace Microsoft.AspNet.Server.Testing
protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo) protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo)
{ {
var environment = var environment =
#if NET451 #if DNX451
startInfo.EnvironmentVariables; startInfo.EnvironmentVariables;
#elif DOTNET5_4 #elif DNXCORE50
startInfo.Environment; startInfo.Environment;
#endif #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) 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<string, string> environment, string name, string value) protected void SetEnvironmentVariable(System.Collections.Generic.IDictionary<string, string> environment, string name, string value)
{ {
#endif #endif

4
src/Microsoft.AspNet.Server.Testing/project.json
View File

@ -11,7 +11,7 @@
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { "dnx451": {
"dependencies": { "dependencies": {
"Microsoft.Web.Administration": "7.0.0" "Microsoft.Web.Administration": "7.0.0"
}, },
@ -20,7 +20,7 @@
"System.Xml": "" "System.Xml": ""
} }
}, },
"dotnet5.4": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Diagnostics.Process": "4.0.0-beta-*", "System.Diagnostics.Process": "4.0.0-beta-*",
"System.IO.FileSystem": "4.0.1-beta-*", "System.IO.FileSystem": "4.0.1-beta-*",