Skip to content

Commit f22e3fd

Browse files
nblumhardtnblumhardt
committed
Update to .NET 8 RTM and Serilog 3.1.1
1 parent 52f29a6 commit f22e3fd

File tree

7 files changed

+24
-28
lines changed

7 files changed

+24
-28
lines changed

‎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": "7.0.100",
4+
"version": "8.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

‎samples/SimpleServiceSample/Program.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System;
2-
using System.IO;
3-
using Microsoft.Extensions.Configuration;
42
using Microsoft.Extensions.DependencyInjection;
53
using Microsoft.Extensions.Hosting;
64
using Serilog;
@@ -38,6 +36,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
3836
.ConfigureServices(services => services.AddHostedService<PrintTimeService>())
3937
.UseSerilog((context, services, loggerConfiguration) => loggerConfiguration
4038
.ReadFrom.Configuration(context.Configuration)
39+
.ReadFrom.Services(services)
4140
.Enrich.FromLogContext()
4241
.WriteTo.Console());
4342
}

‎samples/SimpleServiceSample/SimpleServiceSample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.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="7.0.1" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
14-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
13+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
14+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎samples/WebApplicationSample/Program.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
52
using Microsoft.AspNetCore.Hosting;
6-
using Microsoft.Extensions.Configuration;
73
using Microsoft.Extensions.Hosting;
8-
using Microsoft.Extensions.Logging;
94
using Serilog;
105

116
namespace WebApplicationSample

‎samples/WebApplicationSample/WebApplicationSample.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.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="serilog.settings.configuration" Version="3.1.0" />
13-
<PackageReference Include="serilog.sinks.console" Version="3.1.1" />
14-
<PackageReference Include="serilog.sinks.file" Version="4.1.0" />
12+
<PackageReference Include="serilog.settings.configuration" Version="8.0.0" />
13+
<PackageReference Include="serilog.sinks.console" Version="5.0.0" />
14+
<PackageReference Include="serilog.sinks.file" Version="5.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<Description>Serilog support for .NET Core logging in hosted services</Description>
55
<!-- This must match the major and minor components of the referenced Microsoft.Extensions.Logging package. -->
6-
<VersionPrefix>7.0.0</VersionPrefix>
6+
<VersionPrefix>8.0.0</VersionPrefix>
77
<Authors>Microsoft;Serilog Contributors</Authors>
88
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.extensions.hosting at
99
the target version. -->
10-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
10+
<TargetFrameworks>net462;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
1111
<LangVersion>8</LangVersion>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -22,6 +22,7 @@
2222
<RepositoryType>git</RepositoryType>
2323
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
2424
<RootNamespace>Serilog</RootNamespace>
25+
<PackageReadmeFile>README.md</PackageReadmeFile>
2526
</PropertyGroup>
2627

2728
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
@@ -30,15 +31,16 @@
3031

3132
<ItemGroup>
3233
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
34+
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
3335
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
34-
<PackageReference Include="Serilog" Version="2.12.0" />
36+
<PackageReference Include="Serilog" Version="3.1.1" />
3537
</ItemGroup>
3638

3739
<ItemGroup>
3840
<!-- 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" />
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" />
41+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
4345
</ItemGroup>
4446
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net4.8</TargetFrameworks>
4+
<TargetFrameworks>net4.8;net6.0;net7.0;net8.0</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -17,10 +17,10 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
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" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
23+
<PackageReference Include="xunit" Version="2.6.1" />
2424
</ItemGroup>
2525

2626
</Project>

0 commit comments

Comments
 (0)