From df42595097b98fe618665d5a3fa7d73f22a424d2 Mon Sep 17 00:00:00 2001
From: Vitalii Fedorchenko <fedorchenko@gmail.com>
Date: Sun, 24 Dec 2023 11:28:07 +0200
Subject: [PATCH] Added net6 and net8 builds to reference appropriate
 Microsoft.Logging.Extensions versions + version 1.2.0 bump

---
 README.md                                     |  2 +-
 examples/TwoLogFilesMvc/TwoLogFilesMvc.csproj |  4 +--
 .../NReco.Logging.File.csproj                 | 33 ++++++++++++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 165f393..486aba2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # NReco.Logging.File
-Simple and efficient file logger provider for .NET Core (any version) / NET5 / NET6 without additional dependencies.
+Simple and efficient file logger provider for .NET Core (any version) / NET6 / NET8 without additional dependencies.
 
 NuGet | Tests
 --- | --- 
diff --git a/examples/TwoLogFilesMvc/TwoLogFilesMvc.csproj b/examples/TwoLogFilesMvc/TwoLogFilesMvc.csproj
index b2e8722..c0dfa97 100644
--- a/examples/TwoLogFilesMvc/TwoLogFilesMvc.csproj
+++ b/examples/TwoLogFilesMvc/TwoLogFilesMvc.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NReco.Logging.File" Version="1.1.6" />
+    <PackageReference Include="NReco.Logging.File" Version="1.2.0" />
   </ItemGroup>
 
   
diff --git a/src/NReco.Logging.File/NReco.Logging.File.csproj b/src/NReco.Logging.File/NReco.Logging.File.csproj
index c1c4e2a..e1326d4 100644
--- a/src/NReco.Logging.File/NReco.Logging.File.csproj
+++ b/src/NReco.Logging.File/NReco.Logging.File.csproj
@@ -1,22 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Lightweight file logging provider implementation for NET6+ / .NET Core without dependencies on logging frameworks.
+    <Description>Lightweight file logging provider implementation for NET6 / NET8+ / .NET Core without dependencies on logging frameworks.
 	
 How to use:
 
+using NReco.Logging.File;
+
 services.AddLogging(loggingBuilder => {
 	loggingBuilder.AddFile("app.log", append:true);
 });
 
 More details and examples: https://github.com/nreco/logging
 </Description>
-    <Title>NET6+ / .NET Core file logger provider.</Title>
+    <Title>NET8/ NET6 / .NET Core file logger provider.</Title>
 	<Copyright>Copyright (c) 2017-2023 Vitalii Fedorchenko and contributors</Copyright>
     <AssemblyTitle>NReco.Logging.File</AssemblyTitle>
-    <VersionPrefix>1.1.7</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <Authors>Vitalii Fedorchenko</Authors>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>NReco.Logging.File</AssemblyName>
     <PackageId>NReco.Logging.File</PackageId>
@@ -25,6 +27,9 @@ More details and examples: https://github.com/nreco/logging
     <PackageProjectUrl>https://github.com/nreco/logging</PackageProjectUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/nreco/logging/master/LICENSE</PackageLicenseUrl>
 	<PackageReleaseNotes>How to use: https://github.com/nreco/logging
+Version 1.2.0 changes:
+ - NReco's FileLoggerExtensions should NOT be in the Microsoft.Extensions.Logging namespace #61
+ - Added net6 and net8 builds to reference appropriate Microsoft.Logging.Extensions versions
 
 Version 1.1.7 changes:
  - bugfix: App deadlock on FileLoggerProvider.WriteEntry #57
@@ -73,10 +78,22 @@ Version 1.0.4 changes:
     <AssemblyOriginatorKeyFile>NReco.Logging.File.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="3.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.*" /> 
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.*" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.*" />  
   </ItemGroup>
     
 </Project>