From e017008c853c47c685bade90dd30823d51259082 Mon Sep 17 00:00:00 2001
From: Cesar De la Torre <cesardl@microsoft.com>
Date: Sun, 6 Aug 2017 16:35:23 -0700
Subject: [PATCH] Setting docker-compose.ci.build.yml to restore and build the
 bits directly with the .sln instead of the Linux Script.

---
 docker-compose.ci.build.yml  | 12 ++++++++----
 src/Web/WebMVC/WebMVC.csproj |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
index db2ef5390..edf84b572 100644
--- a/docker-compose.ci.build.yml
+++ b/docker-compose.ci.build.yml
@@ -7,8 +7,12 @@ services:
       - .:/src
       - ./cli-linux:/cli-linux
     working_dir: /src
-#    DO NOT USE the sln file to compile because msbuild issue (https://github.com/Microsoft/msbuild/issues/2153)
-#    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
-#    NOTE: Using build-bits-linux.sh triggers the same MSBUILD error :( (but at least, less frequently)
-    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
+
+#   Next line is using the .sln file to compile all the projects. 
+#   Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153)
+#   Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure.
+    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+
+#    NOTE: Using build-bits-linux.sh from Linux build container exits before ending.
+#    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
     
\ No newline at end of file
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index f36270750..ac781500a 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -22,9 +22,11 @@
   <ItemGroup>
     <Content Include="Setup\images.zip">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Setup\override.css">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>