Skip to content

Commit 2ddbeaf

Browse files
authored
feat!: .NET 10 Support, dropped .NET 6 (#205)
1 parent ee75e83 commit 2ddbeaf

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

Directory.Build.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project>
22
<PropertyGroup>
3-
<ProjectTargetFrameworks>net6.0;net8.0;net9.0;netstandard2.0</ProjectTargetFrameworks>
4-
<TestTargetFrameworks>net6.0;net8.0;net9.0</TestTargetFrameworks>
5-
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
3+
<ProjectTargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</ProjectTargetFrameworks>
4+
<TestTargetFrameworks>net6.0;net8.0;net9.0;net10.0</TestTargetFrameworks>
65
<CopyrightYearStart>2024</CopyrightYearStart>
6+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
7+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
78
</PropertyGroup>
89
<PropertyGroup>
910
<!-- Workaround, until https://github.com/GitTools/GitVersion/pull/4206 is released -->
10-
<GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
11+
<GitVersionTargetFramework>net10.0</GitVersionTargetFramework>
1112
</PropertyGroup>
1213
</Project>

src/NetEvolve.Logging.Abstractions/NullExternalScopeProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ private NullExternalScopeProvider() { }
2121
public void ForEachScope<TState>(Action<object?, TState> callback, TState state) { }
2222

2323
/// <inheritdoc cref="IExternalScopeProvider.Push(object?)" />
24-
public IDisposable Push(object? state) => NullScope.Instance;
24+
public IDisposable Push(object? state) => new NullScope();
2525
}

src/NetEvolve.Logging.Abstractions/NullScope.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public sealed class NullScope : IDisposable
1414
/// </summary>
1515
public static IDisposable Instance => _instance.Value;
1616

17-
private NullScope() { }
17+
internal NullScope() { }
1818

1919
/// <inheritdoc cref="IDisposable.Dispose" />
2020
public void Dispose() { }

0 commit comments

Comments
 (0)