From 12011b3809ad078eff4c76398b13a44ff0a8e179 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 27 Jul 2018 16:11:17 -0700
Subject: [PATCH] Cleanup testsite module locations (#1110)

---
 build/applicationhost.config                                | 2 +-
 build/applicationhost.iis.config                            | 2 +-
 build/launchSettings.json                                   | 6 ++++--
 samples/NativeIISSample/Properties/launchSettings.json      | 6 ++++--
 .../InProcessWebSite/Properties/launchSettings.json         | 6 ++++--
 .../OutOfProcessWebSite/Properties/launchSettings.json      | 6 ++++--
 .../OverriddenServerWebSite/Properties/launchSettings.json  | 6 ++++--
 .../StartupExceptionWebSite/Properties/launchSettings.json  | 6 ++++--
 .../StressTestWebSite/Properties/launchSettings.json        | 6 ++++--
 9 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/build/applicationhost.config b/build/applicationhost.config
index 8c7429db8d..ce00a887b4 100644
--- a/build/applicationhost.config
+++ b/build/applicationhost.config
@@ -233,7 +233,7 @@
       <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
       <add name="ApplicationInitializationModule" image="%IIS_BIN%\warmup.dll" />
       <add name="AspNetCoreModule" image="%ANCM_PATH%" />
-      <add name="AspNetCoreModuleV2" image="%ANCM_PATH%" />
+      <add name="AspNetCoreModuleV2" image="%ANCMV2_PATH%" />
     </globalModules>
     <httpCompression directory="%TEMP%\iisexpress\IIS Temporary Compressed Files">
       <scheme name="gzip" dll="%IIS_BIN%\gzip.dll" />
diff --git a/build/applicationhost.iis.config b/build/applicationhost.iis.config
index e7771484cb..34a4da59e6 100644
--- a/build/applicationhost.iis.config
+++ b/build/applicationhost.iis.config
@@ -226,7 +226,7 @@
       <add name="RequestFilteringModule" image="%windir%\System32\inetsrv\modrqflt.dll" />
       <add name="CustomErrorModule" image="%windir%\System32\inetsrv\custerr.dll" />
       <add name="AspNetCoreModule" image="%ANCM_PATH%" />
-      <add name="AspNetCoreModuleV2" image="%ANCM_PATH%" />
+      <add name="AspNetCoreModuleV2" image="%ANCMV2_PATH%" />
     </globalModules>
 
     <handlers accessPolicy="Read, Script">
diff --git a/build/launchSettings.json b/build/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/build/launchSettings.json
+++ b/build/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/samples/NativeIISSample/Properties/launchSettings.json
+++ b/samples/NativeIISSample/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json
+++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
+++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
+++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json
+++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json
index 0ef9e81546..943d2ad712 100644
--- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json
+++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json
@@ -15,7 +15,8 @@
       "nativeDebugging": true,
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",
@@ -28,7 +29,8 @@
       "commandLineArgs": "$(IISArguments)",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(TargetDir)$(AncmV2Path)",
+        "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+        "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "$(DotNetPath)",