diff --git a/samples/IISSample/Properties/launchSettings.json b/samples/IISSample/Properties/launchSettings.json index 430b3eb7b8..1c953e10f0 100644 --- a/samples/IISSample/Properties/launchSettings.json +++ b/samples/IISSample/Properties/launchSettings.json @@ -12,14 +12,16 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { - "Hosting:Environment": "Development" + "ASPNETCORE_ENVIRONMENT": "Development" } }, - "web": { - "commandName": "web", + "IISSample": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "http://localhost:5000", "environmentVariables": { - "Hosting:Environment": "Development" + "ASPNETCORE_ENVIRONMENT": "Development" } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration/project.json index b0c233ae55..20742be9fb 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/project.json @@ -16,7 +16,7 @@ } }, "dependencies": { - "Microsoft.AspNetCore.Hosting": "1.0.0-*", + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Http": "1.0.0-*", "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs index c776c3f5e4..660ed5ea24 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs @@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = new LoggerFactory() .AddConsole() + .AddDebug() .CreateLogger($"HelloWorld:{serverType}:{runtimeFlavor}:{architecture}:{delegateServer}"); using (logger.BeginScope("HelloWorldTest")) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs index f6013321e4..9979d7dc1f 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs @@ -31,6 +31,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = new LoggerFactory() .AddConsole() + .AddDebug() .CreateLogger($"HttpsHelloWorld:{serverType}:{runtimeFlavor}:{architecture}"); using (logger.BeginScope("HttpsHelloWorldTest")) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs index 0381165c5e..3c6ad826dc 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs @@ -26,6 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = new LoggerFactory() .AddConsole() + .AddDebug() .CreateLogger($"HttpsHelloWorld:{serverType}:{runtimeFlavor}:{architecture}"); using (logger.BeginScope("NtlmAuthenticationTest")) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json index cc88ecbbcf..040735d03a 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json @@ -21,6 +21,7 @@ "Microsoft.AspNetCore.Server.Testing": "0.1.0-*", "Microsoft.Extensions.Logging": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "xunit": "2.1.0" }, diff --git a/test/TestSites/Properties/launchSettings.json b/test/TestSites/Properties/launchSettings.json index b58b1afd38..e5322bfd54 100644 --- a/test/TestSites/Properties/launchSettings.json +++ b/test/TestSites/Properties/launchSettings.json @@ -12,14 +12,16 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" + "ASPNETCORE_ENVIRONMENT": "Development" } }, - "web": { - "commandName": "web", + "TestSites": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "http://localhost:5000", "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" + "ASPNETCORE_ENVIRONMENT": "Development" } } } -} \ No newline at end of file +}