Attempt at fixing Mono AOT LLVM

caaavik-msft · Mar 8, 2024 · 1a9ff86 · 1a9ff86
1 parent 63626bb
commit 1a9ff86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/BenchmarkDotNet/Toolchains/Executor.cs b/src/BenchmarkDotNet/Toolchains/Executor.cs
@@ -146,7 +146,7 @@ private static ProcessStartInfo CreateStartInfo(BenchmarkCase benchmarkCase, Art
                 case MonoAotLLVMRuntime _:
                     start.FileName = exePath;
                     start.Arguments = args;
-                    start.WorkingDirectory = artifactsPaths.BinariesDirectoryPath;
+                    start.WorkingDirectory = Path.Combine(artifactsPaths.BinariesDirectoryPath, "publish");
                     break;
                 case CustomRuntime _:
                     start.FileName = exePath;

diff --git a/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs b/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs
@@ -55,10 +55,10 @@ protected override void GenerateProject(BuildPartition buildPartition, Artifacts
 
         protected override string GetExecutablePath(string binariesDirectoryPath, string programName)
             => Portability.RuntimeInformation.IsWindows()
-                ? Path.Combine(binariesDirectoryPath, $"{programName}.exe")
-                : Path.Combine(binariesDirectoryPath, programName);
+                ? Path.Combine(binariesDirectoryPath, "publish", $"{programName}.exe")
+                : Path.Combine(binariesDirectoryPath, "publish", programName);
 
         protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
-            => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish");
+            => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier());
     }
 }