diff --git a/test/ServerComparison.FunctionalTests/Http.config b/test/ServerComparison.FunctionalTests/Http.config
index b1b08c8b1d..5ef47a0ae4 100644
--- a/test/ServerComparison.FunctionalTests/Http.config
+++ b/test/ServerComparison.FunctionalTests/Http.config
@@ -118,7 +118,7 @@
-
+
@@ -253,7 +253,7 @@
-
+
@@ -928,7 +928,7 @@
-
+
diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentation.config b/test/ServerComparison.FunctionalTests/NtlmAuthentation.config
index f821bafb01..f0f7436f6e 100644
--- a/test/ServerComparison.FunctionalTests/NtlmAuthentation.config
+++ b/test/ServerComparison.FunctionalTests/NtlmAuthentation.config
@@ -118,7 +118,7 @@
-
+
@@ -253,7 +253,7 @@
-
+
@@ -928,7 +928,7 @@
-
+
diff --git a/test/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs
index 336e6f1777..f2bf0772ea 100644
--- a/test/ServerComparison.FunctionalTests/ResponseTests.cs
+++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs
@@ -53,15 +53,15 @@ namespace ServerComparison.FunctionalTests
return ResponseFormats(serverType, runtimeFlavor, architecture, applicationBaseUrl, CheckConnectionCloseAsync);
}
- // [ConditionalTheory]
- // [OSSkipCondition(OperatingSystems.Linux)]
- // [OSSkipCondition(OperatingSystems.MacOSX)]
- // // [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5078/")] // https://github.com/aspnet/IISIntegration/issues/7
- // [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, "http://localhost:5079/")]
- // public Task ResponseFormats_Windows_Chunked(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
- // {
- // return ResponseFormats(serverType, runtimeFlavor, architecture, applicationBaseUrl, CheckChunkedAsync);
- // }
+ [ConditionalTheory]
+ [OSSkipCondition(OperatingSystems.Linux)]
+ [OSSkipCondition(OperatingSystems.MacOSX)]
+ [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5078/")]
+ [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5079/")]
+ public Task ResponseFormats_Windows_Chunked(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
+ {
+ return ResponseFormats(serverType, runtimeFlavor, architecture, applicationBaseUrl, CheckChunkedAsync);
+ }
[Theory]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5080/")]
@@ -73,7 +73,7 @@ namespace ServerComparison.FunctionalTests
[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
- // [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5081/")] // https://github.com/aspnet/IISIntegration/issues/7
+ [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5081/")]
[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, "http://localhost:5082/")]
public Task ResponseFormats_Windows_ManuallyChunk(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl)
{
diff --git a/test/ServerComparison.TestSites/Program.cs b/test/ServerComparison.TestSites/Program.cs
index d63b989a19..e8941b23dd 100644
--- a/test/ServerComparison.TestSites/Program.cs
+++ b/test/ServerComparison.TestSites/Program.cs
@@ -10,9 +10,9 @@ namespace ServerComparison.TestSites
public static void Main(string[] args)
{
var host = new WebHostBuilder()
- .UseServer ("Microsoft.AspNetCore.Server.Kestrel")
+ .UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseDefaultConfiguration(args)
- .UseIISPlatformHandlerUrl()
+ .UseIISUrl()
.UseStartup("ServerComparison.TestSites")
.Build();
diff --git a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
index ed365f47d1..383487e1f2 100644
--- a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
+++ b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs
@@ -57,7 +57,7 @@ namespace ServerComparison.TestSites
}
else
{
- app.UseIISPlatformHandler();
+ app.UseIIS();
}
app.Use((context, next) =>
diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json
index 0c2cfb387e..1d11f21f3c 100644
--- a/test/ServerComparison.TestSites/project.json
+++ b/test/ServerComparison.TestSites/project.json
@@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
- "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Server.WebListener": "0.1.0-*",
"Microsoft.AspNetCore.WebUtilities": "1.0.0-*",
diff --git a/test/ServerComparison.TestSites/wwwroot/web.config b/test/ServerComparison.TestSites/wwwroot/web.config
index fe1beaa3f3..0d1d5c2520 100644
--- a/test/ServerComparison.TestSites/wwwroot/web.config
+++ b/test/ServerComparison.TestSites/wwwroot/web.config
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file