Skip to content

Commit 8d44e12

Browse files
nblumhardtnblumhardt
authored
Merge pull request #102 from serilog/dev
10.0.0 Release
2 parents 689f2d4 + 1fef625 commit 8d44e12

File tree

9 files changed

+26
-24
lines changed

9 files changed

+26
-24
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup
2727
uses: actions/setup-dotnet@v4
2828
with:
29-
dotnet-version: 9.0.x
29+
dotnet-version: 10.0.x
3030
- name: Compute build number
3131
shell: bash
3232
run: |

‎Directory.Version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<!-- This must match the major and minor components of the referenced Microsoft.Extensions.Hosting package. -->
4-
<VersionPrefix>9.0.0</VersionPrefix>
4+
<VersionPrefix>10.0.0</VersionPrefix>
55
</PropertyGroup>
66
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

‎samples/SimpleServiceSample/SimpleServiceSample.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GenerateDocumentationFile>false</GenerateDocumentationFile>
66
</PropertyGroup>
77

@@ -10,9 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
14-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
15-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0-*" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
14+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
15+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎samples/WebApplicationSample/WebApplicationSample.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="serilog.settings.configuration" Version="9.0.0-*" />
14-
<PackageReference Include="serilog.sinks.console" Version="6.0.0" />
15-
<PackageReference Include="serilog.sinks.file" Version="6.0.0" />
13+
<PackageReference Include="serilog.settings.configuration" Version="10.0.0" />
14+
<PackageReference Include="serilog.sinks.console" Version="6.1.1" />
15+
<PackageReference Include="serilog.sinks.file" Version="7.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public DiagnosticContextCollector BeginCollection()
4545
}
4646

4747
/// <inheritdoc cref="IDiagnosticContext.Set"/>
48-
public void Set(string propertyName, object value, bool destructureObjects = false)
48+
public void Set(string propertyName, object? value, bool destructureObjects = false)
4949
{
5050
if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
5151

‎src/Serilog.Extensions.Hosting/IDiagnosticContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface IDiagnosticContext
2929
/// <param name="value">The property value.</param>
3030
/// <param name="destructureObjects">If true, the value will be serialized as structured
3131
/// data if possible; if false, the object will be recorded as a scalar or simple array.</param>
32-
void Set(string propertyName, object value, bool destructureObjects = false);
32+
void Set(string propertyName, object? value, bool destructureObjects = false);
3333

3434
/// <summary>
3535
/// Set the specified exception on the current diagnostic context.

‎src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>Microsoft;Serilog Contributors</Authors>
66
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.extensions.hosting at
77
the target version. -->
8-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
8+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
99
<PackageTags>serilog;aspnet;aspnetcore;hosting</PackageTags>
1010
<PackageIcon>icon.png</PackageIcon>
1111
<PackageProjectUrl>https://github.com/serilog/serilog-extensions-hosting</PackageProjectUrl>
@@ -26,18 +26,22 @@
2626
<DefineConstants>$(DefineConstants);FEATURE_MBPW</DefineConstants>
2727
</PropertyGroup>
2828

29+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
30+
<DefineConstants>$(DefineConstants);FEATURE_MBPW</DefineConstants>
31+
</PropertyGroup>
32+
2933
<ItemGroup>
3034
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
3135
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
32-
<PackageReference Include="Serilog" Version="4.2.0-*" />
36+
<PackageReference Include="Serilog" Version="4.3.0" />
3337
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
3438
</ItemGroup>
3539

3640
<ItemGroup>
3741
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
38-
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0-*" />
39-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
42+
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
44+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
4246
</ItemGroup>
4347
</Project>

‎test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- `net6.0` is unsupported, but included here because we jump through some hoops to keep it working with
5-
reload support. -->
6-
<TargetFrameworks>net4.8;net6.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net4.8;net8.0;net9.0;net10.0</TargetFrameworks>
75
<GenerateDocumentationFile>false</GenerateDocumentationFile>
86
</PropertyGroup>
97

@@ -12,10 +10,10 @@
1210
</ItemGroup>
1311

1412
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1715
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
18-
<PackageReference Include="xunit" Version="2.9.2" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
1917
</ItemGroup>
2018

2119
</Project>

0 commit comments

Comments
 (0)