Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support xunit v3 #718

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
<LangVersion>latest</LangVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<NeutralLanguage>en-US</NeutralLanguage>
<!-- TODO Remove when xunit v3 is stable -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
<NuGetAuditMode>direct</NuGetAuditMode>
<Nullable>enable</Nullable>
<PackageIcon></PackageIcon>
Expand All @@ -44,8 +46,8 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseArtifactsOutput>true</UseArtifactsOutput>
<AssemblyVersion>0.4.0.0</AssemblyVersion>
<VersionPrefix>0.4.1</VersionPrefix>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<VersionPrefix>1.0.0</VersionPrefix>
</PropertyGroup>
<PropertyGroup Condition=" '$(GITHUB_ACTIONS)' != '' ">
<VersionSuffix Condition=" '$(VersionSuffix)' == '' AND '$(GITHUB_HEAD_REF)' == '' ">beta.$(GITHUB_RUN_NUMBER)</VersionSuffix>
Expand Down Expand Up @@ -73,9 +75,4 @@
<ItemGroup>
<Using Include="System.Globalization" />
</ItemGroup>
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
<Using Include="Shouldly" />
<Using Include="Xunit" />
<Using Include="Xunit.Abstractions" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="ReportGenerator" Version="5.3.8" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
<PackageVersion Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.24" />
<PackageVersion Include="xunit.v3" Version="0.2.0-pre.69" />
<PackageVersion Include="xunit.v3.core" Version="0.2.0-pre.69" />
</ItemGroup>
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dotnet add package MartinCostello.Logging.XUnit
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Xunit;
using Xunit.Abstractions;

namespace MyApp.Calculator;

Expand Down
1 change: 0 additions & 1 deletion package-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Xunit;
using Xunit.Abstractions;

namespace MyApp.Calculator;

Expand Down
2 changes: 0 additions & 2 deletions src/Logging.XUnit/AmbientTestOutputHelperAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Martin Costello, 2018. All rights reserved.
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

/// <summary>
Expand Down
204 changes: 204 additions & 0 deletions src/Logging.XUnit/CompatibilitySuppressions.xml
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete this when things moved to a new assembly.

Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Xunit.Abstractions.IMessageSinkExtensions</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
<Target>T:Xunit.Abstractions.ITestOutputHelperExtensions</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.IMessageSinkAccessor.get_MessageSink</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.ITestOutputHelperAccessor.get_OutputHelper</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLogger.#ctor(System.String,Xunit.Abstractions.IMessageSink,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLogger.#ctor(System.String,Xunit.Abstractions.ITestOutputHelper,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLogger.get_MessageSinkMessageFactory</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLoggerOptions.get_MessageSinkMessageFactory</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLoggerProvider.#ctor(Xunit.Abstractions.IMessageSink,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MartinCostello.Logging.XUnit.XUnitLoggerProvider.#ctor(Xunit.Abstractions.ITestOutputHelper,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink,Microsoft.Extensions.Logging.LogLevel)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink,System.Action{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink,System.Func{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink,System.Func{System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.IMessageSink)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper,MartinCostello.Logging.XUnit.XUnitLoggerOptions)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper,Microsoft.Extensions.Logging.LogLevel)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper,System.Action{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper,System.Func{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper,System.Func{System.String,Microsoft.Extensions.Logging.LogLevel,System.Boolean})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggerFactory,Xunit.Abstractions.ITestOutputHelper)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggingBuilder,Xunit.Abstractions.IMessageSink,System.Action{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggingBuilder,Xunit.Abstractions.IMessageSink)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggingBuilder,Xunit.Abstractions.ITestOutputHelper,System.Action{MartinCostello.Logging.XUnit.XUnitLoggerOptions})</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Microsoft.Extensions.Logging.XUnitLoggerExtensions.AddXUnit(Microsoft.Extensions.Logging.ILoggingBuilder,Xunit.Abstractions.ITestOutputHelper)</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>P:MartinCostello.Logging.XUnit.IMessageSinkAccessor.MessageSink</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>P:MartinCostello.Logging.XUnit.ITestOutputHelperAccessor.OutputHelper</Target>
<Left>lib/net8.0/MartinCostello.Logging.XUnit.dll</Left>
<Right>lib/net8.0/MartinCostello.Logging.XUnit.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>.NETStandard,Version=v2.0</Target>
</Suppression>
</Suppressions>
2 changes: 0 additions & 2 deletions src/Logging.XUnit/IMessageSinkAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Martin Costello, 2018. All rights reserved.
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Logging.XUnit/IMessageSinkExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Extensions.Logging;

#pragma warning disable IDE0130
namespace Xunit.Abstractions;
namespace Xunit.Sdk;

/// <summary>
/// A class containing extension methods for the <see cref="IMessageSink"/> interface. This class cannot be inherited.
Expand Down
2 changes: 0 additions & 2 deletions src/Logging.XUnit/ITestOutputHelperAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Martin Costello, 2018. All rights reserved.
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Logging.XUnit/ITestOutputHelperExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Extensions.Logging;

#pragma warning disable IDE0130
namespace Xunit.Abstractions;
namespace Xunit.Sdk;

/// <summary>
/// A class containing extension methods for the <see cref="ITestOutputHelper"/> interface. This class cannot be inherited.
Expand Down
13 changes: 7 additions & 6 deletions src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
<Description>Extensions for Microsoft.Extensions.Logging for xunit.</Description>
<EnablePackageValidation>true</EnablePackageValidation>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
<PackageId>MartinCostello.Logging.XUnit</PackageId>
<PackageValidationBaselineVersion>0.3.0</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>0.4.0</PackageValidationBaselineVersion>
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<Summary>$(Description)</Summary>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<Title>xunit Logging Extensions</Title>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
Expand All @@ -21,11 +22,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="xunit.abstractions" />
<PackageReference Include="xunit.extensibility.execution" />
<PackageReference Include="xunit.v3.core" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Update="Microsoft.Extensions.Logging" VersionOverride="8.0.0" />
<ItemGroup>
<Using Include="Xunit" />
<Using Include="Xunit.Sdk" />
</ItemGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.InteropServices.GuidAttribute">
Expand Down
2 changes: 0 additions & 2 deletions src/Logging.XUnit/MessageSinkAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Martin Costello, 2018. All rights reserved.
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Logging.XUnit/StringSyntaxAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//// Based on https://github.com/dotnet/runtime/blob/65067052e433eda400c5e7cc9f7b21c84640f901/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/StringSyntaxAttribute.cs

#if NETSTANDARD
#if !NET8_0_OR_GREATER

#pragma warning disable IDE0130
#pragma warning disable SA1600
Expand Down
2 changes: 0 additions & 2 deletions src/Logging.XUnit/TestOutputHelperAccessor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Martin Costello, 2018. All rights reserved.
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/Logging.XUnit/XUnitLogger.IMessageSink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Microsoft.Extensions.Logging;
using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

Expand Down
1 change: 0 additions & 1 deletion src/Logging.XUnit/XUnitLogger.ITestOutputHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information.

using Microsoft.Extensions.Logging;
using Xunit.Abstractions;

namespace MartinCostello.Logging.XUnit;

Expand Down
3 changes: 1 addition & 2 deletions src/Logging.XUnit/XUnitLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

using System.Text;
using Microsoft.Extensions.Logging;
using Xunit.Abstractions;
using Xunit.Sdk;
using Xunit.v3;

namespace MartinCostello.Logging.XUnit;

Expand Down
Loading