From e57ded038bf47998e1ce821153a085fea9a388b4 Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Tue, 22 Nov 2016 15:54:46 -0800
Subject: [PATCH] #46 Test support for bin deployed aspnetcore.dll

---
 ServerTests.sln                                               | 1 +
 test/ServerComparison.FunctionalTests/Http.config             | 2 +-
 test/ServerComparison.FunctionalTests/NoCompression.config    | 2 +-
 .../NtlmAuthentication.config                                 | 2 +-
 test/ServerComparison.FunctionalTests/project.json            | 2 +-
 test/ServerComparison.TestSites.Standalone/project.json       | 4 ++--
 test/ServerComparison.TestSites/project.json                  | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ServerTests.sln b/ServerTests.sln
index 7ebd72856d..b36c058033 100644
--- a/ServerTests.sln
+++ b/ServerTests.sln
@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49AB8AAA-8160-48DF-A18B-78F51E54E02A}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
+		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FA91F388-F4AF-4850-9D68-D4D128E6B1A6}"
diff --git a/test/ServerComparison.FunctionalTests/Http.config b/test/ServerComparison.FunctionalTests/Http.config
index 5ef47a0ae4..3668f762c8 100644
--- a/test/ServerComparison.FunctionalTests/Http.config
+++ b/test/ServerComparison.FunctionalTests/Http.config
@@ -253,7 +253,7 @@
             <add name="ManagedEngine64" image="%windir%\Microsoft.NET\Framework64\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness64" />
             <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
             <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
-            <add name="AspNetCoreModule" image="%SystemRoot%\System32\inetsrv\aspnetcore.dll" />
+            <add name="AspNetCoreModule" image="[ANCMPath]" />
         </globalModules>
 
         <httpCompression directory="%TEMP%\iisexpress\IIS Temporary Compressed Files">
diff --git a/test/ServerComparison.FunctionalTests/NoCompression.config b/test/ServerComparison.FunctionalTests/NoCompression.config
index a5deeb6f72..a44a5f2a81 100644
--- a/test/ServerComparison.FunctionalTests/NoCompression.config
+++ b/test/ServerComparison.FunctionalTests/NoCompression.config
@@ -253,7 +253,7 @@
             <add name="ManagedEngine64" image="%windir%\Microsoft.NET\Framework64\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness64" />
             <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
             <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
-            <add name="AspNetCoreModule" image="%SystemRoot%\System32\inetsrv\aspnetcore.dll" />
+            <add name="AspNetCoreModule" image="[ANCMPath]" />
         </globalModules>
 
         <httpCompression directory="%TEMP%\iisexpress\IIS Temporary Compressed Files">
diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentication.config b/test/ServerComparison.FunctionalTests/NtlmAuthentication.config
index f0f7436f6e..c35bcf3443 100644
--- a/test/ServerComparison.FunctionalTests/NtlmAuthentication.config
+++ b/test/ServerComparison.FunctionalTests/NtlmAuthentication.config
@@ -253,7 +253,7 @@
             <add name="ManagedEngine64" image="%windir%\Microsoft.NET\Framework64\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness64" />
             <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
             <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
-            <add name="AspNetCoreModule" image="%SystemRoot%\system32\inetsrv\aspnetcore.dll" />
+            <add name="AspNetCoreModule" image="[ANCMPath]" />
         </globalModules>
 
         <httpCompression directory="%TEMP%\iisexpress\IIS Temporary Compressed Files">
diff --git a/test/ServerComparison.FunctionalTests/project.json b/test/ServerComparison.FunctionalTests/project.json
index 5adba0c8ed..eda2492d4b 100644
--- a/test/ServerComparison.FunctionalTests/project.json
+++ b/test/ServerComparison.FunctionalTests/project.json
@@ -14,7 +14,7 @@
   "testRunner": "xunit",
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
-    "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*",
+    "Microsoft.AspNetCore.Server.IntegrationTesting": "0.3.0-*",
     "Microsoft.Extensions.Logging": "1.2.0-*",
     "Microsoft.Extensions.Logging.Console": "1.2.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.2.0-*",
diff --git a/test/ServerComparison.TestSites.Standalone/project.json b/test/ServerComparison.TestSites.Standalone/project.json
index de18228344..9fd125e915 100644
--- a/test/ServerComparison.TestSites.Standalone/project.json
+++ b/test/ServerComparison.TestSites.Standalone/project.json
@@ -1,6 +1,7 @@
 {
   "version": "1.1.0-*",
   "dependencies": {
+    "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
     "Microsoft.AspNetCore.ResponseCompression": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",
@@ -11,8 +12,7 @@
     "Microsoft.Extensions.Logging.Console": "1.2.0-*",
     "Microsoft.Net.Http.Headers": "1.2.0-*",
     "Microsoft.NETCore.App": {
-      "version": "1.1.0-*",
-      "type": "platform"
+      "version": "1.1.0-*"
     }
   },
   "buildOptions": {
diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json
index 7a804723a3..cdc87668b1 100644
--- a/test/ServerComparison.TestSites/project.json
+++ b/test/ServerComparison.TestSites/project.json
@@ -1,6 +1,7 @@
 {
   "version": "1.1.0-*",
   "dependencies": {
+    "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
     "Microsoft.AspNetCore.ResponseCompression": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*",