Use absolute paths, including IntermediateOutputPath.

Enable previously flaky test in all environments.

Author: timcassell

src/BenchmarkDotNet/Toolchains/ArtifactsPaths.cs

@@ -4,11 +4,12 @@ namespace BenchmarkDotNet.Toolchains
 {
     public class ArtifactsPaths
     {
-        public static readonly ArtifactsPaths Empty = new ArtifactsPaths("", "", "", "", "", "", "", "", "", "", "");
+        public static readonly ArtifactsPaths Empty = new ArtifactsPaths("", "", "", "", "", "", "", "", "", "", "", "");
 
         [PublicAPI] public string RootArtifactsFolderPath { get; }
         [PublicAPI] public string BuildArtifactsDirectoryPath { get; }
         [PublicAPI] public string BinariesDirectoryPath { get; }
+        [PublicAPI] public string IntermediateDirectoryPath { get; }
         [PublicAPI] public string ProgramCodePath { get; }
         [PublicAPI] public string AppConfigPath { get; }
         [PublicAPI] public string NuGetConfigPath { get; }
@@ -22,6 +23,7 @@ public ArtifactsPaths(
             string rootArtifactsFolderPath,
             string buildArtifactsDirectoryPath,
             string binariesDirectoryPath,
+            string intermediateDirectoryPath,
             string programCodePath,
             string appConfigPath,
             string nuGetConfigPath,
@@ -34,6 +36,7 @@ public ArtifactsPaths(
             RootArtifactsFolderPath = rootArtifactsFolderPath;
             BuildArtifactsDirectoryPath = buildArtifactsDirectoryPath;
             BinariesDirectoryPath = binariesDirectoryPath;
+            IntermediateDirectoryPath = intermediateDirectoryPath;
             ProgramCodePath = programCodePath;
             AppConfigPath = appConfigPath;
             NuGetConfigPath = nuGetConfigPath;

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

@@ -65,6 +65,9 @@ protected override string GetBinariesDirectoryPath(string buildArtifactsDirector
             ? Path.Combine(buildArtifactsDirectoryPath, "bin", buildPartition.BuildConfiguration, TargetFrameworkMoniker)
             : Path.Combine(buildArtifactsDirectoryPath, "bin", $"bdn_partition_{buildPartition.Id}");
 
+        protected override string GetIntermediateDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
+            => Path.Combine(buildArtifactsDirectoryPath, "obj", $"bdn_partition_{buildPartition.Id}");
+
         [SuppressMessage("ReSharper", "StringLiteralTypo")] // R# complains about $variables$
         protected override void GenerateProject(BuildPartition buildPartition, ArtifactsPaths artifactsPaths, ILogger logger)
         {

src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs

@@ -175,11 +175,11 @@ internal static string GetBuildCommand(ArtifactsPaths artifactsPaths, BuildParti
                 .AppendArgument(GetMsBuildBinLogArgument(buildPartition, binLogSuffix))
                 // Fix #1377 (see comments in #1773).
                 // We force the project to output binaries to a new directory.
-                // Specifying --output and --no-dependencies breaks the build for some reason,
+                // Specifying --output and --no-dependencies breaks the build (because the previous build was not done using the custom output path),
                 // so we don't include it if we're building no-deps (only supported for integration tests).
                 .AppendArgument(excludeOutput ? string.Empty : $"--output \"{artifactsPaths.BinariesDirectoryPath}\"")
-                .AppendArgument(excludeOutput ? string.Empty : $"/p:OutputPath={Path.Combine(".", "bin", $"bdn_partition_{buildPartition.Id}")}")
-                .AppendArgument(excludeOutput ? string.Empty : $"/p:IntermediateOutputPath={Path.Combine(".", "obj", $"bdn_partition_{buildPartition.Id}")}\\")
+                .AppendArgument(excludeOutput ? string.Empty : $"/p:OutputPath=\"{artifactsPaths.BinariesDirectoryPath}\"")
+                .AppendArgument(excludeOutput ? string.Empty : $"/p:IntermediateOutputPath=\"{artifactsPaths.IntermediateDirectoryPath}\"\\")
                 .ToString();
 
         internal static string GetPublishCommand(ArtifactsPaths artifactsPaths, BuildPartition buildPartition, string extraArguments = null, string binLogSuffix = null)
@@ -191,8 +191,8 @@ internal static string GetPublishCommand(ArtifactsPaths artifactsPaths, BuildPar
                 .AppendArgument(string.IsNullOrEmpty(artifactsPaths.PackagesDirectoryName) ? string.Empty : $"/p:NuGetPackageRoot=\"{artifactsPaths.PackagesDirectoryName}\"")
                 .AppendArgument(GetMsBuildBinLogArgument(buildPartition, binLogSuffix))
                 .AppendArgument($"--output \"{artifactsPaths.BinariesDirectoryPath}\"")
-                .AppendArgument($"/p:OutputPath={Path.Combine(".", "bin", $"bdn_partition_{buildPartition.Id}")}")
-                .AppendArgument($"/p:IntermediateOutputPath={Path.Combine(".", "obj", $"bdn_partition_{buildPartition.Id}")}\\")
+                .AppendArgument($"/p:OutputPath=\"{artifactsPaths.BinariesDirectoryPath}\"")
+                .AppendArgument($"/p:IntermediateOutputPath=\"{artifactsPaths.IntermediateDirectoryPath}\"\\")
                 .ToString();
 
         private static string GetMsBuildBinLogArgument(BuildPartition buildPartition, string suffix)

src/BenchmarkDotNet/Toolchains/GeneratorBase.cs

@@ -43,11 +43,18 @@ public GenerateResult GenerateProject(BuildPartition buildPartition, ILogger log
         [PublicAPI] protected abstract string GetBuildArtifactsDirectoryPath(BuildPartition assemblyLocation, string programName);
 
         /// <summary>
-        /// returns a path where executable should be found after the build
+        /// returns a path where executable should be found after the build (usually \bin)
         /// </summary>
         [PublicAPI] protected virtual string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, BuildPartition buildPartition)
             => 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)
+            => string.Empty;
+
         /// <summary>
         /// returns OS-specific executable extension
         /// </summary>
@@ -128,6 +135,7 @@ private ArtifactsPaths GetArtifactsPaths(BuildPartition buildPartition, string r
                 rootArtifactsFolderPath: rootArtifactsFolderPath,
                 buildArtifactsDirectoryPath: buildArtifactsDirectoryPath,
                 binariesDirectoryPath: binariesDirectoryPath,
+                intermediateDirectoryPath: GetIntermediateDirectoryPath(buildArtifactsDirectoryPath, buildPartition),
                 programCodePath: Path.Combine(buildArtifactsDirectoryPath, $"{programName}{codeFileExtension}"),
                 appConfigPath: $"{executablePath}.config",
                 nuGetConfigPath: Path.Combine(buildArtifactsDirectoryPath, "NuGet.config"),

src/BenchmarkDotNet/Toolchains/InProcess/Emit/InProcessEmitArtifactsPath.cs

@@ -12,6 +12,7 @@ public InProcessEmitArtifactsPath(
             baseArtifacts.RootArtifactsFolderPath,
             baseArtifacts.BuildArtifactsDirectoryPath,
             baseArtifacts.BinariesDirectoryPath,
+            baseArtifacts.IntermediateDirectoryPath,
             baseArtifacts.ProgramCodePath,
             baseArtifacts.AppConfigPath,
             baseArtifacts.NuGetConfigPath,

src/BenchmarkDotNet/Toolchains/InProcess/Emit/InProcessEmitGenerator.cs

@@ -47,6 +47,7 @@ private ArtifactsPaths GetArtifactsPaths(BuildPartition buildPartition, string r
                 rootArtifactsFolderPath: rootArtifactsFolderPath,
                 buildArtifactsDirectoryPath: buildArtifactsDirectoryPath,
                 binariesDirectoryPath: binariesDirectoryPath,
+                intermediateDirectoryPath: null,
                 programCodePath: null,
                 appConfigPath: null,
                 nuGetConfigPath: null,

tests/BenchmarkDotNet.IntegrationTests/NugetReferenceTests.cs

@@ -18,7 +18,7 @@ public NuGetReferenceTests(ITestOutputHelper output) : base(output)
         {
         }
 
-        [FactEnvSpecific("For some reason this test is unstable on Ubuntu for both AzureDevOps and Travis CI", EnvRequirement.NonLinux)]
+        [Fact]
         public void UserCanSpecifyCustomNuGetPackageDependency()
         {
             var toolchain = RuntimeInformation.GetCurrentRuntime().GetToolchain(preferMsBuildToolchains: true);