diff --git a/.gitignore b/.gitignore
index 9f25a9a..4f035f5 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-*bin/*
-*obj/*
-*.vs/*
-*GitCommit
+*/bin/*
+*/obj/*
+*/.vs/*
*.log
*.suo
+
HorseIsleServer/N00BS/obj/*
HorseIsleServer/N00BS/bin/*
@@ -13,5 +13,6 @@ HorseIsleServer/HISP/bin/*
HorseIsleServer/LibHISP/obj/*
HorseIsleServer/LibHISP/bin/*
+HorseIsleServer/LibHISP/Resources/Versioning/*
HorseIsleServer/.vs/*
\ No newline at end of file
diff --git a/HorseIsleServer/LibHISP/LibHISP - Backup.csproj b/HorseIsleServer/LibHISP/LibHISP - Backup.csproj
new file mode 100644
index 0000000..104a92e
--- /dev/null
+++ b/HorseIsleServer/LibHISP/LibHISP - Backup.csproj
@@ -0,0 +1,233 @@
+
+
+ Library
+ HISP
+ 10.0
+ x64;x86;ARM;ARM64;AnyCPU
+ Debug;Windows;Linux;MacOS
+
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+ PreserveNewest
+ gamedata.json
+
+
+
+
+ PreserveNewest
+ HI1.MAP
+
+
+
+
+
+
+
+
+
+ PublicResXFileCodeGenerator
+
+
+
+ false
+ false
+
+
+ net6.0
+ false
+ true
+ OnBuildSuccess
+ embedded
+ False
+ none
+ False
+ Public Domain, 2022
+ https://islehorse.com
+ https://github.com/islehorse/HISP
+ git
+
+
+
+ win-x86
+ true
+ x86
+ OS_WINDOWS;ARCH_X86
+ 3
+ 1701;1702;2026
+
+
+ win-x64
+ true
+ x64
+ OS_WINDOWS;ARCH_X86_64
+ 3
+ 1701;1702;2026
+
+
+ win-arm
+ true
+ ARM32
+ OS_WINDOWS;ARCH_ARM
+ 3
+ 1701;1702;2026
+
+
+ win-arm64
+ true
+ ARM64
+ OS_WINDOWS;ARCH_ARM64
+ 3
+ 1701;1702;2026
+
+
+
+
+ linux-x64
+ true
+ x64
+ OS_LINUX;ARCH_X86_64
+ 3
+ 1701;1702;2026
+
+
+ linux-arm
+ ARM
+ true
+ OS_LINUX;ARCH_ARM
+ 3
+ 1701;1702;2026
+
+
+ linux-arm64
+ ARM64
+ true
+ OS_LINUX;ARCH_ARM64
+ 3
+ 1701;1702;2026
+
+
+
+ osx-x64
+ true
+ x64
+ OS_MACOS;ARCH_X86_64
+ 3
+ 1701;1702;2026
+
+
+ osx-arm64
+ true
+ OS_MACOS;ARCH_ARM64
+ 3
+ 1701;1702;2026
+
+
+
+
+ net6.0
+ win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64
+ True
+ OS_ALL;ARCH_ANYCPU
+
+
+
+
+ ARM32
+ False
+ DEBUG;TRACE;OS_DEBUG;ARCH_ARM
+ 3
+ 1701;1702;2026
+
+
+
+
+ ARM64
+ False
+ DEBUG;TRACE;OS_DEBUG;ARCH_ARM64
+ 3
+ 1701;1702;2026
+
+
+
+
+ False
+ DEBUG;TRACE;OS_DEBUG;ARCH_X86_64
+ 3
+ 1701;1702;2026
+
+
+
+
+ False
+ DEBUG;TRACE;OS_DEBUG;ARCH_X86
+ 3
+ 1701;1702;2026
+
+
+
+
+ True
+ OS_MACOS;ARCH_X86
+ 3
+ 1701;1702;2026
+
+
+
+
+ True
+ OS_LINUX;ARCH_X86
+ 3
+ 1701;1702;2026
+
+
+
+
+ False
+ OS_LINUX;ARCH_ANYCPU
+ 3
+ 1701;1702;2026
+
+
+
+
+ False
+ OS_WINDOWS;ARCH_ANYCPU
+ 3
+ 1701;1702;2026
+
+
+
+
+ False
+ OS_MACOS;ARCH_ANYCPU
+ 3
+ 1701;1702;2026
+
+
+
+
+ True
+ OS_MACOS;ARCH_ARM
+ 3
+ 1701;1702;2026
+
+
+
+
+ 3
+ 1701;1702;2026
+ False
+
+
+
+
+
+
+
diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj
index 3188731..5ed15f0 100644
--- a/HorseIsleServer/LibHISP/LibHISP.csproj
+++ b/HorseIsleServer/LibHISP/LibHISP.csproj
@@ -30,6 +30,11 @@
+
+
+ PublicResXFileCodeGenerator
+
+
false
false
@@ -223,6 +228,6 @@
-
+
diff --git a/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs b/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs
index aecea91..34853c1 100644
--- a/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs
+++ b/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs
@@ -114,5 +114,34 @@ namespace HISP.Properties {
}
}
+ internal static string GitTag
+ {
+ get
+ {
+ return ResourceManager.GetString("GitTag", resourceCulture);
+ }
+ }
+ internal static string GitBranch
+ {
+ get
+ {
+ return ResourceManager.GetString("GitBranch", resourceCulture);
+ }
+ }
+ internal static string BuildDate
+ {
+ get
+ {
+ return ResourceManager.GetString("BuildDate", resourceCulture);
+ }
+ }
+ internal static string BuildTime
+ {
+ get
+ {
+ return ResourceManager.GetString("BuildTime", resourceCulture);
+ }
+ }
+
}
}
diff --git a/HorseIsleServer/LibHISP/Properties/Resources.resx b/HorseIsleServer/LibHISP/Properties/Resources.resx
index 7b5bcd9..16a3a68 100644
--- a/HorseIsleServer/LibHISP/Properties/Resources.resx
+++ b/HorseIsleServer/LibHISP/Properties/Resources.resx
@@ -125,6 +125,19 @@
..\Resources\server.properties;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
- ..\Resources\GitCommit;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+ ..\Resources\Versioning\GitCommit;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+ ..\Resources\Versioning\GitTag;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\Resources\Versioning\GitBranch;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\Resources\Versioning\BuildDate;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
+ ..\Resources\Versioning\BuildTime;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+
\ No newline at end of file
diff --git a/HorseIsleServer/LibHISP/Server/ServerVersion.cs b/HorseIsleServer/LibHISP/Server/ServerVersion.cs
index 665ce35..4b78225 100644
--- a/HorseIsleServer/LibHISP/Server/ServerVersion.cs
+++ b/HorseIsleServer/LibHISP/Server/ServerVersion.cs
@@ -4,8 +4,7 @@ namespace HISP.Server
{
public class ServerVersion
{
- public static int MAJOR = 1;
- public static int MINOR = 3;
+
public static string PRODUCT = "HISP";
public static string GetArchitecture()
@@ -41,7 +40,19 @@ namespace HISP.Server
}
public static string GetVersionString()
{
- return "v" + MAJOR.ToString() + "." + MINOR.ToString();
+ return Resources.GitTag;
+ }
+ public static string GetBranch()
+ {
+ return Resources.GitBranch;
+ }
+ public static string GetBuildDate()
+ {
+ return Resources.BuildDate.Replace("\r", "").Replace("\n", ""); ;
+ }
+ public static string GetBuildTime()
+ {
+ return Resources.BuildTime.Replace("\r", "").Replace("\n", "");
}
public static string GetCommitHash(int TotalBytes)
{
@@ -49,7 +60,7 @@ namespace HISP.Server
}
public static string GetBuildString()
{
- return PRODUCT + " " + GetVersionString() + " @" + GetCommitHash(7) + "; (" + GetArchitecture() + "; " + GetPlatform() + ")";
+ return PRODUCT + " " + GetVersionString() + " `" + GetBranch() + "@" + GetCommitHash(7) + "`; (" + GetArchitecture() + "; " + GetPlatform() + "); Built @ " + GetBuildDate() + " at " + GetBuildTime();
}
}
}