Skip to content

Commit 96ce395

Browse files
nblumhardtnblumhardt
authored
Merge pull request #325 from serilog/v7
v7; pin to Serilog.Extensions.Hosting and Serilog.Settings.Configuration v7-dev-*
2 parents 01f95fb + cfb2031 commit 96ce395

File tree

9 files changed

+83
-102
lines changed

9 files changed

+83
-102
lines changed

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -286,3 +286,7 @@ using (logger.PushProperty("OperationType", "update"))
286286
// UserId and OperationType are set for all logging events in these brackets
287287
}
288288
```
289+
290+
### Versioning
291+
292+
This package tracks the versioning and target framework support of its (indirect) [_Microsoft.Extensions.Hosting_](https://nuget.org/packages/Microsoft.Extensions.Hosting) dependency.

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": false,
4-
"version": "6.0.401",
4+
"version": "7.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

‎samples/Sample/Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Serilog.AspNetCore/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: AssemblyVersion("2.0.0.0")]
4+
[assembly: AssemblyVersion("7.0.0.0")]
55

66
[assembly: InternalsVisibleTo("Serilog.AspNetCore.Tests, PublicKey=" +
77
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +

‎src/Serilog.AspNetCore/Serilog.AspNetCore.csproj

+17-30
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
<PropertyGroup>
44
<Description>Serilog support for ASP.NET Core logging</Description>
5-
<VersionPrefix>6.1.1</VersionPrefix>
5+
<!-- This must match the major and minor components of the referenced *.Extensions.* packages (and highest supported .NET TFM). -->
6+
<VersionPrefix>7.0.0</VersionPrefix>
67
<Authors>Microsoft;Serilog Contributors</Authors>
7-
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
8+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
89
<GenerateDocumentationFile>true</GenerateDocumentationFile>
910
<PackageTags>serilog;aspnet;aspnetcore</PackageTags>
1011
<PackageIcon>icon.png</PackageIcon>
@@ -20,44 +21,30 @@
2021
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
2122
</ItemGroup>
2223

23-
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netstandard2.1'">
24-
<DefineConstants>$(DefineConstants);HOSTBUILDER</DefineConstants>
25-
</PropertyGroup>
26-
2724
<ItemGroup>
28-
<PackageReference Include="Serilog" Version="2.10.0" />
29-
<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
25+
<PackageReference Include="Serilog" Version="2.12.0" />
3026
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
3127
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
3228
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
33-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
3429
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
3530
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
38-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
40-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
42-
</ItemGroup>
4331

44-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
45-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
46-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
47-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
48-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
32+
<ItemGroup>
33+
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
34+
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0-dev-*" />
35+
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0-dev-*" />
36+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
4938
</ItemGroup>
5039

51-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
40+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netstandard2.1' ">
41+
<!-- I.e. all modern/supported non-Framework .NET SKUs -->
5242
<FrameworkReference Include="Microsoft.AspNetCore.App" />
53-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
54-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
5543
</ItemGroup>
56-
57-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
58-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
59-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
60-
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
44+
45+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
46+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
47+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
6148
</ItemGroup>
62-
49+
6350
</Project>

‎src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ public static class SerilogWebHostBuilderExtensions
3737
/// <c>WriteTo.Providers()</c> configuration method, enabling other <see cref="ILoggerProvider"/>s to receive events. By
3838
/// default, only Serilog sinks will receive events.</param>
3939
/// <returns>The web host builder.</returns>
40-
#if HOSTBUILDER
41-
[Obsolete("Prefer UseSerilog() on IHostBuilder")]
42-
#endif
40+
[Obsolete("Prefer UseSerilog() on IHostBuilder")]
4341
public static IWebHostBuilder UseSerilog(
4442
this IWebHostBuilder builder,
4543
ILogger? logger = null,
@@ -85,9 +83,7 @@ public static IWebHostBuilder UseSerilog(
8583
/// the Microsoft.Extensions.Logging API. Normally, equivalent Serilog sinks are used in place of providers. Specify
8684
/// <c>true</c> to write events to all providers.</param>
8785
/// <returns>The web host builder.</returns>
88-
#if HOSTBUILDER
89-
[Obsolete("Prefer UseSerilog() on IHostBuilder")]
90-
#endif
86+
[Obsolete("Prefer UseSerilog() on IHostBuilder")]
9187
public static IWebHostBuilder UseSerilog(
9288
this IWebHostBuilder builder,
9389
Action<WebHostBuilderContext, LoggerConfiguration> configureLogger,

‎test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
</PropertyGroup>
77

@@ -11,16 +11,9 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
15-
<PackageReference Include="xunit" Version="2.4.1" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
23-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
15+
<PackageReference Include="xunit" Version="2.4.2" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
2417
</ItemGroup>
2518

2619
</Project>

0 commit comments

Comments
 (0)