Skip to content

Commit a234c68

Browse files
nblumhardtnblumhardt
committed
Update to .NET 8 RTM and Serilog 3.1.1
1 parent 0ea70d3 commit a234c68

File tree

11 files changed

+144
-26
lines changed

11 files changed

+144
-26
lines changed

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.2.23502.2"
3+
"version": "8.0.100"
44
}
55
}

‎sample/Sample/Sample.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
1818
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
19-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
19+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
2020
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
21-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
22-
<PackageReference Include="Serilog.Expressions" Version="3.3.0" />
23-
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
21+
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
22+
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
23+
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
2424
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
25-
<PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="all" />
25+
<PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="all" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
29-
<PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="All" />
30-
<PackageReference Include="Serilog" Version="3.1.0-*" />
29+
<PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="All" />
30+
<PackageReference Include="Serilog" Version="3.1.1" />
3131
<None Include="..\..\assets\icon.png" Pack="true" PackagePath="" Visible="false" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
3535
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
36-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-*" />
37-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0-*" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
3838
</ItemGroup>
3939
</Project>

‎test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="CliWrap" Version="3.6.0" />
21-
<PackageReference Include="FluentAssertions" Version="6.10.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
24-
<PackageReference Include="NuGet.Frameworks" Version="6.5.0" />
25-
<PackageReference Include="Polly" Version="7.2.3" />
26-
<PackageReference Include="Serilog.Expressions" Version="3.3.0" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
28-
<PackageReference Include="xunit" Version="2.4.2" />
29-
<PackageReference Include="Shouldly" Version="4.1.0" />
20+
<PackageReference Include="CliWrap" Version="3.6.4" />
21+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
24+
<PackageReference Include="NuGet.Frameworks" Version="6.7.0" />
25+
<PackageReference Include="Polly" Version="8.2.0" />
26+
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="xunit" Version="2.6.1" />
32+
<PackageReference Include="Shouldly" Version="4.2.1" />
3033
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
3134
</ItemGroup>
3235

‎test/TestApp-net48/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FodyWeavers.xml
2+
FodyWeavers.xsd

‎test/TestApp-net48/Program.cs

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
using System.Reflection;
2+
using Microsoft.Extensions.Configuration;
3+
using Serilog;
4+
using Serilog.Debugging;
5+
using Serilog.Settings.Configuration;
6+
7+
if (args.Length == 1 && args[0] == "is-single-file")
8+
{
9+
if (typeof(Program).Assembly.GetManifestResourceNames().Any(e => e.StartsWith("costura.")))
10+
{
11+
Console.WriteLine(true);
12+
return 0;
13+
}
14+
// IL3000: 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app
15+
#pragma warning disable IL3000
16+
Console.WriteLine(string.IsNullOrEmpty(Assembly.GetEntryAssembly()?.Location));
17+
#pragma warning restore
18+
return 0;
19+
}
20+
21+
SelfLog.Enable(Console.Error);
22+
23+
Thread.CurrentThread.Name = "Main thread";
24+
const string outputTemplate = "({ThreadName}) [{Level}] {Message}{NewLine}";
25+
26+
var configurationValues = new Dictionary<string, string?>();
27+
var minimumLevelOnly = args.Contains("--minimum-level-only");
28+
if (minimumLevelOnly)
29+
{
30+
configurationValues["Serilog:MinimumLevel"] = "Verbose";
31+
}
32+
else
33+
{
34+
configurationValues["Serilog:Enrich:0"] = "WithThreadName";
35+
configurationValues["Serilog:WriteTo:0:Name"] = "Console";
36+
configurationValues["Serilog:WriteTo:0:Args:outputTemplate"] = outputTemplate;
37+
}
38+
39+
if (args.Contains("--using-thread")) configurationValues["Serilog:Using:Thread"] = "Serilog.Enrichers.Thread";
40+
if (args.Contains("--using-console")) configurationValues["Serilog:Using:Console"] = "Serilog.Sinks.Console";
41+
42+
var assemblies = new List<Assembly>();
43+
if (args.Contains("--assembly-thread")) assemblies.Add(typeof(ThreadLoggerConfigurationExtensions).Assembly);
44+
if (args.Contains("--assembly-console")) assemblies.Add(typeof(ConsoleLoggerConfigurationExtensions).Assembly);
45+
46+
try
47+
{
48+
var configuration = new ConfigurationBuilder().AddInMemoryCollection(configurationValues).Build();
49+
var options = assemblies.Count > 0 ? new ConfigurationReaderOptions(assemblies.ToArray()) : null;
50+
var loggerConfiguration = new LoggerConfiguration().ReadFrom.Configuration(configuration, options);
51+
if (minimumLevelOnly)
52+
{
53+
loggerConfiguration
54+
.Enrich.WithThreadName()
55+
.WriteTo.Console(outputTemplate: outputTemplate);
56+
}
57+
var logger = loggerConfiguration.CreateLogger();
58+
logger.Information("Expected success");
59+
return 0;
60+
}
61+
catch (InvalidOperationException exception) when (exception.Message.StartsWith("No Serilog:Using configuration section is defined and no Serilog assemblies were found."))
62+
{
63+
Console.WriteLine("Expected exception");
64+
return 0;
65+
}
66+
catch (Exception exception)
67+
{
68+
Console.Error.WriteLine(exception);
69+
return 1;
70+
}

‎test/TestApp-net48/TestApp.csproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net48</TargetFramework>
6+
<DebugType>embedded</DebugType>
7+
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
8+
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
9+
<PublishReferencesDocumentationFiles>false</PublishReferencesDocumentationFiles>
10+
<AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
11+
<UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
12+
<SelfContained>true</SelfContained>
13+
</PropertyGroup>
14+
15+
<ItemGroup Condition="$(Configuration) == 'Debug'">
16+
<ProjectReference Include="..\..\src\Serilog.Settings.Configuration\Serilog.Settings.Configuration.csproj" />
17+
</ItemGroup>
18+
19+
<ItemGroup Condition="$(Configuration) == 'Release'">
20+
<PackageReference Include="Serilog.Settings.Configuration" Version="[0.0.0-IntegrationTest.0]" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
26+
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
27+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
28+
</ItemGroup>
29+
30+
</Project>

‎test/TestApp-net48/nuget.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="globalPackagesFolder" value="packages" />
5+
</config>
6+
<packageSources>
7+
<clear />
8+
<add key="local" value="." />
9+
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
10+
</packageSources>
11+
</configuration>

‎test/TestApp/TestApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2626
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
27-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
27+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
2828
</ItemGroup>
2929

3030
</Project>

‎test/TestDummies/DummyPolicy.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Serilog.Core;
22
using Serilog.Events;
33
using System.Collections;
4+
using System.Diagnostics.CodeAnalysis;
45

56
namespace TestDummies;
67

@@ -24,7 +25,7 @@ public class DummyPolicy : IDestructuringPolicy
2425

2526
public decimal Decimal { get; set; }
2627

27-
public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyValueFactory, out LogEventPropertyValue? result)
28+
public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyValueFactory, [NotNullWhen(true)] out LogEventPropertyValue? result)
2829
{
2930
result = null;
3031
return false;

‎test/TestDummies/TestDummies.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Serilog" Version="2.10.0" />
8+
<PackageReference Include="Serilog" Version="3.1.1" />
9+
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
910
</ItemGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

0 commit comments

Comments
 (0)