From 3f26d025e2d723ae7fc3bb003ec77915b2ca94dc Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 21 Jul 2020 01:29:53 +0800
Subject: Fix publish problem caused by msbuild.

---
 Timeline/ClientApp       |  2 +-
 Timeline/Timeline.csproj | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'Timeline')

diff --git a/Timeline/ClientApp b/Timeline/ClientApp
index 70f25608..be3ac18e 160000
--- a/Timeline/ClientApp
+++ b/Timeline/ClientApp
@@ -1 +1 @@
-Subproject commit 70f256087c3218f9d0ea504f6e323a436c0fc6eb
+Subproject commit be3ac18e108c65aa06f402608d4d33cece1e46cd
diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj
index 2a2408d8..50458c4b 100644
--- a/Timeline/Timeline.csproj
+++ b/Timeline/Timeline.csproj
@@ -21,7 +21,7 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <Content Include="MockClientApp\index.html">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
     </ItemGroup>
 
@@ -57,8 +57,8 @@
 
     <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
         <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
-        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn" />
-        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn build" />
+        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn" StdOutEncoding="UTF-8" IgnoreStandardErrorWarningFormat="true" />
+        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn build" StdOutEncoding="UTF-8" IgnoreStandardErrorWarningFormat="true" />
 
         <!-- Include the newly-built files in the publish output -->
         <ItemGroup>
@@ -72,7 +72,7 @@
     </Target>
 
     <ItemGroup>
-      <None Remove="MockClientApp\index.html" />
+        <None Remove="MockClientApp\index.html" />
     </ItemGroup>
 
     <ItemGroup>
@@ -107,9 +107,9 @@
             <DependentUpon>UserController.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Entities.Designer.cs">
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Entities.resx</DependentUpon>
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Entities.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Filters.Designer.cs">
             <DesignTime>True</DesignTime>
@@ -132,9 +132,9 @@
             <DependentUpon>Common.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Models\Http\Exception.Designer.cs">
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Exception.resx</DependentUpon>
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Exception.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Models\Validation\NicknameValidator.Designer.cs">
             <DesignTime>True</DesignTime>
@@ -162,9 +162,9 @@
             <DependentUpon>Exception.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Services\Exceptions.Designer.cs">
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Exceptions.resx</DependentUpon>
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Exceptions.resx</DependentUpon>
         </Compile>
         <Compile Update="Resources\Services\TimelineService.Designer.cs">
             <DesignTime>True</DesignTime>
@@ -215,8 +215,8 @@
             <LastGenOutput>UserController.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Entities.resx">
-          <Generator>ResXFileCodeGenerator</Generator>
-          <LastGenOutput>Entities.Designer.cs</LastGenOutput>
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Entities.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Filters.resx">
             <Generator>ResXFileCodeGenerator</Generator>
@@ -235,8 +235,8 @@
             <LastGenOutput>Common.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Models\Http\Exception.resx">
-          <Generator>ResXFileCodeGenerator</Generator>
-          <LastGenOutput>Exception.Designer.cs</LastGenOutput>
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Exception.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Models\Validation\NicknameValidator.resx">
             <Generator>ResXFileCodeGenerator</Generator>
@@ -259,8 +259,8 @@
             <LastGenOutput>Exception.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Services\Exceptions.resx">
-          <Generator>ResXFileCodeGenerator</Generator>
-          <LastGenOutput>Exceptions.Designer.cs</LastGenOutput>
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Exceptions.Designer.cs</LastGenOutput>
         </EmbeddedResource>
         <EmbeddedResource Update="Resources\Services\TimelineService.resx">
             <Generator>ResXFileCodeGenerator</Generator>
-- 
cgit v1.2.3