Skip to content

Commit 725b6b2

Browse files
committed
.NET 8 RC2
1 parent 1471d91 commit 725b6b2

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

global.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.201",
4-
"allowPrerelease": false,
5-
"rollForward": "latestFeature"
3+
"version": "8.0.100-rc.2.23502.2"
64
}
75
}

sample/Sample/Sample.csproj

Lines changed: 2 additions & 2 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;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net462;net8.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
1818
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
1919
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2020
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<Description>Microsoft.Extensions.Configuration (appsettings.json) support for Serilog.</Description>
55
<!-- This must match the major and minor components of the referenced Microsoft.Extensions.Logging package. -->
6-
<VersionPrefix>7.0.2</VersionPrefix>
6+
<VersionPrefix>8.0.0</VersionPrefix>
77
<Authors>Serilog Contributors</Authors>
88
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.settings.configuration at
99
the target version. -->
10-
<TargetFrameworks>net462;netstandard2.0;net6.0;net7.0</TargetFrameworks>
10+
<TargetFrameworks>net462;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<AssemblyName>Serilog.Settings.Configuration</AssemblyName>
1313
<PackageTags>serilog;json</PackageTags>
@@ -27,13 +27,13 @@
2727
<ItemGroup>
2828
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2929
<PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="All" />
30-
<PackageReference Include="Serilog" Version="2.12.0" />
30+
<PackageReference Include="Serilog" Version="3.1.0-*" />
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="7.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.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/ConfigurationSettingsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,12 +395,12 @@ public void TestMinimumLevelOverridesForChildContext()
395395
log.Write(Some.DebugEvent());
396396
Assert.Null(evt);
397397

398-
var custom = log.ForContext(Constants.SourceContextPropertyName, typeof(System.Threading.Tasks.Task).FullName + "<42>");
398+
var custom = log.ForContext(Constants.SourceContextPropertyName, typeof(Task).FullName + "<42>");
399399
custom.Write(Some.DebugEvent());
400400
Assert.NotNull(evt);
401401

402402
evt = null;
403-
var systemThreadingLogger = log.ForContext<System.Threading.Tasks.Task>();
403+
var systemThreadingLogger = log.ForContext<Task>();
404404
systemThreadingLogger.Write(Some.DebugEvent());
405405
Assert.NotNull(evt);
406406
}

test/Serilog.Settings.Configuration.Tests/DllScanningAssemblyFinderTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,11 @@ namespace Serilog.Settings.Configuration.Tests;
99

1010
public class DllScanningAssemblyFinderTests
1111
{
12+
#if NETFRAMEWORK
1213
const string BinDir1 = "bin1";
1314
const string BinDir2 = "bin2";
1415
const string BinDir3 = "bin3";
1516

16-
[Fact]
17-
public void ShouldProbeCurrentDirectory()
18-
{
19-
var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");
20-
Assert.Single(assemblyNames);
21-
}
22-
23-
#if NETFRAMEWORK
2417
[Fact]
2518
public void ShouldProbePrivateBinPath()
2619
{
@@ -61,4 +54,11 @@ static void DoTestInner()
6154
}
6255
}
6356
#endif
57+
58+
[Fact]
59+
public void ShouldProbeCurrentDirectory()
60+
{
61+
var assemblyNames = new DllScanningAssemblyFinder().FindAssembliesContainingName("TestDummies");
62+
Assert.Single(assemblyNames);
63+
}
6464
}

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

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

33
<PropertyGroup>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
5-
<TargetFrameworks>$(TargetFrameworks);net7.0;net6.0</TargetFrameworks>
5+
<TargetFrameworks>$(TargetFrameworks);net7.0;net6.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="CliWrap" Version="3.6.0" />
2121
<PackageReference Include="FluentAssertions" Version="6.10.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-*" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
2424
<PackageReference Include="NuGet.Frameworks" Version="6.5.0" />
2525
<PackageReference Include="Polly" Version="7.2.3" />

0 commit comments

Comments
 (0)