From 7c63dbe40971822c534d70f0eaee223fdee3ff02 Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Wed, 23 Nov 2016 11:41:44 -0800
Subject: [PATCH] #718 Test against the latest build of AspNetCoreModule

---
 samples/MusicStore.Standalone/project.json |  5 +++--
 samples/MusicStore/project.json            |  5 +++--
 test/E2ETests/Http.config                  |  2 +-
 test/E2ETests/NtlmAuthentation.config      |  2 +-
 test/E2ETests/project.json                 | 18 ++++++++++++++++--
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/samples/MusicStore.Standalone/project.json b/samples/MusicStore.Standalone/project.json
index cd481569b6..3d113adad3 100644
--- a/samples/MusicStore.Standalone/project.json
+++ b/samples/MusicStore.Standalone/project.json
@@ -2,8 +2,8 @@
   "authors": [
     "Microsoft"
   ],
-  "description": "Music store application on ASP.NET 5",
-  "version": "1.1.0-*",
+  "description": "Music store application on ASP.NET Core",
+  "version": "1.2.0-*",
   "buildOptions": {
     "compile": {
       "exclude": [
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore": "1.2.0-*",
+    "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.2.0-*",
     "Microsoft.AspNetCore.Authentication.Facebook": "1.2.0-*",
     "Microsoft.AspNetCore.Authentication.Google": "1.2.0-*",
diff --git a/samples/MusicStore/project.json b/samples/MusicStore/project.json
index ba139d75ef..dc0349ad83 100644
--- a/samples/MusicStore/project.json
+++ b/samples/MusicStore/project.json
@@ -2,8 +2,8 @@
   "authors": [
     "Microsoft"
   ],
-  "description": "Music store application on ASP.NET 5",
-  "version": "1.1.0-*",
+  "description": "Music store application on ASP.NET Core",
+  "version": "1.2.0-*",
   "buildOptions": {
     "copyToOutput": {
       "include": [
@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore": "1.2.0-*",
+    "Microsoft.AspNetCore.AspNetCoreModule": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.2.0-*",
     "Microsoft.AspNetCore.Authentication.Facebook": "1.2.0-*",
     "Microsoft.AspNetCore.Authentication.Google": "1.2.0-*",
diff --git a/test/E2ETests/Http.config b/test/E2ETests/Http.config
index 94a115e54b..4897ae7a5f 100644
--- a/test/E2ETests/Http.config
+++ b/test/E2ETests/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/E2ETests/NtlmAuthentation.config b/test/E2ETests/NtlmAuthentation.config
index 9d098eee84..e34fe65e16 100644
--- a/test/E2ETests/NtlmAuthentation.config
+++ b/test/E2ETests/NtlmAuthentation.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/E2ETests/project.json b/test/E2ETests/project.json
index 90098e8058..3d38fcc3ef 100644
--- a/test/E2ETests/project.json
+++ b/test/E2ETests/project.json
@@ -7,7 +7,7 @@
     "Microsoft.AspNetCore.Authentication.Cookies": "1.2.0-*",
     "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.2.0-*",
     "Microsoft.AspNetCore.Identity": "1.2.0-*",
-    "Microsoft.AspNetCore.Server.IntegrationTesting": "0.2.0-*",
+    "Microsoft.AspNetCore.Server.IntegrationTesting": "0.3.0-*",
     "Microsoft.AspNetCore.WebUtilities": "1.2.0-*",
     "Microsoft.Extensions.Configuration.Binder": "1.2.0-*",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.2.0-*",
@@ -30,5 +30,19 @@
     "Microsoft.Extensions.SecretManager.Tools": "1.0.0-*"
   },
   "testRunner": "xunit",
-  "userSecretsId": "MusicStore.E2ETests"
+  "userSecretsId": "MusicStore.E2ETests",
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {},
+
+    "osx.10.10-x64": {},
+    "osx.10.11-x64": {},
+
+    "ubuntu.14.04-x64": {},
+    "ubuntu.14.10-x64": {},
+    "ubuntu.15.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "centos.7-x64": {},
+    "debian.8-x64": {}
+  }
 }
\ No newline at end of file