From c3a6095bf1c2f046743534dffd4075e710b27449 Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Tue, 20 Jan 2015 15:23:04 -0800
Subject: [PATCH] Pointing IIS Express to the wwwroot folder instead of app
 base.

---
 src/MusicStore/wwwroot/web.config         |  1 +
 test/E2ETests/Common/DeploymentUtility.cs | 10 ++++++++--
 test/E2ETests/Implementation/Scenarios.cs |  5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/MusicStore/wwwroot/web.config b/src/MusicStore/wwwroot/web.config
index 71ebc78e72..add6dfc5e7 100644
--- a/src/MusicStore/wwwroot/web.config
+++ b/src/MusicStore/wwwroot/web.config
@@ -10,6 +10,7 @@
     <!-- This will turn on detailed errors when deployed to remote servers -->
     <!-- This setting is not recommended for production -->
     <add key="ASPNET_DETAILED_ERRORS" value="true" />
+    <add key="dotnet-app-base" value="../" />
   </appSettings>
 
 </configuration>
\ No newline at end of file
diff --git a/test/E2ETests/Common/DeploymentUtility.cs b/test/E2ETests/Common/DeploymentUtility.cs
index 2748caff3c..330046a5a0 100644
--- a/test/E2ETests/Common/DeploymentUtility.cs
+++ b/test/E2ETests/Common/DeploymentUtility.cs
@@ -47,7 +47,13 @@ namespace E2ETests
             var interopLibrary = libraryManager.GetLibraryInformation("Microsoft.AspNet.Loader.IIS.Interop");
 
             var aspNetLoaderSrcPath = Path.Combine(interopLibrary.Path, "tools", "AspNet.Loader.dll");
-            var aspNetLoaderDestPath = Path.Combine(applicationPath, "bin", "AspNet.Loader.dll");
+            var aspNetLoaderDestPath = Path.Combine(applicationPath, "wwwroot", "bin", "AspNet.Loader.dll");
+
+            // Create bin directory if it does not exist.
+            if (!Directory.Exists(new DirectoryInfo(aspNetLoaderDestPath).Parent.FullName))
+            {
+                Directory.CreateDirectory(new DirectoryInfo(aspNetLoaderDestPath).Parent.FullName);
+            }
 
             if (!File.Exists(aspNetLoaderDestPath))
             {
@@ -230,7 +236,7 @@ namespace E2ETests
             }
 
             var parameters = string.IsNullOrWhiteSpace(startParameters.ApplicationHostConfigLocation) ?
-                            string.Format("/port:5001 /path:{0}", startParameters.ApplicationPath) :
+                            string.Format("/port:5001 /path:{0}", Path.Combine(startParameters.ApplicationPath, "wwwroot")) :
                             string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation);
 
             var iisExpressPath = GetIISExpressPath(startParameters.DotnetArchitecture);
diff --git a/test/E2ETests/Implementation/Scenarios.cs b/test/E2ETests/Implementation/Scenarios.cs
index 8a4854ee47..233e131918 100644
--- a/test/E2ETests/Implementation/Scenarios.cs
+++ b/test/E2ETests/Implementation/Scenarios.cs
@@ -35,7 +35,10 @@ namespace E2ETests
 
         private void VerifyHomePage(HttpResponseMessage response, string responseContent, bool useNtlmAuthentication = false)
         {
-            _logger.WriteVerbose("Home page content : {0}", responseContent);
+            // This seems to not print anything if the successive Assert fails.
+            //_logger.WriteVerbose("Home page content : {0}", responseContent);
+
+            Console.WriteLine("Home page content : {0}", responseContent);
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             ValidateLayoutPage(responseContent);
             Assert.Contains(PrefixBaseAddress("<a href=\"/{0}/Store/Details/"), responseContent, StringComparison.OrdinalIgnoreCase);