diff --git a/.gitmodules b/.gitmodules index 61f5de8..9891bea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "DTLib.Ben.Demystifier"] - path = DTLib.Ben.Demystifier - url = https://github.com/Timerix22/DTLib.Ben.Demystifier.git +[submodule "DTLib.Demystifier"] + path = DTLib.Demystifier + url = https://timerix.ddns.net:3322/Timerix/DTLib.Demystifier.git [submodule "DTLib.XXHash"] path = DTLib.XXHash - url = https://github.com/Timerix22/DTLib.XXHash.git + url = https://timerix.ddns.net:3322/Timerix/DTLib.XXHash.git diff --git a/DTLib.Ben.Demystifier b/DTLib.Ben.Demystifier deleted file mode 160000 index 59de4ea..0000000 --- a/DTLib.Ben.Demystifier +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 59de4eada9235dd50c1cb0021d0cb8bdcabdc611 diff --git a/DTLib.Demystifier b/DTLib.Demystifier new file mode 160000 index 0000000..b19c39b --- /dev/null +++ b/DTLib.Demystifier @@ -0,0 +1 @@ +Subproject commit b19c39b68463ae15c1f63051583da9f74d97baac diff --git a/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj b/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj index 1624d7f..d455681 100644 --- a/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj +++ b/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj @@ -6,8 +6,8 @@ Timerix DTLib logger wrapper with dependency injection GIT - https://github.com/Timerix22/DTLib - https://github.com/Timerix22/DTLib + https://timerix.ddns.net:3322/Timerix/DTLib + https://timerix.ddns.net:3322/Timerix/DTLib Release MIT diff --git a/DTLib.XXHash b/DTLib.XXHash index bcaa7a9..895d53d 160000 --- a/DTLib.XXHash +++ b/DTLib.XXHash @@ -1 +1 @@ -Subproject commit bcaa7a941104ce3f2bfa810b758d59728b77d4dd +Subproject commit 895d53d362c83b114c9ca06467d2e24d407190c3 diff --git a/DTLib.sln b/DTLib.sln index f3675f6..6ec6891 100644 --- a/DTLib.sln +++ b/DTLib.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTLib", "DTLib\DTLib.csproj", "{B620E5E9-800F-4B2D-B4A5-062E05DB704F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Ben.Demystifier", "DTLib.Ben.Demystifier\DTLib.Ben.Demystifier.csproj", "{AC7CB524-4D59-42E0-9F96-1C201A92494B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Demystifier", "DTLib.Demystifier\DTLib.Demystifier.csproj", "{AC7CB524-4D59-42E0-9F96-1C201A92494B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6308F24E-A4FF-46B3-B72F-30E05DDCB1D5}" ProjectSection(SolutionItems) = preProject diff --git a/DTLib/DTLib.csproj b/DTLib/DTLib.csproj index 8da2645..4c05b31 100644 --- a/DTLib/DTLib.csproj +++ b/DTLib/DTLib.csproj @@ -6,8 +6,8 @@ Timerix Library for all my C# projects GIT - https://github.com/Timerix22/DTLib - https://github.com/Timerix22/DTLib + https://timerix.ddns.net:3322/Timerix/DTLib + https://timerix.ddns.net:3322/Timerix/DTLib Release MIT @@ -28,9 +28,9 @@ - + - + diff --git a/DTLib/Dtsod/DtsodConverter.cs b/DTLib/Dtsod/DtsodConverter.cs index b29a23a..2bb6737 100644 --- a/DTLib/Dtsod/DtsodConverter.cs +++ b/DTLib/Dtsod/DtsodConverter.cs @@ -5,12 +5,7 @@ public static class DtsodConverter public static IDtsod ConvertVersion(IDtsod src, DtsodVersion targetVersion) => targetVersion switch { - DtsodVersion.V22 => throw new Exception("DtsodV22 is deprecated"), DtsodVersion.V23 => new DtsodV23(src.ToDictionary()), - // DtsodVersion.V24 => new DtsodV24(src.ToDictionary()), -#if DEBUG - //DtsodVersion.V30 => new DtsodV30(src.ToDictionary()), -#endif _ => throw new Exception($"DtsodConverter.Convert() error: unknown target version <{targetVersion}>"), }; diff --git a/DTLib/Dtsod/DtsodVersion.cs b/DTLib/Dtsod/DtsodVersion.cs index e7b0394..4258028 100644 --- a/DTLib/Dtsod/DtsodVersion.cs +++ b/DTLib/Dtsod/DtsodVersion.cs @@ -2,12 +2,5 @@ public enum DtsodVersion : byte { - V21 = 21, - V22 = 22, - V23 = 23, - V24 = 24, - V25, -#if DEBUG - V30 = 30 -#endif + V23 = 23 } diff --git a/DTLib/Filesystem/IOPath.cs b/DTLib/Filesystem/IOPath.cs index 6019b28..2769fd4 100644 --- a/DTLib/Filesystem/IOPath.cs +++ b/DTLib/Filesystem/IOPath.cs @@ -1,4 +1,4 @@ -#if NETSTANDARD2_1 +#if NETSTANDARD2_1 || NET6_0_OR_GREATER #define USE_SPAN #endif diff --git a/DTLib/Logging/LoggerExtensions.cs b/DTLib/Logging/LoggerExtensions.cs index a49e0af..8b10e11 100644 --- a/DTLib/Logging/LoggerExtensions.cs +++ b/DTLib/Logging/LoggerExtensions.cs @@ -1,4 +1,4 @@ -using DTLib.Ben.Demystifier; +using DTLib.Demystifier; namespace DTLib.Logging; @@ -22,7 +22,7 @@ public static class LoggerExtensions public static void LogWarn(this ILogger logger, string context, object message) => logger.Log(context, LogSeverity.Warn, message); - /// uses Ben.Demystifier to serialize exception + /// uses Demystifier to serialize exception [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void LogWarn(this ILogger logger, string context, Exception ex) => logger.Log(context, LogSeverity.Warn, ex.ToStringDemystified()); @@ -32,7 +32,7 @@ public static class LoggerExtensions => logger.Log(context, LogSeverity.Error, message); - /// uses Ben.Demystifier to serialize exception + /// uses Demystifier to serialize exception [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void LogError(this ILogger logger, string context, Exception ex) => logger.Log(context, LogSeverity.Error, ex.ToStringDemystified()); diff --git a/DTLib/Logging/Loggers/ContextLogger.cs b/DTLib/Logging/Loggers/ContextLogger.cs index c015626..13abf4b 100644 --- a/DTLib/Logging/Loggers/ContextLogger.cs +++ b/DTLib/Logging/Loggers/ContextLogger.cs @@ -34,7 +34,7 @@ public class ContextLogger : ILogger public void LogWarn(object message) => ParentLogger.LogWarn(Context, message); - /// uses Ben.Demystifier to serialize exception + /// uses Demystifier to serialize exception [MethodImpl(MethodImplOptions.AggressiveInlining)] public void LogWarn(Exception ex) => ParentLogger.LogWarn(Context, ex); @@ -43,7 +43,7 @@ public class ContextLogger : ILogger public void LogError(object message) => ParentLogger.LogError(Context, message); - /// uses Ben.Demystifier to serialize exception + /// uses Demystifier to serialize exception [MethodImpl(MethodImplOptions.AggressiveInlining)] public void LogError(Exception ex) => ParentLogger.LogError(Context, ex); diff --git a/pack.sh b/pack.sh index 26ac5a6..cf9d273 100755 --- a/pack.sh +++ b/pack.sh @@ -1,13 +1,13 @@ #!/usr/bin/bash -set -xe +set -eo pipefail if [[ -d nuget ]]; then + echo "archiving old ./nuget/ content" mkdir -p nuget_old TIMESTAMP=$(date +%Y.%m.%d_%H-%M-%S) mv nuget "nuget_$TIMESTAMP" tar cvf "nuget_old/nuget_$TIMESTAMP.tar" "nuget_$TIMESTAMP" rm -rf "nuget_$TIMESTAMP" - ls -lh nuget_old fi mkdir nuget @@ -21,10 +21,9 @@ function create_package() { cd .. } -set +x -create_package DTLib.Ben.Demystifier +echo "building packages" +create_package DTLib.Demystifier create_package DTLib.XXHash create_package DTLib create_package DTLib.Logging.Microsoft - -ls -lh nuget +ls -shk nuget