From 9e62fc84150a8b0af845d627ad0b185bcd011796 Mon Sep 17 00:00:00 2001 From: Li Date: Fri, 11 Nov 2022 04:19:01 +1300 Subject: [PATCH] try nativeaot again --- .../HISPd/Properties/AssemblyInfo.cs | 4 +- .../Properties/PublishProfiles/Win64.pubxml | 7 +- .../HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/LibHISP.csproj | 6 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +- .../Properties/PublishProfiles/Win64.pubxml | 4 +- HorseIsleServer/LibHISP/Server/Logger.cs | 98 +++++++++---------- .../MPN00BS/Properties/AssemblyInfo.cs | 4 +- 8 files changed, 65 insertions(+), 64 deletions(-) diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 825b965..9a6fd7c 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.11.0")] -[assembly: AssemblyFileVersion("1.8.11.0")] +[assembly: AssemblyVersion("1.8.21.0")] +[assembly: AssemblyFileVersion("1.8.21.0")] diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml index f23270c..ce54285 100755 --- a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml @@ -11,9 +11,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net7.0 win-x64 True - True - True - True + + + true + OS_WINDOWS;ARCH_X86_64 \ No newline at end of file diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 388d99f..1656d9b 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.11 +Version: 1.8.21 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj index 0d9798f..00b6a80 100755 --- a/HorseIsleServer/LibHISP/LibHISP.csproj +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 4080660..fd10a38 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.11.0")] -[assembly: AssemblyFileVersion("1.8.11.0")] +[assembly: AssemblyVersion("1.8.21.0")] +[assembly: AssemblyFileVersion("1.8.21.0")] diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml index 98a5535..81c8445 100755 --- a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml @@ -12,8 +12,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. win-x64 True - True - True + + OS_WINDOWS;ARCH_X86_64 \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Server/Logger.cs b/HorseIsleServer/LibHISP/Server/Logger.cs index f173776..3fee678 100755 --- a/HorseIsleServer/LibHISP/Server/Logger.cs +++ b/HorseIsleServer/LibHISP/Server/Logger.cs @@ -1,50 +1,50 @@ -using System; - -namespace HISP.Server -{ - public class Logger - { - private static void defaultCallbackFunc(bool error, string type, string text) - { - return; - } - - private static Action logFunction = defaultCallbackFunc; - - - public static void SetCallback(Action callback) - { - logFunction = callback; - } - - public static void ErrorPrint(string text) - { - if (ConfigReader.LogLevel >= 1) - logFunction(true, "ERROR", text); - } - public static void WarnPrint(string text) - { - if (ConfigReader.LogLevel >= 2) - logFunction(false, "WARN", text); - } - public static void HackerPrint(string text) - { - if (ConfigReader.LogLevel >= 3) - logFunction(false, "HACK", text); - } - public static void InfoPrint(string text) - { - if (ConfigReader.LogLevel >= 4) - logFunction(false, "INFO", text); - } - public static void DebugPrint(string text) - { - if (ConfigReader.LogLevel >= 5) - logFunction(false, "DEBUG", text); +using System; + +namespace HISP.Server +{ + public class Logger + { + private static void defaultCallbackFunc(bool error, string type, string text) + { + return; } - public static void CrashPrint(string text) - { - logFunction(true, "CRASH", text); - } - } -} + + private static Action logFunction = defaultCallbackFunc; + + + public static void SetCallback(Action callback) + { + logFunction = callback; + } + + public static void ErrorPrint(string text) + { + if (ConfigReader.LogLevel >= 1) + logFunction(true, "ERROR", text); + } + public static void WarnPrint(string text) + { + if (ConfigReader.LogLevel >= 2) + logFunction(false, "WARN", text); + } + public static void HackerPrint(string text) + { + if (ConfigReader.LogLevel >= 3) + logFunction(false, "HACK", text); + } + public static void InfoPrint(string text) + { + if (ConfigReader.LogLevel >= 4) + logFunction(false, "INFO", text); + } + public static void DebugPrint(string text) + { + if (ConfigReader.LogLevel >= 5) + logFunction(false, "DEBUG", text); + } + public static void CrashPrint(string text) + { + logFunction(true, "CRASH", text); + } + } +} diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 1ba91df..feb1597 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.11.0")] -[assembly: AssemblyFileVersion("1.8.11.0")] +[assembly: AssemblyVersion("1.8.21.0")] +[assembly: AssemblyFileVersion("1.8.21.0")]