From 92cb5120ae4d1bcfc42daa10a063259cef7266cb Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 24 Mar 2016 14:11:36 -0700 Subject: [PATCH] React to Hosting changes --- .../project.json | 7 +++++-- .../HelloWorldTest.cs | 2 +- .../HttpsTest.cs | 4 ++-- .../NtlmAuthentationTest.cs | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration/project.json index 011793428b..f4600ff82e 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/project.json +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/project.json @@ -12,7 +12,7 @@ "url": "git://github.com/aspnet/IISIntegration" }, "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Hosting": "1.0.0-*", "Microsoft.AspNetCore.Http": "1.0.0-*", "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", @@ -29,7 +29,10 @@ "dependencies": { "System.Security.Principal.Windows": "4.0.0-*" }, - "imports": [ "dotnet5.4" ] + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs index a8413cd814..a904477532 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HelloWorldTest.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null, SiteName = "HttpTestSite", // This is configured in the Http.config - PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "dnxcore50" + PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netstandardapp1.5" }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger)) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs index 990f0dedad..fc26118c51 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "dnxcore50" + PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netstandardapp1.5" }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger)) @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "dnxcore50" + PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netstandardapp1.5" }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger)) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs index 4f05f41d46..4dff9c4b91 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null, SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "dnx451" : "dnxcore50" + PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netstandardapp1.5" }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger))