From 2d7ceb8b12b72d2b16189c41b099488d8ca15f6a Mon Sep 17 00:00:00 2001 From: Bluzume <39113159+KuromeSan@users.noreply.github.com> Date: Tue, 26 Oct 2021 06:39:24 -0400 Subject: [PATCH] Update to NET6.0 --- .github/workflows/linux.yml | 30 +++---- .github/workflows/macos.yml | 20 ++--- .github/workflows/windows.yml | 32 +++---- .../HorseIsleServer/HorseIsleServer.csproj | 83 +++++++++++++++---- .../Properties/PublishProfiles/Linux64.pubxml | 4 +- .../PublishProfiles/LinuxARM.pubxml | 4 +- .../PublishProfiles/LinuxARM64.pubxml | 4 +- .../Properties/PublishProfiles/Osx64.pubxml | 4 +- .../PublishProfiles/OsxARM64.pubxml | 4 +- .../Properties/PublishProfiles/Win32.pubxml | 6 +- .../Properties/PublishProfiles/Win64.pubxml | 4 +- .../Properties/PublishProfiles/WinARM.pubxml | 6 +- .../PublishProfiles/WinARM64.pubxml | 4 +- .../HorseIsleServer/Server/ServerVersion.cs | 10 ++- 14 files changed, 136 insertions(+), 79 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8e9d9fa..b568acc 100755 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,43 +32,43 @@ jobs: continue-on-error: false run: | dotnet publish -p:PublishProfile=Linux64.pubxml - cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/" - cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/" - mkdir "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www" - cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www" + cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/" + cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/" + mkdir "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www" + cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www" - name: Build linux-arm continue-on-error: false run: | dotnet publish -p:PublishProfile=LinuxARM.pubxml - cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/" - cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/" - mkdir "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www" - cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www" + cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/" + cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/" + mkdir "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www" + cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www" - name: Build linux-arm64 continue-on-error: false run: | dotnet publish -p:PublishProfile=LinuxARM64.pubxml - cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/" - cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/" - mkdir "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/" - cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/" + cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/" + cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/" + mkdir "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/" + cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/" - name: upload linux-64 uses: actions/upload-artifact@v2 with: name: linux-x64 - path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/ + path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/ - name: upload linux-arm uses: actions/upload-artifact@v2 with: name: linux-arm - path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/ + path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/ - name: upload linux-arm64 uses: actions/upload-artifact@v2 with: name: linux-arm64 - path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/ + path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6046487..0561f87 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -32,28 +32,28 @@ jobs: continue-on-error: false run: | dotnet publish -p:PublishProfile=Osx64.pubxml - cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/" - cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/" - mkdir "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www" - cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www" + cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/" + cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/" + mkdir "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www" + cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www" - name: Build mac-arm64 continue-on-error: false run: | dotnet publish -p:PublishProfile=OsxARM64.pubxml - cp ../HorseIsleData/*.json "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/" - cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/" - mkdir "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www" - cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/www" + cp ../HorseIsleData/*.json "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/" + cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/" + mkdir "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/www" + cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/www" - name: upload mac-x64 uses: actions/upload-artifact@v2 with: name: mac-x64 - path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/ + path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/ - name: upload mac-arm64 uses: actions/upload-artifact@v2 with: name: mac-arm64 - path: HorseIsleServer/HorseIsleServer/bin/arm64/MacOS/net5.0/osx-arm64/publish/ + path: HorseIsleServer/HorseIsleServer/bin/arm64/MacOS/net6.0/osx-arm64/publish/ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c5af65e..680a9a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,50 +32,50 @@ jobs: continue-on-error: false run: | dotnet publish -p:PublishProfile=Win64.pubxml - copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\gamedata.json" - copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\HI1.MAP" - copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" -Recurse + copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\gamedata.json" + copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\HI1.MAP" + copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\www" -Recurse - name: Build win-x86 continue-on-error: false run: | dotnet publish -p:PublishProfile=Win32.pubxml - copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\gamedata.json" - copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\HI1.MAP" - copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" -Recurse + copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\gamedata.json" + copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\HI1.MAP" + copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\www" -Recurse - name: Build win-arm continue-on-error: false run: | dotnet publish -p:PublishProfile=WinARM.pubxml - copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\gamedata.json" - copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\HI1.MAP" - copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\www" -Recurse + copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\gamedata.json" + copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\HI1.MAP" + copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\www" -Recurse - name: Build win-arm64 continue-on-error: false run: | dotnet publish -p:PublishProfile=WinARM64.pubxml - copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\gamedata.json" - copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\HI1.MAP" - copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\www" -Recurse + copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\gamedata.json" + copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\HI1.MAP" + copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\www" -Recurse - name: Upload win-x64 uses: actions/upload-artifact@v2 with: name: win-x64 - path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net5.0\win-x64\publish\ + path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net6.0\win-x64\publish\ - name: Upload win-x86 uses: actions/upload-artifact@v2 with: name: win-x86 - path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\ + path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\ - name: Upload win-arm uses: actions/upload-artifact@v2 with: name: win-arm - path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\ + path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\ - name: Upload win-arm64 uses: actions/upload-artifact@v2 with: name: win-arm64 - path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net5.0\windows-arm64\publish\ + path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\ diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj index f6cf7bc..d812e63 100644 --- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj +++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj @@ -4,16 +4,7 @@ HISP 10.0 x64;x86;ARM;ARM64;AnyCPU - ;Debug;Windows;Linux;MacOS - - $(DefineConstants);ARCH_x86 - $(DefineConstants);ARCH_x86_64 - $(DefineConstants);ARCH_ARM - $(DefineConstants);ARCH_ARM64 - $(DefineConstants);OS_LINUX - $(DefineConstants);OS_MACOS - $(DefineConstants);OS_WINDOWS - $(DefineConstants);DEBUG;TRACE + Debug;Windows;Linux;MacOS @@ -44,33 +35,38 @@ true - net5.0 + net6.0 false true icon.ico HISP.Program OnBuildSuccess + embedded win-x86 true x86 + OS_WINDOWS;ARCH_X86 win-x64 true x64 + OS_WINDOWS;ARCH_X86_64 win-arm true ARM32 + OS_WINDOWS;ARCH_ARM win-arm64 true ARM64 + OS_WINDOWS;ARCH_ARM64 @@ -78,44 +74,101 @@ linux-x64 true x64 + OS_LINUX;ARCH_X86_64 linux-arm ARM true + OS_LINUX;ARCH_ARM linux-arm64 ARM64 true + OS_LINUX;ARCH_ARM64 osx-x64 true - x64 + x64 + OS_MACOS;ARCH_X86_64 osx-arm64 true - ARM64 + OS_MACOS;ARCH_ARM64 - net5.0 + net6.0 win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 - true + True + OS_ALL;ARCH_ANYCPU ARM32 + False + DEBUG;TRACE;OS_DEBUG;ARCH_ARM ARM64 + False + DEBUG;TRACE;OS_DEBUG;ARCH_ARM64 + + + + + False + DEBUG;TRACE;OS_DEBUG;ARCH_X86_64 + + + + + False + DEBUG;TRACE;OS_DEBUG;ARCH_X86 + + + + + True + OS_MACOS;ARCH_X86 + + + + + True + OS_LINUX;ARCH_X86 + + + + + True + OS_LINUX;ARCH_ANYCPU + + + + + True + OS_WINDOWS;ARCH_ANYCPU + + + + + True + OS_MACOS;ARCH_ANYCPU + + + + + True + OS_MACOS;ARCH_ARM diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml index 471f4a8..80a3911 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux x64 - bin\x64\Linux\net5.0\linux-x64\publish\ + bin\x64\Linux\net6.0\linux-x64\publish\ FileSystem - net5.0 + net6.0 linux-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml index db4d3fc..011adfe 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux ARM - bin\ARM\Linux\net5.0\linux-arm\publish\ + bin\ARM\Linux\net6.0\linux-arm\publish\ FileSystem - net5.0 + net6.0 linux-arm True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml index 1bedc71..d88a07e 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux ARM64 - bin\ARM64\Linux\net5.0\linux-arm64\publish\ + bin\ARM64\Linux\net6.0\linux-arm64\publish\ FileSystem - net5.0 + net6.0 linux-arm64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml index 7080eec..7c47855 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. MacOS x64 - bin\x64\MacOS\net5.0\osx-x64\publish\ + bin\x64\MacOS\net6.0\osx-x64\publish\ FileSystem - net5.0 + net6.0 osx-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml index 31e2553..47b2efd 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. MacOS ARM64 - bin\arm64\MacOS\net5.0\osx-arm64\publish\ + bin\arm64\MacOS\net6.0\osx-arm64\publish\ FileSystem - net5.0 + net6.0 osx-arm64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml index 59f878e..9b560f5 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml @@ -6,11 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x86 - bin\x86\Windows\net5.0\win-x86\publish\ + bin\x86\Windows\net6.0\win-x86\publish\ FileSystem - net5.0 + net6.0 win-x86 - true + True True True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml index 14e7809..b07a2d3 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x64 - bin\x64\Windows\net5.0\win-x64\publish\ + bin\x64\Windows\net6.0\win-x64\publish\ FileSystem - net5.0 + net6.0 win-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml index 8992c0e..05b3c8a 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml @@ -6,11 +6,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows ARM - bin\arm\Windows\net5.0\windows-arm\publish\ + bin\arm\Windows\net6.0\windows-arm\publish\ FileSystem - net5.0 + net6.0 win-arm - true + True True True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml index bd5dca7..545cf1c 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows ARM64 - bin\arm64\Windows\net5.0\windows-arm64\publish\ + bin\arm64\Windows\net6.0\windows-arm64\publish\ FileSystem - net5.0 + net6.0 win-arm64 True True diff --git a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs b/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs index 9c7bd80..f2d5cf5 100644 --- a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs +++ b/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs @@ -15,7 +15,9 @@ namespace HISP.Server public static string GetArchitecture() { -#if ARCH_X86_64 +#if ARCH_ANYCPU + return "ANYCPU"; +#elif ARCH_X86_64 return "x86_64"; #elif ARCH_X86 return "x86"; @@ -29,7 +31,9 @@ namespace HISP.Server } public static string GetPlatform() { -#if OS_WINDOWS +#if OS_DEBUG + return "DEBUG"; +#elif OS_WINDOWS return "WINDOWS"; #elif OS_LINUX return "LINUX"; @@ -50,7 +54,7 @@ namespace HISP.Server } public static string GetBuildString() { - return PRODUCT + " " + GetVersionString() + " " + GetCommitHash(4) + "; (" + GetArchitecture() + "; " + GetPlatform() + ")"; + return PRODUCT + " " + GetVersionString() + " @" + GetCommitHash(4) + "; (" + GetArchitecture() + "; " + GetPlatform() + ")"; } } }