Skip to content

Bump Serilog to 3.1.1 #26

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
sungam3r merged 5 commits into from
Jan 22, 2024
Merged

Bump Serilog to 3.1.1 #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6aaa4e
Bump Serilog to 3.1.1
sungam3r Jan 20, 2024
bbe0007
add missed notice
sungam3r Jan 21, 2024
21701ed
1
sungam3r Jan 21, 2024
901a5bc
1
sungam3r Jan 22, 2024
6a5de60
Merge branch 'master' into v3
sungam3r Jan 22, 2024
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
2 changes: 1 addition & 1 deletion src/Destructurama.JsonNet.Tests/Approval/ApiApprovalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ApiApprovalTests
/// <summary>Check for changes to the public APIs.</summary>
/// <param name="type">The type used as a marker for the assembly whose public API change you want to check.</param>
[Theory]
[InlineData(typeof(LoggerConfigurationAppSettingsExtensions))]
[InlineData(typeof(LoggerConfigurationJsonNetExtensions))]
public void PublicApi_Should_Not_Change_Unintentionally(Type type)
{
string publicApi = type.Assembly.GeneratePublicApi(new()
Expand Down
2 changes: 1 addition & 1 deletion src/Destructurama.JsonNet.Tests/Approval/Destructurama.JsonNet.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Destructurama
{
public static class LoggerConfigurationAppSettingsExtensions
public static class LoggerConfigurationJsonNetExtensions
Copy link
Member Author

@sungam3r sungam3r Jan 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nblumhardt I think this class was initially copied from other project. I rename it in light of major version bump. OK?

{
public static Serilog.LoggerConfiguration JsonNetTypes(this Serilog.Configuration.LoggerDestructuringConfiguration configuration) { }
}
Expand Down
2 changes: 1 addition & 1 deletion src/Destructurama.JsonNet.Tests/Destructurama.JsonNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/Destructurama.JsonNet/Destructurama.JsonNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
Copy link
Member Author

@sungam3r sungam3r Jan 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nblumhardt Keep net462 or drop?

Copy link
Contributor

@nblumhardt nblumhardt Jan 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's value in 462, I'd also consider adding net6.0; no strong feelings though

Copy link
Member Author

@sungam3r sungam3r Jan 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll publish net462;netstandard2.0 in v3. We can add net6 later if some issue arises.

<Description>Adds support for logging JSON.NET dynamic types as structured data with Serilog.</Description>
<RootNamespace>Destructurama</RootNamespace>
<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
</ItemGroup>

Expand Down
4 changes: 1 addition & 3 deletions src/Destructurama.JsonNet/LoggerConfigurationJsonNetExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Ignore Spelling: App

using Destructurama.JsonNet;
using Serilog;
using Serilog.Configuration;
Expand All @@ -23,7 +21,7 @@ namespace Destructurama;
/// <summary>
/// Adds the Destructure.JsonNetTypes() extension to <see cref="LoggerConfiguration"/>.
/// </summary>
public static class LoggerConfigurationAppSettingsExtensions
public static class LoggerConfigurationJsonNetExtensions
{
/// <summary>
/// Enable destructuring of JSON.NET dynamic objects.
Expand Down