Moved no dependencies check for integration tests to BuildPartition.

Removed instead of deprecated methods/properties.

Author: timcassell

src/BenchmarkDotNet/Helpers/XUnitHelper.cs

@@ -1,4 +1,3 @@
-using BenchmarkDotNet.Portability;
 using System;
 using System.Linq;
 
@@ -8,6 +7,4 @@ internal static class XUnitHelper
 {
  public static Lazy<bool> IsIntegrationTest =
  new (() => AppDomain.CurrentDomain.GetAssemblies().Any(assembly => assembly.GetName().Name == "BenchmarkDotNet.IntegrationTests"));
-
- public static bool ForceNoDependenciesForCore => IsIntegrationTest.Value && RuntimeInformation.IsNetCore;
 }

src/BenchmarkDotNet/Running/BuildPartition.cs

@@ -5,8 +5,12 @@
 using BenchmarkDotNet.Characteristics;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Environments;
+using BenchmarkDotNet.Helpers;
 using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Portability;
+using BenchmarkDotNet.Toolchains;
 using BenchmarkDotNet.Toolchains.CsProj;
+using BenchmarkDotNet.Toolchains.DotNetCli;
 using BenchmarkDotNet.Toolchains.MonoWasm;
 using BenchmarkDotNet.Toolchains.Roslyn;
 using JetBrains.Annotations;
@@ -83,5 +87,24 @@ private static string GetResolvedAssemblyLocation(Assembly assembly) =>
  // in case of SingleFile, location.Length returns 0, so we use GetName() and
  // manually construct the path.
  assembly.Location.Length == 0 ? Path.Combine(AppContext.BaseDirectory, assembly.GetName().Name) : assembly.Location;
+
+ internal bool ForcedNoDependenciesForIntegrationTests
+ {
+ get
+ {
+ if (!XUnitHelper.IsIntegrationTest.Value || !RuntimeInformation.IsNetCore)
+ return false;
+
+ var job = RepresentativeBenchmarkCase.Job;
+ if (job.GetToolchain().Builder is not DotNetCliBuilder)
+ return false;
+
+ bool hasDynamicBuildCharacteristic = job.HasValue(InfrastructureMode.NuGetReferencesCharacteristic)
+ || job.HasValue(InfrastructureMode.BuildConfigurationCharacteristic)
+ || job.HasValue(InfrastructureMode.ArgumentsCharacteristic);
+
+ return !hasDynamicBuildCharacteristic;
+ }
+ }
  }
 }

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

@@ -61,7 +61,7 @@ protected override string GetProjectFilePath(string buildArtifactsDirectoryPath)
  => Path.Combine(buildArtifactsDirectoryPath, "BenchmarkDotNet.Autogenerated.csproj");
 
  protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => XUnitHelper.ForceNoDependenciesForCore
+ => buildPartition.ForcedNoDependenciesForIntegrationTests
  ? Path.Combine(buildArtifactsDirectoryPath, "bin", buildPartition.BuildConfiguration, TargetFrameworkMoniker)
  : Path.Combine(buildArtifactsDirectoryPath, "bin", $"bdn_partition_{buildPartition.Id}");
 

src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
 using System.Linq;
 using System.Text;
 using BenchmarkDotNet.Characteristics;
 using BenchmarkDotNet.Extensions;
-using BenchmarkDotNet.Helpers;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Portability;
@@ -34,9 +31,6 @@ public class DotNetCliCommand
 
  [PublicAPI] public bool LogOutput { get; }
 
- [Obsolete("Building with no dependencies is no longer supported.", false), EditorBrowsable(EditorBrowsableState.Never)]
- public bool RetryFailedBuildWithNoDeps => false;
-
  public DotNetCliCommand(string cliPath, string arguments, GenerateResult generateResult, ILogger logger,
  BuildPartition buildPartition, IReadOnlyList<EnvironmentVariable> environmentVariables, TimeSpan timeout, bool logOutput = false)
  {
@@ -77,11 +71,11 @@ public BuildResult RestoreThenBuild()
 
  // On our CI, Integration tests take too much time, because each benchmark run rebuilds BenchmarkDotNet itself.
  // To reduce the total duration of the CI workflows, we build all the projects without dependencies
- if (XUnitHelper.ForceNoDependenciesForCore)
+ if (BuildPartition.ForcedNoDependenciesForIntegrationTests)
  {
-#pragma warning disable CS0618 // Type or member is obsolete
- return BuildNoRestoreNoDependencies().ToBuildResult(GenerateResult);
-#pragma warning restore CS0618 // Type or member is obsolete
+ return DotNetCliCommandExecutor.Execute(WithArguments(
+  GetBuildCommand(GenerateResult.ArtifactsPaths, BuildPartition, $"{Arguments} --no-restore --no-dependencies", "build-no-restore-no-deps", excludeOutput: true)))
+ .ToBuildResult(GenerateResult);
  }
 
  // We no longer retry with --no-dependencies, because it fails with --output set at the same time,
@@ -138,11 +132,6 @@ public DotNetCliCommandResult BuildNoRestore()
  => DotNetCliCommandExecutor.Execute(WithArguments(
  GetBuildCommand(GenerateResult.ArtifactsPaths, BuildPartition, $"{Arguments} --no-restore", "build-no-restore")));
 
- [Obsolete("Building with no dependencies is no longer supported, and will probably fail.", false), EditorBrowsable(EditorBrowsableState.Never)]
- public DotNetCliCommandResult BuildNoRestoreNoDependencies()
- => DotNetCliCommandExecutor.Execute(WithArguments(
- GetBuildCommand(GenerateResult.ArtifactsPaths, BuildPartition, $"{Arguments} --no-restore --no-dependencies", "build-no-restore-no-deps", excludeOutput: true)));
-
  public DotNetCliCommandResult Publish()
  => DotNetCliCommandExecutor.Execute(WithArguments(
  GetPublishCommand(GenerateResult.ArtifactsPaths, BuildPartition, Arguments, "publish")));

src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs

@@ -59,7 +59,7 @@ protected override string GetExecutablePath(string binariesDirectoryPath, string
  : Path.Combine(binariesDirectoryPath, programName);
 
  protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => XUnitHelper.ForceNoDependenciesForCore
+ => buildPartition.ForcedNoDependenciesForIntegrationTests
  ? Path.Combine(buildArtifactsDirectoryPath, "bin", TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish")
  : Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish");
  }

src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs

@@ -69,7 +69,7 @@ protected void GenerateProjectFile(BuildPartition buildPartition, ArtifactsPaths
  protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Path.Combine(binariesDirectoryPath, MainJS);
 
  protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => XUnitHelper.ForceNoDependenciesForCore
+ => buildPartition.ForcedNoDependenciesForIntegrationTests
  ? Path.Combine(buildArtifactsDirectoryPath, "bin", TargetFrameworkMoniker, "browser-wasm", "AppBundle")
  : Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), "browser-wasm", "AppBundle");
  }

tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MsBuildArgumentTests.cs

@@ -21,7 +21,7 @@ public void ProcessIsBuiltWithCustomProperty(bool setCustomProperty)
  .WithArguments(new Argument[] { new MsBuildArgument($"/p:CustomProp={setCustomProperty}") })
  .WithEnvironmentVariable(CustomPropEnvVarName, setCustomProperty.ToString())
  );
- CanExecute<ValuePerTfm>(config);
+ CanExecute<PropertyDefine>(config);
  }
 
  [Fact]
@@ -40,10 +40,10 @@ public void MultipleProcessesAreBuiltWithCorrectProperties()
  .AddJob(Job.Dry
  .WithEnvironmentVariable(CustomPropEnvVarName, false.ToString())
  );
- CanExecute<ValuePerTfm>(config);
+ CanExecute<PropertyDefine>(config);
  }
 
- public class ValuePerTfm
+ public class PropertyDefine
  {
  private const bool customPropWasSet =
 #if CUSTOM_PROP