Server build version

Zheneq · Aug 14, 2024 · 2e709ab · 2e709ab
1 parent 098a50d
commit 2e709ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/Assembly-CSharp/BuildVersion.cs b/Assembly-CSharp/BuildVersion.cs
@@ -16,12 +16,18 @@ public static class BuildVersion
 	public const string s_version =
 		ThisAssembly.Git.BaseVersion.Major + "." + 
 		ThisAssembly.Git.BaseVersion.Minor + 
-		(ThisAssembly.Git.BaseVersion.Patch != "0" ? "." + ThisAssembly.Git.BaseVersion.Patch : "") +
-		(ThisAssembly.Git.SemVer.DashLabel != "-client" ? ThisAssembly.Git.SemVer.DashLabel : ""
+#if SERVER
+		(ThisAssembly.Git.BaseVersion.Patch != "0" || ThisAssembly.Git.Commits != "0" ? "." + ThisAssembly.Git.BaseVersion.Patch : "") +
+		(ThisAssembly.Git.Commits != "0" ? "." + ThisAssembly.Git.Commits : "") +
+		ThisAssembly.Git.SemVer.DashLabel
+#else
+		(ThisAssembly.Git.SemVer.Patch != "0" ? "." + ThisAssembly.Git.SemVer.Patch : "") +
+		(ThisAssembly.Git.SemVer.DashLabel != "-client" ? ThisAssembly.Git.SemVer.DashLabel : "")
+#endif
 #if VANILLA
 		+ "-vanilla"
 #endif
-		);
+		;
 
 	public static int ReleaseNumber => s_releaseNumber;
 	public static int BuildNumber => s_buildNumber;

diff --git a/Assembly-CSharp/Properties/AssemblyInfo.cs b/Assembly-CSharp/Properties/AssemblyInfo.cs
@@ -12,16 +12,28 @@
 [assembly: AssemblyVersion (
     ThisAssembly.Git.BaseVersion.Major + "." +
     ThisAssembly.Git.BaseVersion.Minor + "." +
+#if SERVER
     ThisAssembly.Git.BaseVersion.Patch + "." +
     ThisAssembly.Git.Commits
+#else
+    ThisAssembly.Git.SemVer.Patch
+#endif
     )]
 
+#if SERVER
 [assembly: AssemblyFileVersion (
     ThisAssembly.Git.BaseVersion.Major + "." +
     ThisAssembly.Git.BaseVersion.Minor + "." +
     ThisAssembly.Git.BaseVersion.Patch + "." +
     ThisAssembly.Git.Commits
+)]
+#else
+[assembly: AssemblyFileVersion (
+    ThisAssembly.Git.BaseVersion.Major + "." +
+    ThisAssembly.Git.BaseVersion.Minor + "." +
+    ThisAssembly.Git.SemVer.Patch
     )]
+#endif
 
 [assembly: AssemblyInformationalVersion (BuildVersion.s_version)]