From 17642ca84bff28cd6e14c8a98eddadb4f356d783 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 10 Sep 2021 12:13:21 -0400 Subject: [PATCH] build: Use dotnet build (instead of msbuild) for c# projects Continue using msbuild for c++ (i.e., libspark) --- tools/buildspark.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/buildspark.py b/tools/buildspark.py index 4caf96ea2..eabc5ef74 100644 --- a/tools/buildspark.py +++ b/tools/buildspark.py @@ -176,10 +176,11 @@ if __name__ == "__main__": msbuild_cmd = ( f'{SparkPaths.msbuild()} /m /p:debugtype=portable /p:platform=x64 ' f'/p:GenerateFullPaths=true /clp:verbosity=minimal ' - f'/p:Configuration={args.configuration} /clp:summary spark_client.sln') + f'/p:Configuration={args.configuration} /clp:summary build\\ALL_BUILD.vcxproj') + dotnet_build_cmd = ( + f'dotnet build src/client/spark/Spark.csproj') spark_build_cmd = ' && '.join( [ - SparkPaths.vs_prompt(), SparkPaths.venv27_prompt(), msbuild_restore_cmd, - msbuild_cmd + SparkPaths.vs_prompt(), SparkPaths.venv27_prompt(), msbuild_restore_cmd, dotnet_build_cmd ]) subprocess.run(spark_build_cmd)