From 65b48a3e891380a0472c8bd6b2ac03d3fa00a454 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Sun, 15 Jan 2023 23:36:19 +0100 Subject: [PATCH] Fix fuzzers for .NET 8 SDK publish dotnet publish does not allow publishing with an output path in the .NET 8 SDK. They failed this weekend's rolling runs so this change makes the build scripts specify the project to build. --- src/coreclr/scripts/fuzzer_setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/coreclr/scripts/fuzzer_setup.py b/src/coreclr/scripts/fuzzer_setup.py index ca22dc0c28b8b1..be6e5a24d580a7 100644 --- a/src/coreclr/scripts/fuzzer_setup.py +++ b/src/coreclr/scripts/fuzzer_setup.py @@ -95,14 +95,14 @@ def main(main_args): helix_source_prefix = "official" creator = "" - repo_urls = { - "Antigen": "https://github.com/kunalspathak/Antigen.git", - "Fuzzlyn": "https://github.com/jakobbotsch/Fuzzlyn.git", + build_repos = { + "Antigen": ("https://github.com/kunalspathak/Antigen.git", "Antigen/Antigen.csproj"), + "Fuzzlyn": ("https://github.com/jakobbotsch/Fuzzlyn.git", "Fuzzlyn/Fuzzlyn.csproj"), } # tool_name is verifed in setup_args - assert coreclr_args.tool_name in repo_urls - repo_url = repo_urls[coreclr_args.tool_name] + assert coreclr_args.tool_name in build_repos + (repo_url, proj_path) = build_repos[coreclr_args.tool_name] # create exploratory directory print('Copying {} -> {}'.format(scripts_src_directory, coreroot_directory)) @@ -131,7 +131,7 @@ def main(main_args): dotnet_cmd = os.path.join(source_directory, "dotnet.cmd") if not is_windows: dotnet_cmd = os.path.join(source_directory, "dotnet.sh") - run_command([dotnet_cmd, "publish", "-c", "Release", "--self-contained", "-r", run_configuration, "-o", publish_dir], _exit_on_fail=True) + run_command([dotnet_cmd, "publish", proj_path.replace("/", os.sep), "-c", "Release", "--self-contained", "-r", run_configuration, "-o", publish_dir], _exit_on_fail=True) dll_name = coreclr_args.tool_name + ".dll" if not os.path.exists(path.join(publish_dir, dll_name)):