Skip to content

Commit 045ea0b

Browse files
nblumhardtnblumhardt
committed
(Non-building) v7; waiting for Serilog.Extensions.Hosting and Serilog.Settings.Configuration v7-dev-*.
1 parent 01f95fb commit 045ea0b

File tree

9 files changed

+93
-102
lines changed

9 files changed

+93
-102
lines changed

‎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>

‎serilog-aspnetcore.sln

+14
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.AspNetCore.Tests",
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "samples\Sample\Sample.csproj", "{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "..\serilog-extensions-logging\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{03EC6680-9D1F-4D51-A1F4-E6863781982B}"
30+
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Hosting", "..\serilog-extensions-hosting\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj", "{49220185-3DA4-49C1-B08C-F5C38F53378B}"
32+
EndProject
2933
Global
3034
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3135
Debug|Any CPU = Debug|Any CPU
@@ -44,6 +48,14 @@ Global
4448
{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
4549
{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
4650
{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.ActiveCfg = Release|Any CPU
58+
{49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.Build.0 = Release|Any CPU
4759
EndGlobalSection
4860
GlobalSection(SolutionProperties) = preSolution
4961
HideSolutionNode = FALSE
@@ -52,6 +64,8 @@ Global
5264
{0549D23F-986B-4FB2-BACE-16FD7A7BC9EF} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}
5365
{AD51759B-CD58-473F-9620-0B0E56A123A1} = {E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1}
5466
{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3} = {F2407211-6043-439C-8E06-3641634332E7}
67+
{03EC6680-9D1F-4D51-A1F4-E6863781982B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}
68+
{49220185-3DA4-49C1-B08C-F5C38F53378B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}
5569
EndGlobalSection
5670
GlobalSection(ExtensibilityGlobals) = postSolution
5771
SolutionGuid = {811E61C5-3871-4633-AFAE-B35B619C8A10}

‎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.Settings.Configuration" Version="3.4.0" />
35+
<ProjectReference Include="../../../serilog-extensions-hosting/src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj" />
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)