Merge branch 'master' into dev

tgstation · Dec 19, 2024 · df7ec6e · df7ec6e
2 parents 6eabc1e + 99a9465
commit df7ec6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build/Version.props b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.12.0</TgsCoreVersion>
+    <TgsCoreVersion>6.12.1</TgsCoreVersion>
     <TgsConfigVersion>5.4.0</TgsConfigVersion>
     <TgsRestVersion>10.12.0</TgsRestVersion>
     <TgsGraphQLVersion>0.5.0</TgsGraphQLVersion>

diff --git a/build/package/nix/package.nix b/build/package/nix/package.nix
@@ -29,10 +29,11 @@ let
       xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion ./Version.props > $out/tgs_version.txt
     '';
   };
+  version = (builtins.readFile "${versionParse}/tgs_version.txt");
 
   fixedOutput = stdenv.mkDerivation {
     pname = "tgstation-server-release-server-console-zip";
-    version = (builtins.readFile "${versionParse}/tgs_version.txt");
+    inherit version;
 
     meta = with pkgs.lib; {
       description = "Host watchdog binaries for tgstation-server";
@@ -99,7 +100,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     unzip "${fixedOutput}/ServerConsole.zip" -d $out/bin
     rm -rf $out/bin/lib
-    makeWrapper ${pkgs.dotnetCorePackages.sdk_8_0}/dotnet $out/bin/tgstation-server --suffix PATH : ${
+    makeWrapper ${pkgs.dotnetCorePackages.sdk_8_0}/bin/dotnet $out/bin/tgstation-server --suffix PATH : ${
       lib.makeBinPath (
         with pkgs;
         [