Skip to content

Commit 60fb1b7

Browse files
nblumhardtnblumhardt
authored
Merge pull request #71 from nblumhardt/v7
v7; pin to Microsoft.Extensions.Hosting v7, including matching target frameworks
2 parents d19517a + 0538e5e commit 60fb1b7

File tree

9 files changed

+44
-34
lines changed

9 files changed

+44
-34
lines changed

‎README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Serilog logging for _Microsoft.Extensions.Hosting_. This package routes framewor
99
**First**, install the _Serilog.Extensions.Hosting_ [NuGet package](https://www.nuget.org/packages/Serilog.Extensions.Hosting) into your app. You will need a way to view the log messages - _Serilog.Sinks.Console_ writes these to the console; there are [many more sinks available](https://www.nuget.org/packages?q=Tags%3A%22serilog%22) on NuGet.
1010

1111
```powershell
12-
Install-Package Serilog.Extensions.Hosting -DependencyVersion Highest
13-
Install-Package Serilog.Sinks.Console
12+
dotnet add package Serilog.Extensions.Hosting
13+
dotnet add package Serilog.Sinks.Console
1414
```
1515

1616
**Next**, in your application's _Program.cs_ file, configure Serilog first. A `try`/`catch` block will ensure any configuration issues are appropriately logged:
@@ -88,3 +88,7 @@ You can alternatively configure Serilog using a delegate as shown below:
8888
This has the advantage of making the `hostingContext`'s `Configuration` object available for configuration of the logger, but at the expense of ignoring `Exception`s raised earlier in program startup.
8989

9090
If this method is used, `Log.Logger` is assigned implicitly, and closed when the app is shut down.
91+
92+
### Versioning
93+
94+
This package tracks the versioning and target framework support of its [_Microsoft.Extensions.Hosting_](https://nuget.org/packages/Microsoft.Extensions.Hosting) dependency.

‎global.json

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

‎samples/SimpleServiceSample/SimpleServiceSample.csproj

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

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

77
<ItemGroup>
88
<ProjectReference Include="..\..\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
13+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
1414
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
1515
</ItemGroup>
1616

‎samples/WebApplicationSample/WebApplicationSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

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

77
<ItemGroup>

‎serilog-extensions-hosting.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleServiceSample", "samp
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplicationSample", "samples\WebApplicationSample\WebApplicationSample.csproj", "{1ACDCA67-F404-45AB-9348-98E55E03CB8C}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "..\serilog-extensions-logging\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{4369EFC6-EE7F-4CA1-B8C7-123C39B88708}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
Debug|Any CPU = Debug|Any CPU
@@ -48,6 +50,10 @@ Global
4850
{1ACDCA67-F404-45AB-9348-98E55E03CB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
4951
{1ACDCA67-F404-45AB-9348-98E55E03CB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
5052
{1ACDCA67-F404-45AB-9348-98E55E03CB8C}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{4369EFC6-EE7F-4CA1-B8C7-123C39B88708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{4369EFC6-EE7F-4CA1-B8C7-123C39B88708}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{4369EFC6-EE7F-4CA1-B8C7-123C39B88708}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{4369EFC6-EE7F-4CA1-B8C7-123C39B88708}.Release|Any CPU.Build.0 = Release|Any CPU
5157
EndGlobalSection
5258
GlobalSection(SolutionProperties) = preSolution
5359
HideSolutionNode = FALSE
@@ -57,6 +63,7 @@ Global
5763
{AD51759B-CD58-473F-9620-0B0E56A123A1} = {E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1}
5864
{E5A82756-4619-4E6B-8B26-6D83E00E99F0} = {F2407211-6043-439C-8E06-3641634332E7}
5965
{1ACDCA67-F404-45AB-9348-98E55E03CB8C} = {F2407211-6043-439C-8E06-3641634332E7}
66+
{4369EFC6-EE7F-4CA1-B8C7-123C39B88708} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}
6067
EndGlobalSection
6168
GlobalSection(ExtensibilityGlobals) = postSolution
6269
SolutionGuid = {811E61C5-3871-4633-AFAE-B35B619C8A10}

‎src/Serilog.Extensions.Hosting/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
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.Extensions.Hosting.Tests, PublicKey=" +
77
"0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
<PropertyGroup>
44
<Description>Serilog support for .NET Core logging in hosted services</Description>
5-
<VersionPrefix>5.1.0</VersionPrefix>
5+
<!-- This must match the major and minor components of the referenced Microsoft.Extensions.Logging package. -->
6+
<VersionPrefix>7.0.0</VersionPrefix>
67
<Authors>Microsoft;Serilog Contributors</Authors>
7-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
8+
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.extensions.hosting at
9+
the target version. -->
10+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
811
<LangVersion>8</LangVersion>
912
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1013
<GenerateDocumentationFile>true</GenerateDocumentationFile>
11-
<AssemblyName>Serilog.Extensions.Hosting</AssemblyName>
1214
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1315
<SignAssembly>true</SignAssembly>
1416
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
15-
<PackageId>Serilog.Extensions.Hosting</PackageId>
1617
<PackageTags>serilog;aspnet;aspnetcore;hosting</PackageTags>
1718
<PackageIcon>icon.png</PackageIcon>
1819
<PackageProjectUrl>https://github.com/serilog/serilog-extensions-hosting</PackageProjectUrl>
@@ -23,20 +24,21 @@
2324
<RootNamespace>Serilog</RootNamespace>
2425
</PropertyGroup>
2526

26-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
27+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
2728
<DefineConstants>$(DefineConstants);NO_RELOADABLE_LOGGER</DefineConstants>
2829
</PropertyGroup>
2930

3031
<ItemGroup>
31-
<PackageReference Include="Serilog" Version="2.10.0" />
32-
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
33-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" />
34-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
32+
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
33+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
34+
<PackageReference Include="Serilog" Version="2.12.0" />
3635
</ItemGroup>
3736

3837
<ItemGroup>
39-
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
40-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
38+
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
39+
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0-dev-*" />
40+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
4143
</ItemGroup>
4244
</Project>

‎test/Serilog.Extensions.Hosting.Tests/DiagnosticContextTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ public async Task PropertiesAreCollectedInAnActiveContext()
3535
await Task.Delay(TimeSpan.FromMilliseconds(10));
3636
dc.Set(Some.String("second"), Some.Int32());
3737

38-
Assert.True(collector.TryComplete(out var properties));
38+
Assert.True(collector.TryComplete(out var properties, out var exception));
3939
Assert.Equal(2, properties.Count());
40+
Assert.Null(exception);
4041

41-
Assert.False(collector.TryComplete(out _));
42+
Assert.False(collector.TryComplete(out _, out _));
4243

4344
collector.Dispose();
4445

4546
dc.Set(Some.String("third"), Some.Int32());
46-
Assert.False(collector.TryComplete(out _));
47+
Assert.False(collector.TryComplete(out _, out _));
4748
}
4849

4950
[Fact]
@@ -97,10 +98,11 @@ public void ExistingPropertiesCanBeUpdated()
9798
dc.Set("name", 10);
9899
dc.Set("name", 20);
99100

100-
Assert.True(collector.TryComplete(out var properties));
101+
Assert.True(collector.TryComplete(out var properties, out var exception));
101102
var prop = Assert.Single(properties);
102103
var scalar = Assert.IsType<ScalarValue>(prop.Value);
103104
Assert.Equal(20, scalar.Value);
105+
Assert.Null(exception);
104106
}
105107

106108
[Fact]

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net4.8</TargetFrameworks>
5-
<AssemblyName>Serilog.Extensions.Hosting.Tests</AssemblyName>
4+
<TargetFrameworks>net6.0;net7.0;net4.8</TargetFrameworks>
65
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
76
<SignAssembly>true</SignAssembly>
87
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
9-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
108
<LangVersion>latest</LangVersion>
119
</PropertyGroup>
1210

@@ -19,13 +17,10 @@
1917
</ItemGroup>
2018

2119
<ItemGroup>
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
24-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
<PackageReference Include="xunit" Version="2.4.1" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
23+
<PackageReference Include="xunit" Version="2.4.2" />
2924
</ItemGroup>
3025

3126
</Project>

0 commit comments

Comments
 (0)