Skip to content

Commit 7fc0d58

Browse files
nblumhardtnblumhardt
authored
Merge pull request #401 from nblumhardt/dotnet-8
Update to .NET 8 RTM and Serilog 3.1.1
2 parents 0ea70d3 + 41bc33d commit 7fc0d58

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,4 @@ FakesAssemblies/
201201
project.lock.json
202202

203203
artifacts/
204+
/test/TestApp-*

‎Build.ps1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ if($LASTEXITCODE -ne 0) { throw 'pack failed' }
3030

3131
Write-Output "build: Testing"
3232

33-
# Dotnet test doesn't run separate TargetFrameworks in parallel: https://github.com/dotnet/sdk/issues/19147
34-
# Workaround: use `dotnet test` on dlls directly in order to pass the `--parallel` option to vstest.
35-
# The _reported_ runtime is wrong but the _actual_ used runtime is correct, see https://github.com/microsoft/vstest/issues/2037#issuecomment-720549173
36-
& dotnet test test\Serilog.Settings.Configuration.Tests\bin\Release\*\Serilog.Settings.Configuration.Tests.dll --parallel
33+
& dotnet test test\Serilog.Settings.Configuration.Tests\Serilog.Settings.Configuration.Tests.csproj
3734

38-
if($LASTEXITCODE -ne 0) { throw 'unit tests failed' }
35+
if($LASTEXITCODE -ne 0) { throw 'unit tests failed' }

‎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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
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" Version="2.5.3" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
29+
<PackageReference Include="Shouldly" Version="4.2.1" />
3030
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
3131
</ItemGroup>
3232

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