From 3997203a4b7a52320ce258014f1f2ed58a674463 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:35:57 -0400
Subject: [PATCH] Merge ClientPull and NpmInstall tasks

---
 src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index 586ef980f6..640122f0fc 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -20,26 +20,21 @@
 
   <PropertyGroup>
     <NodeModulesFolder>ClientApp/node_modules</NodeModulesFolder>
-    <ClientInstallStampFile>ClientApp/.install-stamp</ClientInstallStampFile>
     <NpmInstallStampFile>ClientApp/node_modules/.install-stamp</NpmInstallStampFile>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
 
-  <Target Name="ClientPull" Inputs="../../build/ControlPanelVersion.props" Outputs="$(ClientInstallStampFile)">
+  <Target Name="ClientInstall" Inputs="../../build/ControlPanelVersion.props" Outputs="$(NpmInstallStampFile)">
     <Message Text="Pulling web control panel..." Importance="high" />
     <RemoveDir Directories="ClientApp" />
     <Exec Command="git clone https://github.com/tgstation/tgstation-server-control-panel --branch v$(TgsControlPanelVersion) --depth 1 ClientApp" />
-    <Touch Files="$(ClientInstallStampFile)" AlwaysCreate="true" />
-  </Target>
-
-  <Target Name="NpmInstall" DependsOnTargets="ClientPull" Inputs="ClientApp/package.json;ClientApp/package-lock.json" Outputs="$(NpmInstallStampFile)">
     <Message Text="Restoring npm packages..." Importance="high" />
     <Exec WorkingDirectory="ClientApp" Command="npm ci" />
     <Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
   </Target>
 
-  <Target Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="NpmInstall" Inputs="@(ClientApp)" Outputs="wwwroot\index.html">
+  <Target Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="@(ClientApp)" Outputs="wwwroot\index.html">
     <Message Text="Building web control panel..." Importance="high" />
     <Exec WorkingDirectory="ClientApp" Command="npm run msbuild" />
   </Target>