From ff1b169a1a24534d4a89e3e8d5c37c83314307ba Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Sat, 18 Apr 2026 11:21:02 +0900 Subject: [PATCH 1/3] chore: cleanup xunit namespaces with implicit using --- .../BenchmarkCancellationAttributeAnalyzerTests.cs | 1 - .../AnalyzerTests/General/AsyncBenchmarkAnalyzerTests.cs | 1 - .../BenchmarkDotNet.Analyzers.Tests.csproj | 6 +++++- .../CodeFixTests/AsyncBenchmarkCodeFixProviderTests.cs | 1 - .../Fixtures/CodeFixTestFixture.cs | 1 - .../BenchmarkDotNet.Exporters.Plotting.Tests.csproj | 4 ++++ .../ScottPlotExporterTests.cs | 1 - ...IntegrationTests.ManualRunning.MultipleFrameworks.csproj | 4 ++++ .../MultipleFrameworksTest.cs | 4 +--- .../BenchmarkDotNet.IntegrationTests.ManualRunning.csproj | 5 +++++ .../DotMemoryTests.cs | 2 -- .../DotTraceTests.cs | 2 -- .../MsBuildArgumentTests.cs | 4 +--- .../AllSetupAndCleanupTest.cs | 1 - tests/BenchmarkDotNet.IntegrationTests/AppConfigTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/ArgumentsTests.cs | 3 +-- .../BenchmarkDotNet.IntegrationTests/AssemblyConfigTests.cs | 3 +-- .../AsyncBenchmarksTests.cs | 1 - tests/BenchmarkDotNet.IntegrationTests/AttributesTests.cs | 3 +-- .../BaselineRatioColumnTest.cs | 3 +-- .../BenchmarkDotNet.IntegrationTests.csproj | 4 ++++ .../BenchmarkSwitcherTest.cs | 3 +-- .../BenchmarkTestExecutor.cs | 4 +--- tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/CallerThreadTests.cs | 1 - .../CancellationTokenTests.cs | 1 - tests/BenchmarkDotNet.IntegrationTests/CodeGenTests.cs | 3 +-- .../ConflictingNamesTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/CopyToOutputTests.cs | 2 -- .../CustomBuildConfigurationTests.cs | 4 +--- tests/BenchmarkDotNet.IntegrationTests/CustomEngineTests.cs | 3 +-- .../CustomTaskAndAwaitableTests.cs | 3 +-- .../Diagnosers/ProcessMetricsTests.cs | 3 +-- .../DisassemblyDiagnoserTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/DryRunTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/EngineTests.cs | 1 - .../EnvironmentVariablesTests.cs | 1 - .../ExceptionHandlingTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs | 3 +-- .../ExtraAttributesForEntryMethodTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/FSharpTests.cs | 1 - .../FailingProcessSpawnTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs | 3 +-- .../GlobalSetupAttributeInvalidMethodTest.cs | 3 +-- .../InProcessDiagnoserTests.cs | 1 - tests/BenchmarkDotNet.IntegrationTests/InProcessEmitTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/InProcessTest.cs | 1 - .../JitOptimizationsTests.cs | 1 - .../JitRuntimeValidationTest.cs | 3 +-- .../LanguageVersionTests.cs | 3 +-- .../LargeAddressAwareTest.cs | 3 +-- .../MemoryDiagnoserTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs | 3 +-- .../MultipleRuntimesTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/ParamSourceTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/ParamsTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/PathTooLongTests.cs | 3 +-- .../PowerManagementApplierTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/PriorityTests.cs | 3 +-- .../ProcessPropertiesTests.cs | 3 +-- .../ProcessorArchitectureTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/R2RTests.cs | 1 - tests/BenchmarkDotNet.IntegrationTests/ReferencesTests.cs | 1 - .../BenchmarkDotNet.IntegrationTests/RoslynToolchainTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/RunAsyncTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs | 3 +-- .../SetupAndCleanupTests.cs | 3 +-- .../BenchmarkDotNet.IntegrationTests/StandardErrorTests.cs | 3 +-- .../StatResultExtenderTests.cs | 3 +-- .../TailCallDiagnoserTests.cs | 4 +--- .../ThreadingDiagnoserTests.cs | 2 -- tests/BenchmarkDotNet.IntegrationTests/ToolchainTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/ValidatorsTest.cs | 3 +-- .../ValuesReturnedByBenchmarkTest.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/WakeLockTests.cs | 3 +-- tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs | 3 +-- .../Analysers/OutliersAnalyserTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj | 4 ++++ tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs | 1 - tests/BenchmarkDotNet.Tests/ConfigParserTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Configs/CategoriesTests.cs | 1 - .../Detectors/Cpu/LinuxCpuInfoParserTests.cs | 3 +-- .../Detectors/Cpu/PowershellWmiCpuInfoParserTests.cs | 3 +-- .../Detectors/Cpu/SysctlCpuInfoParserTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Detectors/Cpu/TestHelper.cs | 3 +-- .../Detectors/Cpu/WmicCpuInfoParserTests.cs | 3 +-- .../BenchmarkDotNet.Tests/Engine/EngineActualStageTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Engine/EnginePilotStageTests.cs | 3 +-- .../BenchmarkDotNet.Tests/Engine/EngineWarmupStageTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs | 3 +-- tests/BenchmarkDotNet.Tests/Mathematics/StatisticsTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs | 3 +-- tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs | 1 - tests/BenchmarkDotNet.Tests/Perfonar/PerfonarTests.cs | 1 - tests/BenchmarkDotNet.Tests/Reports/ColumnTests.cs | 3 +-- .../Reports/DefaultColumnProvidersTests.cs | 3 +-- .../Reports/DisplayPrecisionManagerTests.cs | 1 - tests/BenchmarkDotNet.Tests/Reports/RatioPrecisionTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/Reports/RatioStyleTests.cs | 1 - tests/BenchmarkDotNet.Tests/Reports/SummaryTableTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/SourceCodeHelperTests.cs | 3 +-- tests/BenchmarkDotNet.Tests/TypeFilterTests.cs | 3 +-- .../Validators/ParamsValidatorTests.cs | 3 +-- .../XUnit/EnvRequirementCheckerTests.cs | 1 - tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs | 1 - .../XUnit/InlineDataEnvSpecificDiscoverer.cs | 1 - tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs | 1 - 108 files changed, 97 insertions(+), 183 deletions(-) diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/Attributes/BenchmarkCancellationAttributeAnalyzerTests.cs b/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/Attributes/BenchmarkCancellationAttributeAnalyzerTests.cs index 14098b1b97..3c06a75bc6 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/Attributes/BenchmarkCancellationAttributeAnalyzerTests.cs +++ b/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/Attributes/BenchmarkCancellationAttributeAnalyzerTests.cs @@ -1,6 +1,5 @@ using BenchmarkDotNet.Analyzers.Attributes; using BenchmarkDotNet.Analyzers.Tests.Fixtures; -using Xunit; namespace BenchmarkDotNet.Analyzers.Tests.AnalyzerTests.Attributes; diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/General/AsyncBenchmarkAnalyzerTests.cs b/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/General/AsyncBenchmarkAnalyzerTests.cs index 1a1af8aad9..f5e2124bf2 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/General/AsyncBenchmarkAnalyzerTests.cs +++ b/tests/BenchmarkDotNet.Analyzers.Tests/AnalyzerTests/General/AsyncBenchmarkAnalyzerTests.cs @@ -1,6 +1,5 @@ using BenchmarkDotNet.Analyzers.General; using BenchmarkDotNet.Analyzers.Tests.Fixtures; -using Xunit; namespace BenchmarkDotNet.Analyzers.Tests.AnalyzerTests.General; diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj b/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj index 92a896bce1..f17417cc6f 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj +++ b/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj @@ -8,7 +8,11 @@ true true $(NoWarn);CS1591 - + + + + + diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/CodeFixTests/AsyncBenchmarkCodeFixProviderTests.cs b/tests/BenchmarkDotNet.Analyzers.Tests/CodeFixTests/AsyncBenchmarkCodeFixProviderTests.cs index 38d69fe247..f85e4a6b00 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/CodeFixTests/AsyncBenchmarkCodeFixProviderTests.cs +++ b/tests/BenchmarkDotNet.Analyzers.Tests/CodeFixTests/AsyncBenchmarkCodeFixProviderTests.cs @@ -1,7 +1,6 @@ using BenchmarkDotNet.Analyzers.General; using BenchmarkDotNet.Analyzers.Tests.Fixtures; using BenchmarkDotNet.CodeFixers; -using Xunit; namespace BenchmarkDotNet.Analyzers.Tests.CodeFixTests; diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/Fixtures/CodeFixTestFixture.cs b/tests/BenchmarkDotNet.Analyzers.Tests/Fixtures/CodeFixTestFixture.cs index 206116018b..bb9807624b 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/Fixtures/CodeFixTestFixture.cs +++ b/tests/BenchmarkDotNet.Analyzers.Tests/Fixtures/CodeFixTestFixture.cs @@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Xunit; namespace BenchmarkDotNet.Analyzers.Tests.Fixtures; diff --git a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj index ccadec5e07..9aa9ef524b 100644 --- a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj +++ b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj @@ -5,6 +5,10 @@ true false + + + + diff --git a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/ScottPlotExporterTests.cs b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/ScottPlotExporterTests.cs index 546c615119..bb481d3ea8 100644 --- a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/ScottPlotExporterTests.cs +++ b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/ScottPlotExporterTests.cs @@ -3,7 +3,6 @@ using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Tests.Mocks; using System.Diagnostics.CodeAnalysis; -using Xunit.Abstractions; namespace BenchmarkDotNet.Exporters.Plotting.Tests { diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj index a0d6ee6938..e79096985b 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj @@ -15,6 +15,10 @@ true true + + + + diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/MultipleFrameworksTest.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/MultipleFrameworksTest.cs index 72e16f13af..9cc9ffeae0 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/MultipleFrameworksTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/MultipleFrameworksTest.cs @@ -1,9 +1,7 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Extensions; using BenchmarkDotNet.Jobs; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests.ManualRunning { diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj index 18fcf9b171..bd82d42fbb 100755 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj @@ -12,6 +12,11 @@ true + + + + + $(DefineConstants);CUSTOM_PROP diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs index 4f577ffa0f..efb02f0aea 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs @@ -5,8 +5,6 @@ using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; using BenchmarkDotNet.Toolchains.InProcess.Emit; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests.ManualRunning { diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs index 52747e9030..dc11404f9f 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs @@ -5,8 +5,6 @@ using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; using BenchmarkDotNet.Toolchains.InProcess.Emit; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests.ManualRunning { diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MsBuildArgumentTests.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MsBuildArgumentTests.cs index e97e821e33..6592e76047 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MsBuildArgumentTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MsBuildArgumentTests.cs @@ -1,9 +1,7 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests.ManualRunning { diff --git a/tests/BenchmarkDotNet.IntegrationTests/AllSetupAndCleanupTest.cs b/tests/BenchmarkDotNet.IntegrationTests/AllSetupAndCleanupTest.cs index 68ab54b8e8..54934cd6a2 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/AllSetupAndCleanupTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/AllSetupAndCleanupTest.cs @@ -3,7 +3,6 @@ using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Reports; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/AppConfigTests.cs b/tests/BenchmarkDotNet.IntegrationTests/AppConfigTests.cs index 8a597e8a4d..0baf6bf239 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/AppConfigTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/AppConfigTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using System.Configuration; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ArgumentsTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ArgumentsTests.cs index 938efe17f1..d012aed52b 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ArgumentsTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ArgumentsTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Extensions; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; using System.Numerics; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/AssemblyConfigTests.cs b/tests/BenchmarkDotNet.IntegrationTests/AssemblyConfigTests.cs index 8c1dcaeda8..78e370729d 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/AssemblyConfigTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/AssemblyConfigTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.IntegrationTests.ConfigPerAssembly; -using Xunit.Abstractions; +using BenchmarkDotNet.IntegrationTests.ConfigPerAssembly; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/AsyncBenchmarksTests.cs b/tests/BenchmarkDotNet.IntegrationTests/AsyncBenchmarksTests.cs index 1994147978..52345b585d 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/AsyncBenchmarksTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/AsyncBenchmarksTests.cs @@ -4,7 +4,6 @@ using BenchmarkDotNet.Toolchains.InProcess.Emit; using BenchmarkDotNet.Toolchains.InProcess.NoEmit; using System.Threading.Tasks.Sources; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/AttributesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/AttributesTests.cs index 10e6c78c9d..8130a7ce73 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/AttributesTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/AttributesTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/BaselineRatioColumnTest.cs b/tests/BenchmarkDotNet.IntegrationTests/BaselineRatioColumnTest.cs index e70743f988..83b3c1e98f 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BaselineRatioColumnTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BaselineRatioColumnTest.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Exporters; using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Reports; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj index b54a05009a..605c77ef9a 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj @@ -14,6 +14,10 @@ $(NoWarn);CA2007;CA1825 true + + + + Always diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs index bb08c691d8..ab336fe92e 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Exporters; @@ -9,7 +9,6 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs index 4e17eb6982..e3413c5e4a 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Columns; +using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.IntegrationTests.Xunit; using BenchmarkDotNet.Jobs; @@ -6,8 +6,6 @@ using BenchmarkDotNet.Reports; using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Loggers; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs index 70698e6e51..3af68062ee 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Detectors; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; using BenchmarkDotNet.Toolchains.NativeAot; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/CallerThreadTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CallerThreadTests.cs index 869767c5ee..fe0b3940cd 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CallerThreadTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CallerThreadTests.cs @@ -14,7 +14,6 @@ using BenchmarkDotNet.Toolchains.InProcess.NoEmit; using BenchmarkDotNet.Toolchains.Results; using BenchmarkDotNet.Validators; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs index 4841703b84..1c108b8b58 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs @@ -17,7 +17,6 @@ using BenchmarkDotNet.Toolchains.MonoAotLLVM; using BenchmarkDotNet.Toolchains.MonoWasm; using BenchmarkDotNet.Validators; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/CodeGenTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CodeGenTests.cs index 2068376512..ee41633b66 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CodeGenTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CodeGenTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.XUnit; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; using System.Diagnostics; using System.Reflection; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/ConflictingNamesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ConflictingNamesTests.cs index 39436fb6d1..bb1b8eab7e 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ConflictingNamesTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ConflictingNamesTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/CopyToOutputTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CopyToOutputTests.cs index 1d43b59550..bd8da25d01 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CopyToOutputTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CopyToOutputTests.cs @@ -1,7 +1,5 @@ #if NETFRAMEWORK using BenchmarkDotNet.IntegrationTests.CustomPaths; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs index 8bbf004312..6581960e2c 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Extensions; @@ -6,9 +6,7 @@ using BenchmarkDotNet.Portability; using BenchmarkDotNet.Tests.XUnit; #if !DEBUG -using Xunit; #endif -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomEngineTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomEngineTests.cs index 50cd89be98..c7bf0030fd 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CustomEngineTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CustomEngineTests.cs @@ -1,9 +1,8 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using Perfolizer.Mathematics.OutlierDetection; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomTaskAndAwaitableTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomTaskAndAwaitableTests.cs index 6a35e18c6b..a26b57665d 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CustomTaskAndAwaitableTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CustomTaskAndAwaitableTests.cs @@ -1,9 +1,8 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/Diagnosers/ProcessMetricsTests.cs b/tests/BenchmarkDotNet.IntegrationTests/Diagnosers/ProcessMetricsTests.cs index 829a48bced..7e1b328385 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/Diagnosers/ProcessMetricsTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/Diagnosers/ProcessMetricsTests.cs @@ -1,11 +1,10 @@ -#if NETFRAMEWORK +#if NETFRAMEWORK using BenchmarkDotNet.Diagnosers; using BenchmarkDotNet.Diagnostics.Windows.Tracing; using BenchmarkDotNet.Engines; using System; using System.Collections.Generic; using System.Linq; -using Xunit; namespace BenchmarkDotNet.IntegrationTests.Diagnosers { diff --git a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs index dcd3054e66..5e804a3cde 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Diagnosers; @@ -14,7 +14,6 @@ using BenchmarkDotNet.Toolchains.CsProj; using BenchmarkDotNet.Toolchains.InProcess.Emit; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/DryRunTests.cs b/tests/BenchmarkDotNet.IntegrationTests/DryRunTests.cs index 895dc4266a..b2db86e730 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/DryRunTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/DryRunTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Engines; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/EngineTests.cs b/tests/BenchmarkDotNet.IntegrationTests/EngineTests.cs index d04eaa6385..f37716cb04 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/EngineTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/EngineTests.cs @@ -7,7 +7,6 @@ using BenchmarkDotNet.Toolchains.InProcess.Emit; using BenchmarkDotNet.Toolchains.InProcess.NoEmit; using System.Diagnostics; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/EnvironmentVariablesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/EnvironmentVariablesTests.cs index d414a580b9..b63820cb74 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/EnvironmentVariablesTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/EnvironmentVariablesTests.cs @@ -1,6 +1,5 @@ using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ExceptionHandlingTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ExceptionHandlingTests.cs index 4aa1215007..4c2ab6a442 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ExceptionHandlingTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ExceptionHandlingTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Diagnosers; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Toolchains.InProcess.Emit; using JetBrains.Annotations; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs index 2a758535e2..d70a3a2356 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Exporters; using BenchmarkDotNet.Helpers; @@ -7,7 +7,6 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.XUnit; using System.Collections.Immutable; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ExtraAttributesForEntryMethodTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ExtraAttributesForEntryMethodTests.cs index cdf6177346..4dc3be0b51 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ExtraAttributesForEntryMethodTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ExtraAttributesForEntryMethodTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/FSharpTests.cs b/tests/BenchmarkDotNet.IntegrationTests/FSharpTests.cs index 812ae3f73b..2499ca9e12 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/FSharpTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/FSharpTests.cs @@ -1,4 +1,3 @@ -using Xunit.Abstractions; using static FSharpBenchmarks; namespace BenchmarkDotNet.IntegrationTests diff --git a/tests/BenchmarkDotNet.IntegrationTests/FailingProcessSpawnTests.cs b/tests/BenchmarkDotNet.IntegrationTests/FailingProcessSpawnTests.cs index 57fbbcca6b..dbd26546af 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/FailingProcessSpawnTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/FailingProcessSpawnTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs b/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs index 97ff8e2968..8d2558ebe3 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs @@ -1,5 +1,4 @@ -using System.Runtime; -using Xunit.Abstractions; +using System.Runtime; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; diff --git a/tests/BenchmarkDotNet.IntegrationTests/GlobalSetupAttributeInvalidMethodTest.cs b/tests/BenchmarkDotNet.IntegrationTests/GlobalSetupAttributeInvalidMethodTest.cs index 34616e715d..e0ebc4e38e 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/GlobalSetupAttributeInvalidMethodTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/GlobalSetupAttributeInvalidMethodTest.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/InProcessDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/InProcessDiagnoserTests.cs index 4b66eb6b12..41f407ebbc 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/InProcessDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/InProcessDiagnoserTests.cs @@ -6,7 +6,6 @@ using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Toolchains.InProcess.Emit; using BenchmarkDotNet.Toolchains.InProcess.NoEmit; -using Xunit.Abstractions; using RunMode = BenchmarkDotNet.Diagnosers.RunMode; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/InProcessEmitTest.cs b/tests/BenchmarkDotNet.IntegrationTests/InProcessEmitTest.cs index 8048687ad0..ea613ae0bb 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/InProcessEmitTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/InProcessEmitTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Engines; @@ -12,7 +12,6 @@ using BenchmarkDotNet.Toolchains.InProcess.Emit; using BenchmarkDotNet.Toolchains.Roslyn; using JetBrains.Annotations; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/InProcessTest.cs b/tests/BenchmarkDotNet.IntegrationTests/InProcessTest.cs index 41e1605c6c..f6868a1681 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/InProcessTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/InProcessTest.cs @@ -16,7 +16,6 @@ using System.Linq.Expressions; using System.Reflection; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests diff --git a/tests/BenchmarkDotNet.IntegrationTests/JitOptimizationsTests.cs b/tests/BenchmarkDotNet.IntegrationTests/JitOptimizationsTests.cs index 1b543918d5..735407181f 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/JitOptimizationsTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/JitOptimizationsTests.cs @@ -1,6 +1,5 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Validators; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs index f0cef0001f..d893323a86 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; @@ -6,7 +6,6 @@ using BenchmarkDotNet.Portability; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/LanguageVersionTests.cs b/tests/BenchmarkDotNet.IntegrationTests/LanguageVersionTests.cs index 59b43ffe12..81c836969c 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/LanguageVersionTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/LanguageVersionTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs b/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs index 5afb8d316d..a67018d097 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; @@ -7,7 +7,6 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs index 732f1066bf..706f4d276f 100755 --- a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Detectors; @@ -21,7 +21,6 @@ using BenchmarkDotNet.Toolchains.NativeAot; using System.Reflection; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs index 4970bed93e..9fd45f8d3c 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs b/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs index 0fc6c25c17..a6a6a002dc 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; @@ -9,7 +9,6 @@ using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; using BenchmarkDotNet.Toolchains; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs b/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs index 6c10af2044..98c5c4820e 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Detectors; using BenchmarkDotNet.Environments; @@ -8,7 +8,6 @@ using BenchmarkDotNet.Portability; using BenchmarkDotNet.Tests.XUnit; using BenchmarkDotNet.Toolchains.NativeAot; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ParamSourceTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ParamSourceTests.cs index 459920ff43..02cd25d208 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ParamSourceTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ParamSourceTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Code; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; @@ -6,7 +6,6 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ParamsTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ParamsTests.cs index 99b8964ff4..5db376879d 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ParamsTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ParamsTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/PathTooLongTests.cs b/tests/BenchmarkDotNet.IntegrationTests/PathTooLongTests.cs index 96969b56d1..bea5d32031 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/PathTooLongTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/PathTooLongTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Tests.XUnit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/PowerManagementApplierTests.cs b/tests/BenchmarkDotNet.IntegrationTests/PowerManagementApplierTests.cs index 666f0b1309..0ed58915d5 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/PowerManagementApplierTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/PowerManagementApplierTests.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Environments; +using BenchmarkDotNet.Environments; using BenchmarkDotNet.Helpers; using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; using System.Globalization; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/PriorityTests.cs b/tests/BenchmarkDotNet.IntegrationTests/PriorityTests.cs index 8ce7444615..093d39db6f 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/PriorityTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/PriorityTests.cs @@ -1,5 +1,4 @@ -using BenchmarkDotNet.Attributes; -using Xunit.Abstractions; +using BenchmarkDotNet.Attributes; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs index e2a3bd7437..f7b1073b84 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; using System.Diagnostics; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ProcessorArchitectureTest.cs b/tests/BenchmarkDotNet.IntegrationTests/ProcessorArchitectureTest.cs index a460b2b249..8a5a07a801 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ProcessorArchitectureTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ProcessorArchitectureTest.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; using BenchmarkDotNet.Tests.Loggers; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/R2RTests.cs b/tests/BenchmarkDotNet.IntegrationTests/R2RTests.cs index f04a9cede0..ff771b58ed 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/R2RTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/R2RTests.cs @@ -6,7 +6,6 @@ using BenchmarkDotNet.Tests.XUnit; using BenchmarkDotNet.Toolchains.DotNetCli; using BenchmarkDotNet.Toolchains.R2R; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ReferencesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ReferencesTests.cs index 491ceea4f6..9daa2db80a 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ReferencesTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ReferencesTests.cs @@ -1,4 +1,3 @@ -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/RoslynToolchainTest.cs b/tests/BenchmarkDotNet.IntegrationTests/RoslynToolchainTest.cs index 0ce8a89033..6ee7743a68 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/RoslynToolchainTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/RoslynToolchainTest.cs @@ -1,9 +1,8 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.XUnit; using BenchmarkDotNet.Toolchains.Roslyn; using System.Globalization; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/RunAsyncTests.cs b/tests/BenchmarkDotNet.IntegrationTests/RunAsyncTests.cs index 54a260491e..d2684a3352 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/RunAsyncTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/RunAsyncTests.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; using BenchmarkDotNet.Toolchains.InProcess.NoEmit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs b/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs index 1ee8323c64..7dda79deac 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.Loggers; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/SetupAndCleanupTests.cs b/tests/BenchmarkDotNet.IntegrationTests/SetupAndCleanupTests.cs index f202c080aa..1c64b63ffd 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/SetupAndCleanupTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/SetupAndCleanupTests.cs @@ -1,7 +1,6 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/StandardErrorTests.cs b/tests/BenchmarkDotNet.IntegrationTests/StandardErrorTests.cs index 91ce6dabe6..a0364abc73 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/StandardErrorTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/StandardErrorTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Tests.Loggers; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/StatResultExtenderTests.cs b/tests/BenchmarkDotNet.IntegrationTests/StatResultExtenderTests.cs index 7517201fe5..5ceb3e30cb 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/StatResultExtenderTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/StatResultExtenderTests.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.Loggers; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/TailCallDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/TailCallDiagnoserTests.cs index 7bcf755ecd..c224cbd47f 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/TailCallDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/TailCallDiagnoserTests.cs @@ -1,4 +1,4 @@ -#if NETFRAMEWORK +#if NETFRAMEWORK using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; @@ -11,8 +11,6 @@ using BenchmarkDotNet.Tests.XUnit; using System.Collections.Generic; using System.Linq; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs index db10f28831..c1f0160278 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs @@ -13,8 +13,6 @@ using BenchmarkDotNet.Toolchains.NativeAot; using BenchmarkDotNet.Detectors; using BenchmarkDotNet.IntegrationTests.Xunit; -using Xunit; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ToolchainTest.cs b/tests/BenchmarkDotNet.IntegrationTests/ToolchainTest.cs index 67788c378f..ec10b6ba8b 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ToolchainTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ToolchainTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Loggers; @@ -7,7 +7,6 @@ using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.Parameters; using BenchmarkDotNet.Toolchains.Results; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ValidatorsTest.cs b/tests/BenchmarkDotNet.IntegrationTests/ValidatorsTest.cs index d591bdbed8..3aa3083d55 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ValidatorsTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ValidatorsTest.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Exporters; using BenchmarkDotNet.Exporters.Csv; @@ -7,7 +7,6 @@ using BenchmarkDotNet.Exporters.Xml; using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Validators; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/ValuesReturnedByBenchmarkTest.cs b/tests/BenchmarkDotNet.IntegrationTests/ValuesReturnedByBenchmarkTest.cs index 2659d92b44..6c35a91748 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ValuesReturnedByBenchmarkTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ValuesReturnedByBenchmarkTest.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.InProcess.Emit; using System.Collections.Immutable; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.IntegrationTests/WakeLockTests.cs b/tests/BenchmarkDotNet.IntegrationTests/WakeLockTests.cs index d2d5ce6cf6..f9cc6fef84 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/WakeLockTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/WakeLockTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Helpers; using BenchmarkDotNet.Running; @@ -6,7 +6,6 @@ using BenchmarkDotNet.Tests.XUnit; using System.Diagnostics; using System.Runtime.Versioning; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests; diff --git a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs index a5d1798bfb..a438cd5e56 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Environments; using BenchmarkDotNet.IntegrationTests.Diagnosers; @@ -9,7 +9,6 @@ using BenchmarkDotNet.Toolchains.DotNetCli; using BenchmarkDotNet.Toolchains.MonoAotLLVM; using BenchmarkDotNet.Toolchains.MonoWasm; -using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { diff --git a/tests/BenchmarkDotNet.Tests/Analysers/OutliersAnalyserTests.cs b/tests/BenchmarkDotNet.Tests/Analysers/OutliersAnalyserTests.cs index 7d76b49dc4..ff757eed69 100644 --- a/tests/BenchmarkDotNet.Tests/Analysers/OutliersAnalyserTests.cs +++ b/tests/BenchmarkDotNet.Tests/Analysers/OutliersAnalyserTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Analysers; +using BenchmarkDotNet.Analysers; using BenchmarkDotNet.Helpers; using BenchmarkDotNet.Mathematics; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Analysers { diff --git a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj index ab52a99e1f..174a054d99 100755 --- a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj +++ b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj @@ -9,6 +9,10 @@ false $(NoWarn);NU1701;1701;CA1018;CA2007;CA1825 + + + + Always diff --git a/tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs b/tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs index c9aaac1c52..a02960ff73 100644 --- a/tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs +++ b/tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs @@ -1,7 +1,6 @@ using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Reports; using BenchmarkDotNet.Tests.Mocks; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Columns { diff --git a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs index a6998db18b..6460648c2d 100644 --- a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs @@ -1,4 +1,4 @@ -using AwesomeAssertions; +using AwesomeAssertions; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.ConsoleArguments; @@ -21,7 +21,6 @@ using BenchmarkDotNet.Toolchains.NativeAot; using Perfolizer.Horology; using System.Reflection; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests { diff --git a/tests/BenchmarkDotNet.Tests/Configs/CategoriesTests.cs b/tests/BenchmarkDotNet.Tests/Configs/CategoriesTests.cs index 0f06425276..485b0e6942 100644 --- a/tests/BenchmarkDotNet.Tests/Configs/CategoriesTests.cs +++ b/tests/BenchmarkDotNet.Tests/Configs/CategoriesTests.cs @@ -2,7 +2,6 @@ using BenchmarkDotNet.Configs; using BenchmarkDotNet.Running; using System.Reflection; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Configs { diff --git a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/LinuxCpuInfoParserTests.cs b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/LinuxCpuInfoParserTests.cs index eacb726fd6..393bd2798b 100644 --- a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/LinuxCpuInfoParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/LinuxCpuInfoParserTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Detectors.Cpu.Linux; +using BenchmarkDotNet.Detectors.Cpu.Linux; using Perfolizer.Models; -using Xunit.Abstractions; using static Perfolizer.Horology.Frequency; namespace BenchmarkDotNet.Tests.Detectors.Cpu; diff --git a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/PowershellWmiCpuInfoParserTests.cs b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/PowershellWmiCpuInfoParserTests.cs index fd9d1cc5cf..307a994ef6 100644 --- a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/PowershellWmiCpuInfoParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/PowershellWmiCpuInfoParserTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Detectors.Cpu.Windows; +using BenchmarkDotNet.Detectors.Cpu.Windows; using Perfolizer.Models; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Detectors.Cpu; diff --git a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/SysctlCpuInfoParserTests.cs b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/SysctlCpuInfoParserTests.cs index 2b2a4b32af..da992b2bb5 100644 --- a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/SysctlCpuInfoParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/SysctlCpuInfoParserTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Detectors.Cpu.macOS; +using BenchmarkDotNet.Detectors.Cpu.macOS; using Perfolizer.Models; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Detectors.Cpu; diff --git a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/TestHelper.cs b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/TestHelper.cs index 229a996641..7d56657417 100644 --- a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/TestHelper.cs +++ b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/TestHelper.cs @@ -1,8 +1,7 @@ -using JetBrains.Annotations; +using JetBrains.Annotations; using Perfolizer.Helpers; using Perfolizer.Models; using System.Reflection; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Detectors.Cpu; diff --git a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/WmicCpuInfoParserTests.cs b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/WmicCpuInfoParserTests.cs index 5a053da2cd..02d56027e3 100644 --- a/tests/BenchmarkDotNet.Tests/Detectors/Cpu/WmicCpuInfoParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/Detectors/Cpu/WmicCpuInfoParserTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Detectors.Cpu.Windows; +using BenchmarkDotNet.Detectors.Cpu.Windows; using Perfolizer.Models; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Detectors.Cpu; diff --git a/tests/BenchmarkDotNet.Tests/Engine/EngineActualStageTests.cs b/tests/BenchmarkDotNet.Tests/Engine/EngineActualStageTests.cs index bba6098896..2009213204 100644 --- a/tests/BenchmarkDotNet.Tests/Engine/EngineActualStageTests.cs +++ b/tests/BenchmarkDotNet.Tests/Engine/EngineActualStageTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Engines; +using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.Mocks; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Engine { diff --git a/tests/BenchmarkDotNet.Tests/Engine/EnginePilotStageTests.cs b/tests/BenchmarkDotNet.Tests/Engine/EnginePilotStageTests.cs index f5a200a5b5..35e989a893 100644 --- a/tests/BenchmarkDotNet.Tests/Engine/EnginePilotStageTests.cs +++ b/tests/BenchmarkDotNet.Tests/Engine/EnginePilotStageTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Engines; +using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Tests.Mocks; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Engine { diff --git a/tests/BenchmarkDotNet.Tests/Engine/EngineWarmupStageTests.cs b/tests/BenchmarkDotNet.Tests/Engine/EngineWarmupStageTests.cs index 4e07cebe4c..51c13c037e 100644 --- a/tests/BenchmarkDotNet.Tests/Engine/EngineWarmupStageTests.cs +++ b/tests/BenchmarkDotNet.Tests/Engine/EngineWarmupStageTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Mocks; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Engine { diff --git a/tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs b/tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs index dd1fb48a08..2a83781f14 100644 --- a/tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs +++ b/tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Loggers; +using BenchmarkDotNet.Loggers; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Loggers { diff --git a/tests/BenchmarkDotNet.Tests/Mathematics/StatisticsTests.cs b/tests/BenchmarkDotNet.Tests/Mathematics/StatisticsTests.cs index 65b971d3ab..5f777eeb6f 100644 --- a/tests/BenchmarkDotNet.Tests/Mathematics/StatisticsTests.cs +++ b/tests/BenchmarkDotNet.Tests/Mathematics/StatisticsTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Mathematics; +using BenchmarkDotNet.Mathematics; using BenchmarkDotNet.Tests.Common; using JetBrains.Annotations; using Pragmastat.Exceptions; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Mathematics; diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs b/tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs index 4098ccd79f..59dcb72633 100644 --- a/tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs +++ b/tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs @@ -1,10 +1,9 @@ -using BenchmarkDotNet.Characteristics; +using BenchmarkDotNet.Characteristics; using BenchmarkDotNet.Engines; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Reports; using BenchmarkDotNet.Running; using Perfolizer.Horology; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Mocks { diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs b/tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs index 9353bfe005..b5d9788ef2 100644 --- a/tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs +++ b/tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs @@ -7,7 +7,6 @@ using BenchmarkDotNet.Running; using BenchmarkDotNet.Tests.Helpers; using BenchmarkDotNet.Tests.Mocks.Toolchain; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Mocks { diff --git a/tests/BenchmarkDotNet.Tests/Perfonar/PerfonarTests.cs b/tests/BenchmarkDotNet.Tests/Perfonar/PerfonarTests.cs index b78d29fd8c..81d35e488d 100644 --- a/tests/BenchmarkDotNet.Tests/Perfonar/PerfonarTests.cs +++ b/tests/BenchmarkDotNet.Tests/Perfonar/PerfonarTests.cs @@ -9,7 +9,6 @@ using Perfolizer.Models; using Perfolizer.Perfonar.Base; using Perfolizer.Perfonar.Tables; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Perfonar; diff --git a/tests/BenchmarkDotNet.Tests/Reports/ColumnTests.cs b/tests/BenchmarkDotNet.Tests/Reports/ColumnTests.cs index b95df5322d..a907c78d95 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/ColumnTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/ColumnTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Columns; +using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Exporters; using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Reports; using BenchmarkDotNet.Tests.Helpers; using BenchmarkDotNet.Tests.Mocks; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/Reports/DefaultColumnProvidersTests.cs b/tests/BenchmarkDotNet.Tests/Reports/DefaultColumnProvidersTests.cs index 454dc99960..f07400db9e 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/DefaultColumnProvidersTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/DefaultColumnProvidersTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Exporters; @@ -6,7 +6,6 @@ using BenchmarkDotNet.Reports; using BenchmarkDotNet.Tests.Helpers; using BenchmarkDotNet.Tests.Mocks; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/Reports/DisplayPrecisionManagerTests.cs b/tests/BenchmarkDotNet.Tests/Reports/DisplayPrecisionManagerTests.cs index f70f8c075d..20bb87fa88 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/DisplayPrecisionManagerTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/DisplayPrecisionManagerTests.cs @@ -1,6 +1,5 @@ using BenchmarkDotNet.Reports; using JetBrains.Annotations; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/Reports/RatioPrecisionTests.cs b/tests/BenchmarkDotNet.Tests/Reports/RatioPrecisionTests.cs index 4beeedf5cc..01a346aeb4 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/RatioPrecisionTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/RatioPrecisionTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Engines; @@ -11,7 +11,6 @@ using BenchmarkDotNet.Toolchains; using BenchmarkDotNet.Toolchains.Results; using System.Collections.Immutable; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/Reports/RatioStyleTests.cs b/tests/BenchmarkDotNet.Tests/Reports/RatioStyleTests.cs index f47df0244d..2ae4cd9c52 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/RatioStyleTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/RatioStyleTests.cs @@ -12,7 +12,6 @@ using BenchmarkDotNet.Toolchains.Results; using JetBrains.Annotations; using System.Collections.Immutable; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/Reports/SummaryTableTests.cs b/tests/BenchmarkDotNet.Tests/Reports/SummaryTableTests.cs index fb96014ea6..b354fc449d 100644 --- a/tests/BenchmarkDotNet.Tests/Reports/SummaryTableTests.cs +++ b/tests/BenchmarkDotNet.Tests/Reports/SummaryTableTests.cs @@ -1,4 +1,4 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Diagnosers; @@ -8,7 +8,6 @@ using BenchmarkDotNet.Reports; using BenchmarkDotNet.Tests.Helpers; using BenchmarkDotNet.Tests.Mocks; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests.Reports { diff --git a/tests/BenchmarkDotNet.Tests/SourceCodeHelperTests.cs b/tests/BenchmarkDotNet.Tests/SourceCodeHelperTests.cs index a4509dc722..0770a34f93 100644 --- a/tests/BenchmarkDotNet.Tests/SourceCodeHelperTests.cs +++ b/tests/BenchmarkDotNet.Tests/SourceCodeHelperTests.cs @@ -1,6 +1,5 @@ -using BenchmarkDotNet.Helpers; +using BenchmarkDotNet.Helpers; using System.Reflection; -using Xunit.Abstractions; namespace BenchmarkDotNet.Tests { diff --git a/tests/BenchmarkDotNet.Tests/TypeFilterTests.cs b/tests/BenchmarkDotNet.Tests/TypeFilterTests.cs index 4407c21f17..1f3e6e7918 100644 --- a/tests/BenchmarkDotNet.Tests/TypeFilterTests.cs +++ b/tests/BenchmarkDotNet.Tests/TypeFilterTests.cs @@ -1,11 +1,10 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.ConsoleArguments; using BenchmarkDotNet.Extensions; using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Tests; using BenchmarkDotNet.Tests.Loggers; using JetBrains.Annotations; -using Xunit.Abstractions; using TypeFilter = BenchmarkDotNet.Running.TypeFilter; namespace BenchmarkDotNet.Tests diff --git a/tests/BenchmarkDotNet.Tests/Validators/ParamsValidatorTests.cs b/tests/BenchmarkDotNet.Tests/Validators/ParamsValidatorTests.cs index 6b3bbac76d..4246586f8c 100644 --- a/tests/BenchmarkDotNet.Tests/Validators/ParamsValidatorTests.cs +++ b/tests/BenchmarkDotNet.Tests/Validators/ParamsValidatorTests.cs @@ -1,8 +1,7 @@ -using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Running; using BenchmarkDotNet.Validators; using System.Diagnostics.CodeAnalysis; -using Xunit.Abstractions; #pragma warning disable CS0414 namespace BenchmarkDotNet.Tests.Validators diff --git a/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementCheckerTests.cs b/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementCheckerTests.cs index e5125d0076..f06d5483a5 100644 --- a/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementCheckerTests.cs +++ b/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementCheckerTests.cs @@ -1,4 +1,3 @@ -using Xunit; namespace BenchmarkDotNet.Tests.XUnit; diff --git a/tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs index 5fa7ffab52..6c57f08078 100644 --- a/tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs +++ b/tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs @@ -1,4 +1,3 @@ -using Xunit; namespace BenchmarkDotNet.Tests.XUnit; diff --git a/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs b/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs index c65c2d2a68..dba7caa4c2 100644 --- a/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs +++ b/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs @@ -1,4 +1,3 @@ -using Xunit.Abstractions; using Xunit.Sdk; namespace BenchmarkDotNet.Tests.XUnit; diff --git a/tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs index 1d0681036f..3303797884 100644 --- a/tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs +++ b/tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs @@ -1,4 +1,3 @@ -using Xunit; namespace BenchmarkDotNet.Tests.XUnit; From 05235ac312564dd70cd6cc4df691c4f3b05370d6 Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Sat, 18 Apr 2026 12:20:44 +0900 Subject: [PATCH 2/3] chore: move source shared files to dedicated directory --- ...nTests.ManualRunning.MultipleFrameworks.csproj | 9 +++------ ...rkDotNet.IntegrationTests.ManualRunning.csproj | 10 ++++------ .../BenchmarkDotNet.IntegrationTests.csproj | 4 +++- .../ExporterIOTests.cs | 1 + .../{ => Shared}/BenchmarkTestExecutor.cs | 0 .../{Xunit => Shared}/Extensions.cs | 0 .../MisconfiguredEnvironmentException.cs | 0 .../{ => Shared}/TestConfigs.cs | 0 .../TestCultureInfo.cs | 15 --------------- .../BenchmarkDotNet.Tests.csproj | 3 +++ .../Builders/HostEnvironmentInfoBuilder.cs | 0 .../{ => Shared}/Helpers/ExporterTestHelper.cs | 0 .../{ => Shared}/Loggers/OutputLogger.cs | 0 .../{ => Shared}/Mocks/MockClock.cs | 0 .../{ => Shared}/Mocks/MockEngine.cs | 0 .../{ => Shared}/Mocks/MockFactory.cs | 0 .../{ => Shared}/Mocks/MockRunner.cs | 0 .../{ => Shared}/Mocks/Toolchain/MockToolchain.cs | 0 .../{ => Shared}/TestCultureInfo.cs | 0 .../{ => Shared}/XUnit/EnvRequirement.cs | 0 .../{ => Shared}/XUnit/EnvRequirementChecker.cs | 0 .../{ => Shared}/XUnit/FactEnvSpecific.cs | 0 .../{ => Shared}/XUnit/InlineDataEnvSpecific.cs | 0 .../XUnit/InlineDataEnvSpecificDiscoverer.cs | 0 .../{ => Shared}/XUnit/SmartAssert.cs | 0 .../{ => Shared}/XUnit/TheoryEnvSpecific.cs | 0 26 files changed, 14 insertions(+), 28 deletions(-) rename tests/BenchmarkDotNet.IntegrationTests/{ => Shared}/BenchmarkTestExecutor.cs (100%) rename tests/BenchmarkDotNet.IntegrationTests/{Xunit => Shared}/Extensions.cs (100%) rename tests/BenchmarkDotNet.IntegrationTests/{Xunit => Shared}/MisconfiguredEnvironmentException.cs (100%) rename tests/BenchmarkDotNet.IntegrationTests/{ => Shared}/TestConfigs.cs (100%) delete mode 100644 tests/BenchmarkDotNet.IntegrationTests/TestCultureInfo.cs rename tests/BenchmarkDotNet.Tests/{ => Shared}/Builders/HostEnvironmentInfoBuilder.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Helpers/ExporterTestHelper.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Loggers/OutputLogger.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Mocks/MockClock.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Mocks/MockEngine.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Mocks/MockFactory.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Mocks/MockRunner.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/Mocks/Toolchain/MockToolchain.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/TestCultureInfo.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/EnvRequirement.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/EnvRequirementChecker.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/FactEnvSpecific.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/InlineDataEnvSpecific.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/InlineDataEnvSpecificDiscoverer.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/SmartAssert.cs (100%) rename tests/BenchmarkDotNet.Tests/{ => Shared}/XUnit/TheoryEnvSpecific.cs (100%) diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj index e79096985b..d7e229b621 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj @@ -20,12 +20,9 @@ - - - - - - + + + diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj index bd82d42fbb..6a05e2c1b7 100755 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj @@ -26,13 +26,11 @@ - - - - - - + + + + Always diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj index 605c77ef9a..9da34e4662 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj @@ -33,9 +33,11 @@ - + + + diff --git a/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs index d70a3a2356..e8f8795895 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/ExporterIOTests.cs @@ -5,6 +5,7 @@ using BenchmarkDotNet.Loggers; using BenchmarkDotNet.Reports; using BenchmarkDotNet.Running; +using BenchmarkDotNet.Tests; using BenchmarkDotNet.Tests.XUnit; using System.Collections.Immutable; diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs b/tests/BenchmarkDotNet.IntegrationTests/Shared/BenchmarkTestExecutor.cs similarity index 100% rename from tests/BenchmarkDotNet.IntegrationTests/BenchmarkTestExecutor.cs rename to tests/BenchmarkDotNet.IntegrationTests/Shared/BenchmarkTestExecutor.cs diff --git a/tests/BenchmarkDotNet.IntegrationTests/Xunit/Extensions.cs b/tests/BenchmarkDotNet.IntegrationTests/Shared/Extensions.cs similarity index 100% rename from tests/BenchmarkDotNet.IntegrationTests/Xunit/Extensions.cs rename to tests/BenchmarkDotNet.IntegrationTests/Shared/Extensions.cs diff --git a/tests/BenchmarkDotNet.IntegrationTests/Xunit/MisconfiguredEnvironmentException.cs b/tests/BenchmarkDotNet.IntegrationTests/Shared/MisconfiguredEnvironmentException.cs similarity index 100% rename from tests/BenchmarkDotNet.IntegrationTests/Xunit/MisconfiguredEnvironmentException.cs rename to tests/BenchmarkDotNet.IntegrationTests/Shared/MisconfiguredEnvironmentException.cs diff --git a/tests/BenchmarkDotNet.IntegrationTests/TestConfigs.cs b/tests/BenchmarkDotNet.IntegrationTests/Shared/TestConfigs.cs similarity index 100% rename from tests/BenchmarkDotNet.IntegrationTests/TestConfigs.cs rename to tests/BenchmarkDotNet.IntegrationTests/Shared/TestConfigs.cs diff --git a/tests/BenchmarkDotNet.IntegrationTests/TestCultureInfo.cs b/tests/BenchmarkDotNet.IntegrationTests/TestCultureInfo.cs deleted file mode 100644 index ad9bbacd38..0000000000 --- a/tests/BenchmarkDotNet.IntegrationTests/TestCultureInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using BenchmarkDotNet.Helpers; -using System.Globalization; - -namespace BenchmarkDotNet.IntegrationTests -{ - internal static class TestCultureInfo - { - public static readonly CultureInfo Instance; - - static TestCultureInfo() - { - Instance = (CultureInfo) DefaultCultureInfo.Instance.Clone(); - } - } -} \ No newline at end of file diff --git a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj index 174a054d99..a72dd579a3 100755 --- a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj +++ b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj @@ -41,6 +41,9 @@ + + + diff --git a/tests/BenchmarkDotNet.Tests/Builders/HostEnvironmentInfoBuilder.cs b/tests/BenchmarkDotNet.Tests/Shared/Builders/HostEnvironmentInfoBuilder.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Builders/HostEnvironmentInfoBuilder.cs rename to tests/BenchmarkDotNet.Tests/Shared/Builders/HostEnvironmentInfoBuilder.cs diff --git a/tests/BenchmarkDotNet.Tests/Helpers/ExporterTestHelper.cs b/tests/BenchmarkDotNet.Tests/Shared/Helpers/ExporterTestHelper.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Helpers/ExporterTestHelper.cs rename to tests/BenchmarkDotNet.Tests/Shared/Helpers/ExporterTestHelper.cs diff --git a/tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs b/tests/BenchmarkDotNet.Tests/Shared/Loggers/OutputLogger.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Loggers/OutputLogger.cs rename to tests/BenchmarkDotNet.Tests/Shared/Loggers/OutputLogger.cs diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockClock.cs b/tests/BenchmarkDotNet.Tests/Shared/Mocks/MockClock.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Mocks/MockClock.cs rename to tests/BenchmarkDotNet.Tests/Shared/Mocks/MockClock.cs diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs b/tests/BenchmarkDotNet.Tests/Shared/Mocks/MockEngine.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Mocks/MockEngine.cs rename to tests/BenchmarkDotNet.Tests/Shared/Mocks/MockEngine.cs diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockFactory.cs b/tests/BenchmarkDotNet.Tests/Shared/Mocks/MockFactory.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Mocks/MockFactory.cs rename to tests/BenchmarkDotNet.Tests/Shared/Mocks/MockFactory.cs diff --git a/tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs b/tests/BenchmarkDotNet.Tests/Shared/Mocks/MockRunner.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs rename to tests/BenchmarkDotNet.Tests/Shared/Mocks/MockRunner.cs diff --git a/tests/BenchmarkDotNet.Tests/Mocks/Toolchain/MockToolchain.cs b/tests/BenchmarkDotNet.Tests/Shared/Mocks/Toolchain/MockToolchain.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/Mocks/Toolchain/MockToolchain.cs rename to tests/BenchmarkDotNet.Tests/Shared/Mocks/Toolchain/MockToolchain.cs diff --git a/tests/BenchmarkDotNet.Tests/TestCultureInfo.cs b/tests/BenchmarkDotNet.Tests/Shared/TestCultureInfo.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/TestCultureInfo.cs rename to tests/BenchmarkDotNet.Tests/Shared/TestCultureInfo.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirement.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/EnvRequirement.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/EnvRequirement.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/EnvRequirement.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementChecker.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/EnvRequirementChecker.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/EnvRequirementChecker.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/EnvRequirementChecker.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/FactEnvSpecific.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/FactEnvSpecific.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/FactEnvSpecific.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecific.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecificDiscoverer.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/InlineDataEnvSpecificDiscoverer.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecificDiscoverer.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/SmartAssert.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/SmartAssert.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/SmartAssert.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/SmartAssert.cs diff --git a/tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/TheoryEnvSpecific.cs similarity index 100% rename from tests/BenchmarkDotNet.Tests/XUnit/TheoryEnvSpecific.cs rename to tests/BenchmarkDotNet.Tests/Shared/XUnit/TheoryEnvSpecific.cs From 712f5e4d248dd5ad2ac412f441ac5282dd6e00ca Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Sat, 18 Apr 2026 14:36:36 +0900 Subject: [PATCH 3/3] chore: modify assembly name for datadiscoverer --- .../Shared/XUnit/InlineDataEnvSpecific.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs b/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs index 9c9bbf70e1..65acf07295 100644 --- a/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs +++ b/tests/BenchmarkDotNet.Tests/Shared/XUnit/InlineDataEnvSpecific.cs @@ -1,9 +1,9 @@ -using System.Reflection; +using System.Reflection; using Xunit.Sdk; namespace BenchmarkDotNet.Tests.XUnit; -[DataDiscoverer("BenchmarkDotNet.Tests.XUnit.InlineDataEnvSpecificDiscoverer", "BenchmarkDotNet.Tests")] +[DataDiscoverer("BenchmarkDotNet.Tests.XUnit.InlineDataEnvSpecificDiscoverer", "BenchmarkDotNet.IntegrationTests")] [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] public class InlineDataEnvSpecific : DataAttribute {