Skip to content

Commit 0db44b4

Browse files
martincostellomartincostello
authored
Merge branch 'main' into dotnet-vnext
2 parents e3e53b8 + 6de5fca commit 0db44b4

14 files changed

+179
-9
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ UpgradeLog*.XML
2525
*.GhostDoc.xml
2626
*.log
2727
*.nupkg
28+
!.packages/*.nupkg
2829
*.opensdf
2930
*.[Pp]ublish.xml
3031
*.publishproj

‎Directory.Build.props

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<Project>
2-
<ItemGroup>
3-
<AssemblyAttribute Include="System.CLSCompliant">
4-
<_Parameter1>false</_Parameter1>
5-
<_Parameter1_IsLiteral>true</_Parameter1_IsLiteral>
6-
</AssemblyAttribute>
7-
</ItemGroup>
82
<PropertyGroup>
9-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Logging.XUnit.snk</AssemblyOriginatorKeyFile>
3+
<AssemblyIsCLSCompliant>false</AssemblyIsCLSCompliant>
104
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Logging.XUnit.ruleset</CodeAnalysisRuleSet>
115
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
126
<!-- TODO Remove once .NET 10 is stable -->
137
<NoWarn>$(NoWarn);NU5104</NoWarn>
148
<NuGetAuditMode>direct</NuGetAuditMode>
159
<PackageTags>xunit;logging</PackageTags>
1610
<UseArtifactsOutput>true</UseArtifactsOutput>
11+
<UseDefaultAssemblyOriginatorKeyFile>true</UseDefaultAssemblyOriginatorKeyFile>
1712
<AssemblyVersion>0.5.0.0</AssemblyVersion>
1813
<PackageValidationBaselineVersion>0.5.0</PackageValidationBaselineVersion>
1914
<VersionPrefix>0.5.2</VersionPrefix>

‎Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project>
22
<ItemGroup>
3-
<GlobalPackageReference Include="MartinCostello.BuildKit" Version="0.1.0" />
3+
<GlobalPackageReference Include="MartinCostello.BuildKit" Version="0.3.0" />
44
<GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.11" PrivateAssets="All" />
55
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
66
</ItemGroup>
77
<ItemGroup>
88
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
99
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
1010
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.1.25120.3" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
1112
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
1213
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1314
<PackageVersion Include="NSubstitute" Version="5.3.0" />

‎Logging.XUnit.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
global.json = global.json
1616
LICENSE = LICENSE
1717
Logging.XUnit.ruleset = Logging.XUnit.ruleset
18-
Logging.XUnit.snk = Logging.XUnit.snk
1918
NuGet.config = NuGet.config
2019
README.md = README.md
2120
stylecop.json = stylecop.json

‎Logging.XUnit.snk

-596 Bytes
Binary file not shown.

‎src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Compile Include="..\Shared\**\*.cs" Link="%(Link)" />
1717
</ItemGroup>
1818
<ItemGroup>
19+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
1920
<PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="8.0.1" />
2021
<PackageReference Include="xunit.v3.extensibility.core" />
2122
</ItemGroup>

‎src/Logging.XUnit.v3/PublicAPI/PublicAPI.Shipped.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#nullable enable
2+
MartinCostello.Logging.XUnit.IMessageSinkAccessor
3+
MartinCostello.Logging.XUnit.IMessageSinkAccessor.MessageSink.get -> Xunit.Sdk.IMessageSink?
4+
MartinCostello.Logging.XUnit.IMessageSinkAccessor.MessageSink.set -> void
5+
MartinCostello.Logging.XUnit.ITestOutputHelperAccessor
6+
MartinCostello.Logging.XUnit.ITestOutputHelperAccessor.OutputHelper.get -> Xunit.ITestOutputHelper?
7+
MartinCostello.Logging.XUnit.ITestOutputHelperAccessor.OutputHelper.set -> void
8+
MartinCostello.Logging.XUnit.XUnitLogger
9+
MartinCostello.Logging.XUnit.XUnitLogger.BeginScope<TState>(TState state) -> System.IDisposable?
10+
MartinCostello.Logging.XUnit.XUnitLogger.Filter.get -> System.Func<string?, Microsoft.Extensions.Logging.LogLevel, bool>!
11+
MartinCostello.Logging.XUnit.XUnitLogger.Filter.set -> void
12+
MartinCostello.Logging.XUnit.XUnitLogger.IncludeScopes.get -> bool
13+
MartinCostello.Logging.XUnit.XUnitLogger.IncludeScopes.set -> void
14+
MartinCostello.Logging.XUnit.XUnitLogger.IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) -> bool
15+
MartinCostello.Logging.XUnit.XUnitLogger.Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func<TState, System.Exception?, string!>! formatter) -> void
16+
MartinCostello.Logging.XUnit.XUnitLogger.MessageSinkMessageFactory.get -> System.Func<string!, Xunit.Sdk.IMessageSinkMessage!>!
17+
MartinCostello.Logging.XUnit.XUnitLogger.MessageSinkMessageFactory.set -> void
18+
MartinCostello.Logging.XUnit.XUnitLogger.Name.get -> string!
19+
MartinCostello.Logging.XUnit.XUnitLogger.XUnitLogger(string! name, MartinCostello.Logging.XUnit.IMessageSinkAccessor! accessor, MartinCostello.Logging.XUnit.XUnitLoggerOptions? options) -> void
20+
MartinCostello.Logging.XUnit.XUnitLogger.XUnitLogger(string! name, MartinCostello.Logging.XUnit.ITestOutputHelperAccessor! accessor, MartinCostello.Logging.XUnit.XUnitLoggerOptions? options) -> void
21+
MartinCostello.Logging.XUnit.XUnitLogger.XUnitLogger(string! name, Xunit.ITestOutputHelper! outputHelper, MartinCostello.Logging.XUnit.XUnitLoggerOptions? options) -> void
22+
MartinCostello.Logging.XUnit.XUnitLogger.XUnitLogger(string! name, Xunit.Sdk.IMessageSink! messageSink, MartinCostello.Logging.XUnit.XUnitLoggerOptions? options) -> void
23+
MartinCostello.Logging.XUnit.XUnitLoggerOptions
24+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.Filter.get -> System.Func<string?, Microsoft.Extensions.Logging.LogLevel, bool>!
25+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.Filter.set -> void
26+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.IncludeScopes.get -> bool
27+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.IncludeScopes.set -> void
28+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.MessageSinkMessageFactory.get -> System.Func<string!, Xunit.Sdk.IMessageSinkMessage!>!
29+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.MessageSinkMessageFactory.set -> void
30+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.TimestampFormat.get -> string?
31+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.TimestampFormat.set -> void
32+
MartinCostello.Logging.XUnit.XUnitLoggerOptions.XUnitLoggerOptions() -> void
33+
MartinCostello.Logging.XUnit.XUnitLoggerProvider
34+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.Dispose() -> void
35+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.XUnitLoggerProvider(MartinCostello.Logging.XUnit.IMessageSinkAccessor! accessor, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> void
36+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.XUnitLoggerProvider(MartinCostello.Logging.XUnit.ITestOutputHelperAccessor! accessor, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> void
37+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.XUnitLoggerProvider(Xunit.ITestOutputHelper! outputHelper, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> void
38+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.XUnitLoggerProvider(Xunit.Sdk.IMessageSink! messageSink, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> void
39+
MartinCostello.Logging.XUnit.XUnitLoggerProvider.~XUnitLoggerProvider() -> void
40+
Microsoft.Extensions.Logging.XUnitLoggerExtensions
41+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper) -> Microsoft.Extensions.Logging.ILoggerFactory!
42+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> Microsoft.Extensions.Logging.ILoggerFactory!
43+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper, Microsoft.Extensions.Logging.LogLevel minLevel) -> Microsoft.Extensions.Logging.ILoggerFactory!
44+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggerFactory!
45+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper, System.Func<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggerFactory!
46+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.ITestOutputHelper! outputHelper, System.Func<string?, Microsoft.Extensions.Logging.LogLevel, bool>! filter) -> Microsoft.Extensions.Logging.ILoggerFactory!
47+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink) -> Microsoft.Extensions.Logging.ILoggerFactory!
48+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink, MartinCostello.Logging.XUnit.XUnitLoggerOptions! options) -> Microsoft.Extensions.Logging.ILoggerFactory!
49+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink, Microsoft.Extensions.Logging.LogLevel minLevel) -> Microsoft.Extensions.Logging.ILoggerFactory!
50+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggerFactory!
51+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink, System.Func<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggerFactory!
52+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggerFactory! factory, Xunit.Sdk.IMessageSink! messageSink, System.Func<string?, Microsoft.Extensions.Logging.LogLevel, bool>! filter) -> Microsoft.Extensions.Logging.ILoggerFactory!
53+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder!
54+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, MartinCostello.Logging.XUnit.IMessageSinkAccessor! accessor) -> Microsoft.Extensions.Logging.ILoggingBuilder!
55+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, MartinCostello.Logging.XUnit.IMessageSinkAccessor! accessor, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggingBuilder!
56+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, MartinCostello.Logging.XUnit.ITestOutputHelperAccessor! accessor) -> Microsoft.Extensions.Logging.ILoggingBuilder!
57+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, MartinCostello.Logging.XUnit.ITestOutputHelperAccessor! accessor, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggingBuilder!
58+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Xunit.ITestOutputHelper! outputHelper) -> Microsoft.Extensions.Logging.ILoggingBuilder!
59+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Xunit.ITestOutputHelper! outputHelper, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggingBuilder!
60+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Xunit.Sdk.IMessageSink! messageSink) -> Microsoft.Extensions.Logging.ILoggingBuilder!
61+
static Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Xunit.Sdk.IMessageSink! messageSink, System.Action<MartinCostello.Logging.XUnit.XUnitLoggerOptions!>! configure) -> Microsoft.Extensions.Logging.ILoggingBuilder!
62+
static Xunit.IMessageSinkExtensions.ToLogger<T>(this Xunit.Sdk.IMessageSink! messageSink) -> Microsoft.Extensions.Logging.ILogger<T>!
63+
static Xunit.IMessageSinkExtensions.ToLoggerFactory(this Xunit.Sdk.IMessageSink! messageSink) -> Microsoft.Extensions.Logging.ILoggerFactory!
64+
static Xunit.ITestOutputHelperExtensions.ToLogger<T>(this Xunit.ITestOutputHelper! outputHelper) -> Microsoft.Extensions.Logging.ILogger<T>!
65+
static Xunit.ITestOutputHelperExtensions.ToLoggerFactory(this Xunit.ITestOutputHelper! outputHelper) -> Microsoft.Extensions.Logging.ILoggerFactory!
66+
virtual MartinCostello.Logging.XUnit.XUnitLogger.WriteMessage(Microsoft.Extensions.Logging.LogLevel logLevel, int eventId, string? message, System.Exception? exception) -> void
67+
virtual MartinCostello.Logging.XUnit.XUnitLoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Extensions.Logging.ILogger!
68+
virtual MartinCostello.Logging.XUnit.XUnitLoggerProvider.Dispose(bool disposing) -> void
69+
Xunit.IMessageSinkExtensions
70+
Xunit.ITestOutputHelperExtensions

‎src/Logging.XUnit.v3/PublicAPI/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

‎src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Compile Include="..\Shared\**\*.cs" Link="%(Link)" />
1616
</ItemGroup>
1717
<ItemGroup>
18+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
1819
<PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="8.0.1" />
1920
<PackageReference Include="xunit.abstractions" />
2021
<PackageReference Include="xunit.extensibility.execution" />

0 commit comments

Comments
 (0)