Skip to content

add matching Microsoft.Extensions dependency requirement per target net framework #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

add matching Microsoft.Extensions dependency requirement per target net framework #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99817c4
add matching Microsoft.Extensions dependency requirement per target .…
Havunen Oct 24, 2023
a54fe78
default Microsoft.Extensions.Logging to v7.0.0-*
Havunen Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ public bool IsEnabled(LogLevel logLevel)
return logLevel != LogLevel.None && _logger.IsEnabled(LevelConvert.ToSerilogLevel(logLevel));
}

public IDisposable BeginScope<TState>(TState state) where TState : notnull
public IDisposable BeginScope<TState>(TState state)
#if !NET6_0
where TState : notnull
#endif
{
return _provider.BeginScope(state);
}
Expand Down
14 changes: 12 additions & 2 deletions src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,19 @@
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Serilog" Version="2.12.0" />
<!-- The version of this reference must match the major and minor components of the package version prefix. -->
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(targetframework)' == 'net7.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-*" />
</ItemGroup>

<ItemGroup Condition="'$(targetframework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-*" />
</ItemGroup>

<ItemGroup Condition="'$(targetframework)' == 'netstandard2.1' or '$(targetframework)' == 'netstandard2.0' or '$(targetframework)' == 'net462'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-*" />
</ItemGroup>

</Project>