From ea03818fe4583e204a17809f551441d2890e3a26 Mon Sep 17 00:00:00 2001
From: Timerix22 <timerix11@gmail.com>
Date: Sun, 7 Jan 2024 14:11:35 +0600
Subject: [PATCH] DTLib.Logging.Microsoft and dependency upgrade

---
 DTLib.Dtsod/DTLib.Dtsod.csproj                |  8 ++---
 .../DTLib.Logging.Microsoft.csproj            | 34 +++++++++++++++++++
 .../LoggerService.cs                          |  4 +--
 .../MyLoggerWrapper.cs                        |  9 +++--
 DTLib.Logging/DTLib.Logging.csproj            | 13 +++----
 DTLib.Network/DTLib.Network.csproj            | 14 ++------
 DTLib.Tests/DTLib.Tests.csproj                | 18 +++-------
 DTLib.sln                                     |  8 +++++
 DTLib/DTLib.csproj                            | 17 ++--------
 KerepWrapper/KerepWrapper.csproj              | 10 ++----
 10 files changed, 69 insertions(+), 66 deletions(-)
 create mode 100644 DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj
 rename {DTLib.Logging/DependencyInjection => DTLib.Logging.Microsoft}/LoggerService.cs (70%)
 rename {DTLib.Logging/DependencyInjection => DTLib.Logging.Microsoft}/MyLoggerWrapper.cs (87%)

diff --git a/DTLib.Dtsod/DTLib.Dtsod.csproj b/DTLib.Dtsod/DTLib.Dtsod.csproj
index 6e6ce3a..d653e7c 100644
--- a/DTLib.Dtsod/DTLib.Dtsod.csproj
+++ b/DTLib.Dtsod/DTLib.Dtsod.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Dtsod</PackageId>
-        <Version>1.3.2</Version>
+        <Version>1.3.3</Version>
         <Authors>Timerix</Authors>
         <Description>Definitely not json</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -20,10 +20,6 @@
     </PropertyGroup>
     
     <!--external dependencies-->
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-        <Reference Include="System.Dynamic" />
-        <Reference Include="Microsoft.CSharp" />
-    </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     </ItemGroup>
@@ -33,7 +29,7 @@
         <ProjectReference Include="..\DTLib\DTLib.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.3.2" />
+        <PackageReference Include="DTLib" Version="1.3.3" />
     </ItemGroup>
     
     <!--project files-->
diff --git a/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj b/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj
new file mode 100644
index 0000000..e394eaa
--- /dev/null
+++ b/DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <!--package info-->
+        <PackageId>DTLib.Logging.Microsoft</PackageId>
+        <Version>1.0.0</Version>
+        <Authors>Timerix</Authors>
+        <Description>DTLib logger wrapper with dependency injection</Description>
+        <RepositoryType>GIT</RepositoryType>
+        <RepositoryUrl>https://github.com/Timerix22/DTLib</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/Timerix22/DTLib</PackageProjectUrl>
+        <Configuration>Release</Configuration>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <!--compilation properties-->
+        <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <DebugType>embedded</DebugType>
+        <!--language features-->
+        <LangVersion>12</LangVersion>
+        <Nullable>disable</Nullable>
+        <ImplicitUsings>disable</ImplicitUsings>
+    </PropertyGroup>
+
+    <!--external dependencies-->
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    </ItemGroup>
+
+    <!--DTLib dependencies-->
+    <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+        <ProjectReference Include="..\DTLib.Logging\DTLib.Logging.csproj" />
+    </ItemGroup>
+    <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
+        <PackageReference Include="DTLib.Logging" Version="1.3.3" />
+    </ItemGroup>
+</Project>
diff --git a/DTLib.Logging/DependencyInjection/LoggerService.cs b/DTLib.Logging.Microsoft/LoggerService.cs
similarity index 70%
rename from DTLib.Logging/DependencyInjection/LoggerService.cs
rename to DTLib.Logging.Microsoft/LoggerService.cs
index a7bde81..dc5ee52 100644
--- a/DTLib.Logging/DependencyInjection/LoggerService.cs
+++ b/DTLib.Logging.Microsoft/LoggerService.cs
@@ -1,12 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace DTLib.Logging.DependencyInjection;
+namespace DTLib.Logging.Microsoft;
 
 public class LoggerService<TCaller> : ServiceDescriptor
 {
     // ReSharper disable once RedundantNameQualifier
     public LoggerService(DTLib.Logging.ILogger logger) : base( 
-        typeof(Microsoft.Extensions.Logging.ILogger<TCaller>), 
+        typeof(global::Microsoft.Extensions.Logging.ILogger<TCaller>), 
         new MyLoggerWrapper<TCaller>(logger))
     {
     }
diff --git a/DTLib.Logging/DependencyInjection/MyLoggerWrapper.cs b/DTLib.Logging.Microsoft/MyLoggerWrapper.cs
similarity index 87%
rename from DTLib.Logging/DependencyInjection/MyLoggerWrapper.cs
rename to DTLib.Logging.Microsoft/MyLoggerWrapper.cs
index d692882..69f7002 100644
--- a/DTLib.Logging/DependencyInjection/MyLoggerWrapper.cs
+++ b/DTLib.Logging.Microsoft/MyLoggerWrapper.cs
@@ -1,9 +1,12 @@
-using Microsoft.Extensions.Logging;
+
 // ReSharper disable RedundantNameQualifier
 
-namespace DTLib.Logging.DependencyInjection;
+using System;
+using Microsoft.Extensions.Logging;
 
-public class MyLoggerWrapper<TCaller> : Microsoft.Extensions.Logging.ILogger<TCaller>
+namespace DTLib.Logging.Microsoft;
+
+public class MyLoggerWrapper<TCaller> : global::Microsoft.Extensions.Logging.ILogger<TCaller>
 {
     public DTLib.Logging.ILogger Logger;
     public MyLoggerWrapper(DTLib.Logging.ILogger logger)=>
diff --git a/DTLib.Logging/DTLib.Logging.csproj b/DTLib.Logging/DTLib.Logging.csproj
index 7e02da7..bdf73a2 100644
--- a/DTLib.Logging/DTLib.Logging.csproj
+++ b/DTLib.Logging/DTLib.Logging.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Logging</PackageId>
-        <Version>1.3.2</Version>
+        <Version>1.3.3</Version>
         <Authors>Timerix</Authors>
         <Description>Loggers with dependency injection</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -14,23 +14,18 @@
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <DebugType>embedded</DebugType>
         <!--language features-->
-        <LangVersion>10</LangVersion>
+        <LangVersion>12</LangVersion>
         <Nullable>disable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
     </PropertyGroup>
 
-    <!--external dependencies-->
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    </ItemGroup>
-
     <!--DTLib dependencies-->
     <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
         <ProjectReference Include="..\DTLib\DTLib.csproj" />
         <ProjectReference Include="..\DTLib.Ben.Demystifier\DTLib.Ben.Demystifier.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.3.2" />
-        <PackageReference Include="DTLib.Ben.Demystifier" Version="1.0.5" />
+        <PackageReference Include="DTLib" Version="1.3.3" />
+        <PackageReference Include="DTLib.Ben.Demystifier" Version="1.0.6" />
     </ItemGroup>
 </Project>
diff --git a/DTLib.Network/DTLib.Network.csproj b/DTLib.Network/DTLib.Network.csproj
index 60cc7aa..dc99f4c 100644
--- a/DTLib.Network/DTLib.Network.csproj
+++ b/DTLib.Network/DTLib.Network.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Network</PackageId>
-        <Version>1.3.4</Version>
+        <Version>1.4.0</Version>
         <Authors>Timerix</Authors>
         <Description>Some sick network protocols</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -14,24 +14,16 @@
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <DebugType>embedded</DebugType>
         <!--language features-->
-        <LangVersion>10</LangVersion>
+        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
     </PropertyGroup>
 
-    <!--external dependencies-->
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-        <Reference Include="System.Net" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="Microsoft.CSharp" />
-    </ItemGroup>
-
     <!--DTLib dependencies-->
     <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <ProjectReference Include="..\DTLib\DTLib.csproj" />
         <ProjectReference Include="..\DTLib.Dtsod\DTLib.Dtsod.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib.Dtsod" Version="1.3.2" />
+        <PackageReference Include="DTLib.Dtsod" Version="1.3.3" />
     </ItemGroup>
 </Project>
diff --git a/DTLib.Tests/DTLib.Tests.csproj b/DTLib.Tests/DTLib.Tests.csproj
index 05fe2cc..01c0b51 100644
--- a/DTLib.Tests/DTLib.Tests.csproj
+++ b/DTLib.Tests/DTLib.Tests.csproj
@@ -5,19 +5,11 @@
 		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
 		<DebugType>embedded</DebugType>
 		<!--language features-->
-		<LangVersion>10</LangVersion>
+		<LangVersion>12</LangVersion>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
-
-	<!--external dependencies-->
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-		<Reference Include="System.Net" />
-		<Reference Include="System.Net.Http" />
-		<Reference Include="System.Dynamic" />
-		<Reference Include="Microsoft.CSharp" />
-	</ItemGroup>
 	
 	<!--DTLib dependencies-->
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -27,10 +19,10 @@
 		<ProjectReference Include="..\DTLib\DTLib.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-		<PackageReference Include="DTLib" Version="1.3.2" />
-		<PackageReference Include="DTLib.Dtsod" Version="1.3.2" />
-		<PackageReference Include="DTLib.Network" Version="1.3.4" />
-		<PackageReference Include="DTLib.Logging" Version="1.3.2" />
+		<PackageReference Include="DTLib" Version="1.3.3" />
+		<PackageReference Include="DTLib.Dtsod" Version="1.3.3" />
+		<PackageReference Include="DTLib.Network" Version="1.4.0" />
+		<PackageReference Include="DTLib.Logging" Version="1.3.3" />
 	</ItemGroup>
 
 	<!--project files-->
diff --git a/DTLib.sln b/DTLib.sln
index f97288e..f84486f 100644
--- a/DTLib.sln
+++ b/DTLib.sln
@@ -28,6 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KerepWrapper", "KerepWrapper\KerepWrapper.csproj", "{9ADC4AA1-1DE4-4BB6-AF38-E84C1A142032}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Logging.Microsoft", "DTLib.Logging.Microsoft\DTLib.Logging.Microsoft.csproj", "{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +77,12 @@ Global
 		{9ADC4AA1-1DE4-4BB6-AF38-E84C1A142032}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9ADC4AA1-1DE4-4BB6-AF38-E84C1A142032}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9ADC4AA1-1DE4-4BB6-AF38-E84C1A142032}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CCBAFA1-F191-4CEC-A4FA-CFF9F6CA081F}.Publish|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DTLib/DTLib.csproj b/DTLib/DTLib.csproj
index 1510977..fc4a005 100644
--- a/DTLib/DTLib.csproj
+++ b/DTLib/DTLib.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<!--package info-->
 		<PackageId>DTLib</PackageId>
-		<Version>1.3.2</Version>
+		<Version>1.3.3</Version>
 		<Authors>Timerix</Authors>
 		<Description>Library for all my C# projects</Description>
 		<RepositoryType>GIT</RepositoryType>
@@ -12,25 +12,15 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<!--compilation properties-->
 		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-		<!--Platforms>AnyCPU;x64;x86;arm64</Platforms-->
-		<!--Configurations>Debug;Release</Configurations-->
 		<DebugType>embedded</DebugType>
 		<!--language features-->
-		<LangVersion>10</LangVersion>
+		<LangVersion>12</LangVersion>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
-	<!--external dependencies-->
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-		<Reference Include="System.Net" />
-		<Reference Include="System.Net.Http" />
-		<Reference Include="System.Dynamic" />
-		<Reference Include="Microsoft.CSharp" />
-	</ItemGroup>
-
 	<!--project files-->
 	<ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
 	  	<Compile Remove="Experimental\**" />
@@ -38,7 +28,4 @@
 	<ItemGroup>
 		<Compile Remove="Experimental\ConsoleGUI\**" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Logging\" />
-	</ItemGroup>
 </Project>
diff --git a/KerepWrapper/KerepWrapper.csproj b/KerepWrapper/KerepWrapper.csproj
index 9dd9ed1..f01f08c 100644
--- a/KerepWrapper/KerepWrapper.csproj
+++ b/KerepWrapper/KerepWrapper.csproj
@@ -15,16 +15,12 @@
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <DebugType>embedded</DebugType>
         <!--language features-->
-        <LangVersion>10</LangVersion>
+        <LangVersion>12</LangVersion>
         <Nullable>disable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
     </PropertyGroup>
     
     <!--external dependencies-->
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-        <Reference Include="System.Dynamic" />
-        <Reference Include="Microsoft.CSharp" />
-    </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     </ItemGroup>
@@ -35,8 +31,8 @@
         <ProjectReference Include="..\DTLib.Dtsod\DTLib.Dtsod.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.3.2" />
-        <PackageReference Include="DTLib.Dtsod" Version="1.3.2" />
+        <PackageReference Include="DTLib" Version="1.3.3" />
+        <PackageReference Include="DTLib.Dtsod" Version="1.3.3" />
     </ItemGroup>
 
     <!--project files-->