From e87259cfe5af1309cb31eebdcda55a843b3a5d88 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Tue, 13 Aug 2024 22:21:05 -0400
Subject: [PATCH] Bump webpanel to 6.1.0

---
 build/Version.props                                    | 1 -
 build/WebpanelVersion.props                            | 2 +-
 src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index 4f6a894532..f524e2ee69 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -21,6 +21,5 @@
     <TgsMariaDBRedistVersion>11.4.2</TgsMariaDBRedistVersion>
     <!-- Only have this uncommented if the mariadb servers are shitting the bed, update if the version updates -->
     <!--<TgsMariaDBFallbackRedist>https://mirror.its.dal.ca/mariadb//mariadb-10.11.8/winx64-packages/mariadb-10.11.8-winx64.msi</TgsMariaDBFallbackRedist>-->
-    <TgsYarnVersion>1.22.21</TgsYarnVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/WebpanelVersion.props b/build/WebpanelVersion.props
index 806c5ed542..2613f5510c 100644
--- a/build/WebpanelVersion.props
+++ b/build/WebpanelVersion.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- This is in it's own file to help incremental building, changing it causes a complete rebuild of the web panel -->
-    <TgsWebpanelVersion>5.9.0</TgsWebpanelVersion>
+    <TgsWebpanelVersion>6.1.0</TgsWebpanelVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index cdee07bb4a..9e19034512 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -29,13 +29,14 @@
     <Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsWebpanelVersion) --depth 1 ClientApp" />
     <RemoveDir Directories="ClientApp/.git" /> <!-- Allows git clean to clean it out -->
     <Message Text="Restoring yarn packages..." Importance="high" />
-    <Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) install --immutable" />
+    <Exec WorkingDirectory="ClientApp" Command="npx corepack enable" />
+    <Exec WorkingDirectory="ClientApp" Command="npx yarn install --immutable" />
     <Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
   </Target>
 
   <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/WebpanelVersion.props" Outputs="wwwroot\index.html">
     <Message Text="Building web control panel..." Importance="high" />
-    <Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) run msbuild" />
+    <Exec WorkingDirectory="ClientApp" Command="npx yarn run msbuild" />
   </Target>
 
   <Target Name="NpmClean" AfterTargets="Clean">