doc: Update rholek credits and support net7 & net481

huorswords · Oct 16, 2023 · b4ce92a · b4ce92a
1 parent 0dca2c0
commit b4ce92a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -178,3 +178,4 @@ Thank you very much to all contributors & users by its collaboration, and specia
 * [@willwolfram18](https://github.com/willwolfram18) by bugfixing `Log4NetScopeFactory` usage when provided in `Log4NetProviderOptions`.
 * [@lscorcia](https://github.com/lscorcia) by the fix of incorrect call stack when logging.
 * [@JustusGreiberORGADATA](https://github.com/JustusGreiberORGADATA) by the inclusion of a configurable logging event factory, and `IExternalScope` provider implementation.
+* [@Radim Holek](https://github.com/rholek) for enabling `ValueTuple` mapping in scopes.
diff --git a/deploy/main.yml b/deploy/main.yml
@@ -38,6 +38,11 @@ steps:
     inputs:
       version: 6.0.x
 
+  - task: UseDotNet@2
+    displayName: "Use .NET Core sdk 7.0.x"
+    inputs:
+      version: 7.0.x
+
   - task: DownloadSecureFile@1
     name: snkFile # The name with which to reference the secure file's path on the agent, like $(snkFile.secureFilePath)
     inputs:

diff --git a/...ensions.Logging.Log4Net.AspNetCore/Microsoft.Extensions.Logging.Log4Net.AspNetCore.csproj b/...ensions.Logging.Log4Net.AspNetCore/Microsoft.Extensions.Logging.Log4Net.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -71,8 +71,14 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="log4net" Version="2.0.13" />
+		<PackageReference Include="log4net" Version="2.0.15" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\..\LICENSE">

diff --git a/tests/Unit.Tests/Unit.Tests.csproj b/tests/Unit.Tests/Unit.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <!--
+		<!--
       We can't target/test .NET Standard here because xUnit does not support it.
       But netcoreapp3.1 and net461 and higher implement all .NET Standard versions we support.
       See: https://xunit.net/docs/why-no-netstandard
       See: https://docs.microsoft.com/en-us/dotnet/standard/net-standard
     -->
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net461;net462;net47;net471;net472;net48</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net462;net47;net471;net472;net48;net481</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<SignAssembly>false</SignAssembly>
 		<AssemblyOriginatorKeyFile>Microsoft.Extensions.Logging.Log4Net.AspNetCoreKey.snk</AssemblyOriginatorKeyFile>
@@ -47,34 +47,34 @@
 		</Content>
 	</ItemGroup>
 
-  <!-- .NET Framework versions contain no dot in the TFM. -->
-  <ItemGroup Condition="!'$(TargetFramework.Contains(`.`))'">
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
-  </ItemGroup>
+	<!-- .NET Framework versions contain no dot in the TFM. -->
+	<ItemGroup Condition="!'$(TargetFramework.Contains(`.`))'">
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.Contains(`.`))'">
-    <!--
+	<ItemGroup Condition="'$(TargetFramework.Contains(`.`))'">
+		<!--
       This will cause Microsoft.Extensions.Hosting to be loaded from the shared framework,
       which is used starting with ASP.NET Core 3.1.
       This is probably the best version to test against because it is likely used by the most amount of people.
     -->
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-  
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+
 	<ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="xunit" Version="2.5.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-		<PackageReference Include="FluentAssertions" Version="6.2.0" />
-		<PackageReference Include="Moq" Version="4.16.1" />
-		<PackageReference Include="coverlet.msbuild" Version="3.1.0">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="coverlet.msbuild" Version="6.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>