From 56a60e3d2fe56c8d20b9a04c5872a2cc9806ce07 Mon Sep 17 00:00:00 2001
From: yanchenw <yanchenw@DOCKERPERF>
Date: Fri, 5 Jan 2018 14:15:20 -0800
Subject: [PATCH 1/2] Try to fix windows container build error

---
 src/Web/WebMVC/Dockerfile    | 2 --
 src/Web/WebMVC/WebMVC.csproj | 4 ++--
 src/Web/WebSPA/Dockerfile    | 3 ---
 src/Web/WebSPA/WebSPA.csproj | 4 ++--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile
index b2e004f29..5fb657dd8 100644
--- a/src/Web/WebMVC/Dockerfile
+++ b/src/Web/WebMVC/Dockerfile
@@ -10,8 +10,6 @@ WORKDIR /src/src/Web/WebMVC
 RUN dotnet build --no-restore -c Release -o /app
 
 FROM build AS publish
-RUN bower install --allow-root
-RUN dotnet bundle
 RUN dotnet publish --no-restore -c Release -o /app
 
 FROM base AS final
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index ecb6a08f4..3752e8c26 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -27,10 +27,10 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.3" />
   </ItemGroup>
 
-  <!--<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
     <Exec Command="bower install - -allow-root" />
     <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" />
-  </Target>-->
+  </Target>
 
   <ItemGroup>
     <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.5.357" />
diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile
index 879f21cc8..47032f41f 100644
--- a/src/Web/WebSPA/Dockerfile
+++ b/src/Web/WebSPA/Dockerfile
@@ -10,9 +10,6 @@ WORKDIR /src/src/Web/WebSPA
 RUN dotnet build --no-restore -c Release -o /app
 
 FROM build AS publish
-RUN npm rebuild node-sass
-RUN npm install
-RUN npm run build:prod
 RUN dotnet publish --no-restore -c Release -o /app
 
 FROM base AS final
diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj
index 707c9b121..fae86b9a5 100644
--- a/src/Web/WebSPA/WebSPA.csproj
+++ b/src/Web/WebSPA/WebSPA.csproj
@@ -37,14 +37,14 @@
   </ItemGroup>
 
   <!-- workaround for https://github.com/aspnet/websdk/issues/114 -->
-  <!--<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
     <Exec Command="npm install" />
     <Exec Command="npm run build:prod" />
     <ItemGroup>
       <_GeneratedFiles Include="$(GeneratedItemPatterns)" />
       <ContentWithTargetPath Include="@(_GeneratedFiles)" TargetPath="%(Identity)" CopyToPublishDirectory="PreserveNewest" />
     </ItemGroup>
-  </Target>-->
+  </Target>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />

From 3186c634824b639260c1fe6485f51e3e7d2d0b54 Mon Sep 17 00:00:00 2001
From: yanchenw <yanchenw@DOCKERPERF>
Date: Fri, 5 Jan 2018 14:33:04 -0800
Subject: [PATCH 2/2] Bug fix

---
 src/Web/WebMVC/WebMVC.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index 3752e8c26..b702bb3f8 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
-    <Exec Command="bower install - -allow-root" />
+    <Exec Command="bower install --allow-root" />
     <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" />
   </Target>