Revert BuildPartition.Id.

Include configuration in BinariesDirectoryPath.

Author: timcassell

src/BenchmarkDotNet/Jobs/JobExtensions.cs

@@ -436,5 +436,10 @@ private static Job WithCore(this Job job, Action<Job> updateCallback)
  updateCallback(newJob);
  return newJob;
  }
+
+ internal static bool HasDynamicBuildCharacteristic(this Job job) =>
+ job.HasValue(InfrastructureMode.NuGetReferencesCharacteristic)
+ || job.HasValue(InfrastructureMode.BuildConfigurationCharacteristic)
+ || job.HasValue(InfrastructureMode.ArgumentsCharacteristic);
  }
 }

src/BenchmarkDotNet/Running/BuildPartition.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Threading;
 using BenchmarkDotNet.Characteristics;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Environments;
@@ -19,30 +18,20 @@ namespace BenchmarkDotNet.Running
 {
  public class BuildPartition
  {
- private static int s_id;
-
  public BuildPartition(BenchmarkBuildInfo[] benchmarks, IResolver resolver)
  {
- var guid = Guid.NewGuid();
  Resolver = resolver;
  RepresentativeBenchmarkCase = benchmarks[0].BenchmarkCase;
  Benchmarks = benchmarks;
- ProgramName = benchmarks[0].Config.Options.IsSet(ConfigOptions.KeepBenchmarkFiles) ? RepresentativeBenchmarkCase.Job.FolderInfo : guid.ToString();
+ ProgramName = benchmarks[0].Config.Options.IsSet(ConfigOptions.KeepBenchmarkFiles) ? RepresentativeBenchmarkCase.Job.FolderInfo : Guid.NewGuid().ToString();
  LogBuildOutput = benchmarks[0].Config.Options.IsSet(ConfigOptions.LogBuildOutput);
  GenerateMSBuildBinLog = benchmarks[0].Config.Options.IsSet(ConfigOptions.GenerateMSBuildBinLog);
-
- Id = $"{Interlocked.Increment(ref s_id)}_";
- var random = new Random(guid.GetHashCode());
- for (int i = 0; i < 6; i++)
- Id += (char) ('A' + random.Next(26));
  }
 
  public BenchmarkBuildInfo[] Benchmarks { get; }
 
  public string ProgramName { get; }
 
- public string Id { get; }
-
  /// <summary>
  /// the benchmarks are grouped by the build settings
  /// so you can use this benchmark to get the runtime settings
@@ -98,11 +87,7 @@ internal bool ForcedNoDependenciesForIntegrationTests
  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;
+ return !job.HasDynamicBuildCharacteristic();
  }
  }
  }

src/BenchmarkDotNet/Toolchains/CoreRun/CoreRunGenerator.cs

@@ -23,8 +23,8 @@ public CoreRunGenerator(FileInfo sourceCoreRun, FileInfo copyCoreRun, string tar
 
  protected override string GetPackagesDirectoryPath(string buildArtifactsDirectoryPath) => PackagesPath;
 
- protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), "publish");
+ protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, "publish");
 
  protected override void CopyAllRequiredFiles(ArtifactsPaths artifactsPaths)
  {

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

@@ -61,15 +61,11 @@ protected override string GetBuildArtifactsDirectoryPath(BuildPartition buildPar
  protected override string GetProjectFilePath(string buildArtifactsDirectoryPath)
  => Path.Combine(buildArtifactsDirectoryPath, "BenchmarkDotNet.Autogenerated.csproj");
 
- protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => buildPartition.ForcedNoDependenciesForIntegrationTests
- ? Path.Combine(buildArtifactsDirectoryPath, "bin", buildPartition.BuildConfiguration, TargetFrameworkMoniker)
- : Path.Combine(buildArtifactsDirectoryPath, "bin", $"bdn_partition_{buildPartition.Id}");
-
- protected override string GetIntermediateDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => buildPartition.ForcedNoDependenciesForIntegrationTests
- ? Path.Combine(buildArtifactsDirectoryPath, "obj", buildPartition.BuildConfiguration, TargetFrameworkMoniker)
- : Path.Combine(buildArtifactsDirectoryPath, "obj", $"bdn_partition_{buildPartition.Id}");
+ protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker);
+
+ protected override string GetIntermediateDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "obj", configuration, TargetFrameworkMoniker);
 
  [SuppressMessage("ReSharper", "StringLiteralTypo")] // R# complains about $variables$
  protected override void GenerateProject(BuildPartition buildPartition, ArtifactsPaths artifactsPaths, ILogger logger)

src/BenchmarkDotNet/Toolchains/GeneratorBase.cs

@@ -45,14 +45,14 @@ public GenerateResult GenerateProject(BuildPartition buildPartition, ILogger log
  /// <summary>
  /// returns a path where executable should be found after the build (usually \bin)
  /// </summary>
- [PublicAPI] protected virtual string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
+ [PublicAPI] protected virtual string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
  => buildArtifactsDirectoryPath;
 
  /// <summary>
  /// returns a path where intermediate files should be found after the build (usually \obj)
  /// </summary>
  [PublicAPI]
- protected virtual string GetIntermediateDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
+ protected virtual string GetIntermediateDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
  => string.Empty;
 
  /// <summary>
@@ -127,15 +127,15 @@ private ArtifactsPaths GetArtifactsPaths(BuildPartition buildPartition, string r
 
  string programName = buildPartition.ProgramName;
  string buildArtifactsDirectoryPath = GetBuildArtifactsDirectoryPath(buildPartition, programName);
- string binariesDirectoryPath = GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition);
+ string binariesDirectoryPath = GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition.BuildConfiguration);
 
  string executablePath = GetExecutablePath(binariesDirectoryPath, programName);
 
  return new ArtifactsPaths(
  rootArtifactsFolderPath: rootArtifactsFolderPath,
  buildArtifactsDirectoryPath: buildArtifactsDirectoryPath,
  binariesDirectoryPath: binariesDirectoryPath,
- intermediateDirectoryPath: GetIntermediateDirectoryPath(buildArtifactsDirectoryPath, buildPartition),
+ intermediateDirectoryPath: GetIntermediateDirectoryPath(buildArtifactsDirectoryPath, buildPartition.BuildConfiguration),
  programCodePath: Path.Combine(buildArtifactsDirectoryPath, $"{programName}{codeFileExtension}"),
  appConfigPath: $"{executablePath}.config",
  nuGetConfigPath: Path.Combine(buildArtifactsDirectoryPath, "NuGet.config"),

src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs

@@ -58,9 +58,7 @@ protected override string GetExecutablePath(string binariesDirectoryPath, string
  ? Path.Combine(binariesDirectoryPath, $"{programName}.exe")
  : Path.Combine(binariesDirectoryPath, programName);
 
- protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => buildPartition.ForcedNoDependenciesForIntegrationTests
- ? Path.Combine(buildArtifactsDirectoryPath, "bin", TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish")
- : Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish");
+ protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish");
  }
 }

src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs

@@ -68,9 +68,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)
- => buildPartition.ForcedNoDependenciesForIntegrationTests
- ? Path.Combine(buildArtifactsDirectoryPath, "bin", TargetFrameworkMoniker, "browser-wasm", "AppBundle")
- : Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), "browser-wasm", "AppBundle");
+ protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, "browser-wasm", "AppBundle");
  }
 }

src/BenchmarkDotNet/Toolchains/NativeAot/Generator.cs

@@ -64,8 +64,8 @@ protected override string GetBuildArtifactsDirectoryPath(BuildPartition buildPar
  ? Path.Combine(Path.GetTempPath(), programName) // store everything in temp to avoid collisions with IDE
  : base.GetBuildArtifactsDirectoryPath(buildPartition, programName);
 
- protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
- => Path.Combine(base.GetBinariesDirectoryPath(buildArtifactsDirectoryPath, buildPartition), runtimeIdentifier, "publish");
+ protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
+ => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, runtimeIdentifier, "publish");
 
  protected override void GenerateBuildScript(BuildPartition buildPartition, ArtifactsPaths artifactsPaths)
  {

src/BenchmarkDotNet/Toolchains/ToolchainExtensions.cs

@@ -28,9 +28,7 @@ private static IToolchain GetToolchain(Job job, Descriptor descriptor)
  : GetToolchain(
  job.ResolveValue(EnvironmentMode.RuntimeCharacteristic, EnvironmentResolver.Instance),
  descriptor,
- job.HasValue(InfrastructureMode.NuGetReferencesCharacteristic)
- || job.HasValue(InfrastructureMode.BuildConfigurationCharacteristic)
- || job.HasValue(InfrastructureMode.ArgumentsCharacteristic));
+ job.HasDynamicBuildCharacteristic());
 
  internal static IToolchain GetToolchain(this Runtime runtime, Descriptor? descriptor = null, bool preferMsBuildToolchains = false)
  {