File tree Expand file tree Collapse file tree 6 files changed +20
-22
lines changed
src/Serilog.Settings.Configuration
test/Serilog.Settings.Configuration.Tests Expand file tree Collapse file tree 6 files changed +20
-22
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"sdk" : {
3
- "version" : " 7.0.201" ,
4
- "allowPrerelease" : false ,
5
- "rollForward" : " latestFeature"
3
+ "version" : " 8.0.100-rc.2.23502.2"
6
4
}
7
5
}
Original file line number Diff line number Diff line change 1
1
<Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
- <TargetFrameworks >net6.0;net7.0;net462</TargetFrameworks >
4
+ <TargetFrameworks >net6.0;net7.0;net462;net8.0 </TargetFrameworks >
5
5
<OutputType >Exe</OutputType >
6
6
</PropertyGroup >
7
7
14
14
</ItemGroup >
15
15
16
16
<ItemGroup >
17
- <PackageReference Include =" Microsoft.Extensions.Configuration.Json" Version =" 7 .0.0" />
17
+ <PackageReference Include =" Microsoft.Extensions.Configuration.Json" Version =" 8 .0.0-* " />
18
18
<PackageReference Include =" Serilog.Sinks.Async" Version =" 1.5.0" />
19
19
<PackageReference Include =" Serilog.Sinks.Console" Version =" 4.0.1" />
20
20
<PackageReference Include =" Serilog.Sinks.File" Version =" 5.0.0" />
Original file line number Diff line number Diff line change 3
3
<PropertyGroup >
4
4
<Description >Microsoft.Extensions.Configuration (appsettings.json) support for Serilog.</Description >
5
5
<!-- 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 >
7
7
<Authors >Serilog Contributors</Authors >
8
8
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.settings.configuration at
9
9
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 >
11
11
<GenerateDocumentationFile >true</GenerateDocumentationFile >
12
12
<AssemblyName >Serilog.Settings.Configuration</AssemblyName >
13
13
<PackageTags >serilog;json</PackageTags >
27
27
<ItemGroup >
28
28
<PackageReference Include =" Microsoft.SourceLink.GitHub" Version =" 1.1.1" PrivateAssets =" All" />
29
29
<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-* " />
31
31
<None Include =" ..\..\assets\icon.png" Pack =" true" PackagePath =" " Visible =" false" />
32
32
</ItemGroup >
33
33
34
34
<ItemGroup >
35
35
<!-- 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-* " />
38
38
</ItemGroup >
39
39
</Project >
Original file line number Diff line number Diff line change @@ -395,12 +395,12 @@ public void TestMinimumLevelOverridesForChildContext()
395
395
log . Write ( Some . DebugEvent ( ) ) ;
396
396
Assert . Null ( evt ) ;
397
397
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>" ) ;
399
399
custom . Write ( Some . DebugEvent ( ) ) ;
400
400
Assert . NotNull ( evt ) ;
401
401
402
402
evt = null ;
403
- var systemThreadingLogger = log . ForContext < System . Threading . Tasks . Task > ( ) ;
403
+ var systemThreadingLogger = log . ForContext < Task > ( ) ;
404
404
systemThreadingLogger . Write ( Some . DebugEvent ( ) ) ;
405
405
Assert . NotNull ( evt ) ;
406
406
}
Original file line number Diff line number Diff line change @@ -9,18 +9,11 @@ namespace Serilog.Settings.Configuration.Tests;
9
9
10
10
public class DllScanningAssemblyFinderTests
11
11
{
12
+ #if NETFRAMEWORK
12
13
const string BinDir1 = "bin1" ;
13
14
const string BinDir2 = "bin2" ;
14
15
const string BinDir3 = "bin3" ;
15
16
16
- [ Fact ]
17
- public void ShouldProbeCurrentDirectory ( )
18
- {
19
- var assemblyNames = new DllScanningAssemblyFinder ( ) . FindAssembliesContainingName ( "TestDummies" ) ;
20
- Assert . Single ( assemblyNames ) ;
21
- }
22
-
23
- #if NETFRAMEWORK
24
17
[ Fact ]
25
18
public void ShouldProbePrivateBinPath ( )
26
19
{
@@ -61,4 +54,11 @@ static void DoTestInner()
61
54
}
62
55
}
63
56
#endif
57
+
58
+ [ Fact ]
59
+ public void ShouldProbeCurrentDirectory ( )
60
+ {
61
+ var assemblyNames = new DllScanningAssemblyFinder ( ) . FindAssembliesContainingName ( "TestDummies" ) ;
62
+ Assert . Single ( assemblyNames ) ;
63
+ }
64
64
}
Original file line number Diff line number Diff line change 2
2
3
3
<PropertyGroup >
4
4
<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 >
6
6
</PropertyGroup >
7
7
8
8
<ItemGroup >
19
19
<ItemGroup >
20
20
<PackageReference Include =" CliWrap" Version =" 3.6.0" />
21
21
<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-* " />
23
23
<PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.5.0" />
24
24
<PackageReference Include =" NuGet.Frameworks" Version =" 6.5.0" />
25
25
<PackageReference Include =" Polly" Version =" 7.2.3" />
You can’t perform that action at this time.
0 commit comments