Skip to content

8.0.0 Release #235

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

Merged
merged 10 commits into from
Nov 14, 2023
Merged

8.0.0 Release #235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5458567
Capture trace and span ids for Serilog 3.1
nblumhardt Oct 3, 2023
6585051
Force W3C activity ids on .NET 4.x
nblumhardt Oct 3, 2023
3f1ccda
Unmatched apostrophe :-)
nblumhardt Oct 3, 2023
1530e04
Merge pull request #227 from nblumhardt/sp-tr
nblumhardt Oct 3, 2023
24d8583
Bump version to 7.0.1; forgot earlier that the versioning policy only…
nblumhardt Oct 10, 2023
6e71b33
Update to .NET 8 RC2
nblumhardt Oct 14, 2023
80064f8
Set SDK path from build script
nblumhardt Oct 16, 2023
fe4afd2
Merge pull request #228 from nblumhardt/net-80-rc2
nblumhardt Oct 23, 2023
1fa32a5
Update to .NET 8 RTM and Serilog 3.1.1
nblumhardt Nov 14, 2023
26c840d
Merge pull request #234 from nblumhardt/dotnet-8
nblumhardt Nov 14, 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
Prev Previous commit
Next Next commit
Force W3C activity ids on .NET 4.x
  • Loading branch information
@nblumhardt
nblumhardt committed Oct 3, 2023
commit 6585051952c81b1df07af0c867d112ac0c4b53ba
2 changes: 1 addition & 1 deletion test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
</ItemGroup>

Expand Down
6 changes: 5 additions & 1 deletion test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<TargetFrameworks>net7.0;net472</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework) == 'net472' ">
<DefineConstants>$(DefineConstants);FORCE_W3C_ACTIVITY_ID</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
Expand All @@ -12,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
</ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void LogsCorrectMessage()

Assert.Equal(3, sink.Writes.Count);

Assert.Equal(1, sink.Writes[0].Properties.Count);
Assert.Single(sink.Writes[0].Properties);
Assert.Empty(sink.Writes[0].RenderMessage());

Assert.Equal(2, sink.Writes[1].Properties.Count);
Expand Down Expand Up @@ -501,6 +501,11 @@ public void Emit(LogEvent logEvent)
[Fact]
public void TraceAndSpanIdsAreCaptured()
{
#if FORCE_W3C_ACTIVITY_ID
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
Activity.ForceDefaultIdFormat = true;
#endif

using var listener = new ActivityListener();
listener.ShouldListenTo = _ => true;
listener.Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData;
Expand Down