Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e8212c8

Browse files
Merge pull request #351 from serilog/dotnet-8
Update to .NET 8 RTM and Serilog 3.1.1
2 parents e24e4ba + b5515d0 commit e8212c8

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
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/Sample/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
4242
.Enrich.FromLogContext()
4343
.WriteTo.Console(new ExpressionTemplate(
4444
// Include trace and span ids when present.
45-
"[{@t:HH:mm:ss} {@l:u3}{#if @tr is not null} ({@tr}:{@sp}){#end}] {@m}\n{@x}")))
45+
"[{@t:HH:mm:ss} {@l:u3}{#if @tr is not null} ({substring(@tr,0,4)}:{substring(@sp,0,4)}){#end}] {@m}\n{@x}")))
4646
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
4747
}

‎samples/Sample/Sample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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.AspNetCore\Serilog.AspNetCore.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Serilog.Expressions" Version="4.0.0-*" />
12+
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
1313
</ItemGroup>
1414

1515
</Project>

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<Description>Serilog support for ASP.NET Core logging</Description>
55
<!-- This must match the major and minor components of the referenced *.Extensions.* packages (and highest supported .NET TFM). -->
6-
<VersionPrefix>7.0.1</VersionPrefix>
6+
<VersionPrefix>8.0.0</VersionPrefix>
77
<Authors>Microsoft;Serilog Contributors</Authors>
8-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
8+
<TargetFrameworks>net462;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>serilog;aspnet;aspnetcore</PackageTags>
1111
<PackageIcon>icon.png</PackageIcon>
@@ -15,37 +15,39 @@
1515
<RepositoryType>git</RepositoryType>
1616
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1717
<RootNamespace>Serilog</RootNamespace>
18+
<PackageReadmeFile>README.md</PackageReadmeFile>
1819
</PropertyGroup>
1920

2021
<ItemGroup>
2122
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
23+
<None Include="..\..\README.md" Pack="true" Visible="false" PackagePath="/" />
2224
<InternalsVisibleTo Include="Serilog.AspNetCore.Tests" Key="0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b81894191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066b19485ec" />
2325
</ItemGroup>
2426

2527
<ItemGroup>
26-
<PackageReference Include="Serilog" Version="3.1.0-*" />
27-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
28+
<PackageReference Include="Serilog" Version="3.1.1" />
29+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
2830
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2931
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
30-
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0-*" />
32+
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
3133
</ItemGroup>
3234

3335
<ItemGroup>
3436
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
35-
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
36-
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
37+
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
38+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
3941
<!-- Temporary addition to pull in trace/span support -->
40-
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.1-*" />
42+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
4143
</ItemGroup>
4244

43-
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netstandard2.1' ">
45+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' ">
4446
<!-- I.e. all modern/supported non-Framework .NET SKUs -->
4547
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4648
</ItemGroup>
4749

48-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
50+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
4951
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
5052
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
5153
</ItemGroup>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

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

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
14-
<PackageReference Include="xunit" Version="2.5.1" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.11" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
14+
<PackageReference Include="xunit" Version="2.6.1" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /