From bb1e7c30c8bf2cec645bcc7203883744c4da0b46 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 4 Jan 2026 12:59:47 -0500 Subject: [PATCH] build: Add msbuild flag to reference projs or local nugets So we can use project refs for dev builds, and package refs for releases. --- .../ArithmeticExpressions.csproj | 19 +++++-- .../BaseUtilities/BaseUtilities.csproj | 1 + .../BooleanExpressions.csproj | 19 +++++-- .../Bts.ColumnExpressions.csproj | 19 +++++-- .../Bts.ColumnSortExpressions.csproj | 19 +++++-- src/DataStreamSuite/Bts.Net/Bts.Net.csproj | 1 + .../ColumnMapExpressions.csproj | 16 ++++-- .../DataStream/DataStream.csproj | 33 ++++++++---- .../DataStreamCore/DataStreamCore.csproj | 16 ++++-- src/DataStreamSuite/PubSub/PubSub.csproj | 23 ++++++--- .../SharedStreams/SharedStreams.csproj | 24 ++++++--- src/client/spark/Spark.csproj | 23 ++++++--- src/client/spark_sdk/spark_sdk.csproj | 40 +++++---------- src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj | 50 +++++++++++++------ tools/py/build_api_server.py | 6 ++- tools/py/build_data_stream.py | 6 ++- tools/py/build_spark.py | 9 +++- tools/py/publish_api_server.py | 7 ++- 18 files changed, 230 insertions(+), 101 deletions(-) diff --git a/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressions.csproj b/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressions.csproj index 5d5c4bd0d..41fb738e2 100644 --- a/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressions.csproj +++ b/src/DataStreamSuite/ArithmeticExpressions/ArithmeticExpressions.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + $(SparkVersion) @@ -11,10 +12,20 @@ - - - - + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj b/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj index 79b0d947b..0e4e4159e 100644 --- a/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj +++ b/src/DataStreamSuite/BaseUtilities/BaseUtilities.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + $(SparkVersion) diff --git a/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj b/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj index d425dc083..aadb6b249 100644 --- a/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj +++ b/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + $(SparkVersion) @@ -11,10 +12,20 @@ - - - - + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj b/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj index b36c4eb38..9d1884895 100644 --- a/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj +++ b/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj @@ -4,16 +4,27 @@ net8.0 enable enable + $(SparkVersion) - - - - + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj b/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj index 90915e6e7..34d8047da 100644 --- a/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj +++ b/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj @@ -4,16 +4,27 @@ net8.0 enable enable + $(SparkVersion) - - - - + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/Bts.Net/Bts.Net.csproj b/src/DataStreamSuite/Bts.Net/Bts.Net.csproj index 30402ac0e..c3bccb314 100644 --- a/src/DataStreamSuite/Bts.Net/Bts.Net.csproj +++ b/src/DataStreamSuite/Bts.Net/Bts.Net.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + $(SparkVersion) diff --git a/src/DataStreamSuite/ColumnMapExpressions/ColumnMapExpressions.csproj b/src/DataStreamSuite/ColumnMapExpressions/ColumnMapExpressions.csproj index 549aeedda..212a2f1c4 100644 --- a/src/DataStreamSuite/ColumnMapExpressions/ColumnMapExpressions.csproj +++ b/src/DataStreamSuite/ColumnMapExpressions/ColumnMapExpressions.csproj @@ -4,15 +4,25 @@ net8.0 enable enable + $(SparkVersion) - - - + + + + + + + + + + + + diff --git a/src/DataStreamSuite/DataStream/DataStream.csproj b/src/DataStreamSuite/DataStream/DataStream.csproj index 531548450..4ce80906c 100644 --- a/src/DataStreamSuite/DataStream/DataStream.csproj +++ b/src/DataStreamSuite/DataStream/DataStream.csproj @@ -3,17 +3,9 @@ net8.0 enable + $(SparkVersion) - - - - - - - - - @@ -25,4 +17,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj index 3e7284e62..f6e7894fd 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj +++ b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj @@ -4,6 +4,7 @@ true net8.0 disable + $(SparkVersion) @@ -13,8 +14,17 @@ - - - + + + + + + + + + + + + diff --git a/src/DataStreamSuite/PubSub/PubSub.csproj b/src/DataStreamSuite/PubSub/PubSub.csproj index b1d420649..b377ca28d 100644 --- a/src/DataStreamSuite/PubSub/PubSub.csproj +++ b/src/DataStreamSuite/PubSub/PubSub.csproj @@ -1,14 +1,25 @@ - - - - - - true + true net8.0 enable + $(SparkVersion) + + + + + + + + + + + + + + + diff --git a/src/DataStreamSuite/SharedStreams/SharedStreams.csproj b/src/DataStreamSuite/SharedStreams/SharedStreams.csproj index 35b10e654..e3a60da53 100644 --- a/src/DataStreamSuite/SharedStreams/SharedStreams.csproj +++ b/src/DataStreamSuite/SharedStreams/SharedStreams.csproj @@ -4,18 +4,30 @@ net8.0 enable enable + $(SparkVersion) - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index aa012e3ee..aa2641265 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -36,6 +36,23 @@ + + + + + + + + + + + + + + + + + @@ -59,12 +76,6 @@ - - - - - - diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index 99b54fb51..f4c6feca8 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -6,7 +6,6 @@ $(OutputPath)\net8.0 true true - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage Blue Trading Systems Blue Trading Systems @@ -27,32 +26,17 @@ - - - - - - - - - - - - - - - - - - - - - ..\..\lib\net8.0\Bts.Spark.Api.dll - - - - - - + + + + + + + + + + + + diff --git a/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj b/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj index 10d95178a..b8427fdd2 100644 --- a/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj +++ b/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj @@ -32,21 +32,39 @@ - - - - PreserveNewest - runtimes/win-x64/native/libspark.dll - true - runtimes/win-x64/native - - - - PreserveNewest - runtimes/linux-x64/native/libspark.so - true - runtimes/linux-x64/native - - + + + + + + PreserveNewest + false + + + + PreserveNewest + false + + + + + + + + PreserveNewest + runtimes/win-x64/native/libspark.dll + true + runtimes/win-x64/native + + + + PreserveNewest + runtimes/linux-x64/native/libspark.so + true + runtimes/linux-x64/native + + + + diff --git a/tools/py/build_api_server.py b/tools/py/build_api_server.py index e9529e1d9..9a168e50b 100644 --- a/tools/py/build_api_server.py +++ b/tools/py/build_api_server.py @@ -29,6 +29,7 @@ def _get_arg_parser(): ) add_toggle_opt(parser, "cpp", help="Build c++ libs") add_toggle_opt(parser, "cs", help="Build c# libs") + add_toggle_opt(parser, "csproj-refs", help="Use local csproj refs (instead of nugets)") parser.add_argument( "--spark-version", help="The version identifier to use (by default, uses git to generate semantic version number)" @@ -50,6 +51,7 @@ def _get_arg_parser(): clean=False, cpp=True, cs=True, + csproj_refs=True, verbosity=1, ) return parser @@ -112,7 +114,7 @@ def _main(): if args.cpp: run(f"cmake --build build/{cmake_preset} --target clean") if args.cs: - run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") if args.cpp: run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}") cmake_build_cmd = f"cmake --build build/{cmake_preset} --config {cmake_config}" @@ -120,7 +122,7 @@ def _main(): cmake_build_cmd += f" -j {cmake_jobs}" run(cmake_build_cmd) if args.cs: - run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") if __name__ == "__main__": diff --git a/tools/py/build_data_stream.py b/tools/py/build_data_stream.py index fdf59ff2a..01a31dae0 100644 --- a/tools/py/build_data_stream.py +++ b/tools/py/build_data_stream.py @@ -27,6 +27,7 @@ def _get_arg_parser(): ) add_toggle_opt(parser, "cpp", help="Build c++ libs") add_toggle_opt(parser, "cs", help="Build c# libs") + add_toggle_opt(parser, "csproj-refs", help="Use local csproj refs (instead of nugets)") parser.add_argument( "--verbosity", metavar="{0-5}", @@ -44,6 +45,7 @@ def _get_arg_parser(): clean=False, cpp=True, cs=True, + csproj_refs=True, verbosity=1, ) return parser @@ -107,7 +109,7 @@ def build(args): if args.cpp: run(f"cmake --build build/{cmake_preset} --target clean") if args.cs: - run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") if args.cpp: run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}") cmake_build_cmd = f"cmake --build build/{cmake_preset} --config {cmake_config}" @@ -115,7 +117,7 @@ def build(args): cmake_build_cmd += f" -j {cmake_jobs}" run(cmake_build_cmd) if args.cs: - run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") def _main(): diff --git a/tools/py/build_spark.py b/tools/py/build_spark.py index 730758674..00c2e30e0 100644 --- a/tools/py/build_spark.py +++ b/tools/py/build_spark.py @@ -15,6 +15,7 @@ class BuildArgs: clean: bool = False, cpp: bool = True, cs: bool = True, + csproj_refs: bool = True, verbosity: int = 1, dry_run: bool = False, publish: bool = False, @@ -24,6 +25,7 @@ class BuildArgs: self.clean = clean self.cpp = cpp self.cs = cs + self.csproj_refs = csproj_refs self.verbosity = verbosity self.dry_run = dry_run self.dotnet_verbosity = at_bounded( @@ -60,6 +62,7 @@ def _get_arg_parser(): ) add_toggle_opt(parser, "cpp", help="Build c++ libs") add_toggle_opt(parser, "cs", help="Build c# libs") + add_toggle_opt(parser, "csproj-refs", help="Use local csproj refs (instead of nugets)") parser.add_argument( "--spark-version", help="The version identifier to use (by default, uses git to generate semantic version number)" @@ -82,6 +85,7 @@ def _get_arg_parser(): clean=defaults.clean, cpp=True, cs=True, + csproj_refs=True, verbosity=defaults.verbosity, dry_run=defaults.dry_run, ) @@ -117,13 +121,13 @@ def build(args: BuildArgs): if args.cpp: run(f'{cmake_build_cmd} --target clean') if args.cs: - run(f"dotnet clean spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet clean spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p SparkVersion={spark_version}") if args.cpp: run(cmake_configure_cmd) run(cmake_build_cmd) if args.cs: build_action = "publish" if args.publish else "build" - run(f"dotnet {build_action} spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet {build_action} spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p SparkVersion={spark_version}") def _main(): @@ -134,6 +138,7 @@ def _main(): clean=cli_args.clean, cpp=cli_args.cpp, cs=cli_args.cs, + csproj_refs=cli_args.csproj_refs, verbosity=cli_args.verbosity, dry_run=cli_args.dry_run, version=cli_args.spark_version, diff --git a/tools/py/publish_api_server.py b/tools/py/publish_api_server.py index 2044a6814..fff32afd3 100644 --- a/tools/py/publish_api_server.py +++ b/tools/py/publish_api_server.py @@ -57,6 +57,7 @@ class PublishArgs: configuration: str = "release", cmake_jobs: Optional[int] = None, clean: bool = False, + csproj_refs: bool = True, verbosity: int = 2, dry_run: bool = False, output: Optional[str] = None, @@ -67,6 +68,7 @@ class PublishArgs: self.configuration = configuration self.cmake_jobs = cmake_jobs self.clean = clean + self.csproj_refs = csproj_refs self.verbosity = verbosity self.dry_run = dry_run self.dotnet_verbosity = at_bounded( @@ -173,7 +175,7 @@ def publish(args: PublishArgs): run( f"cmake --build build/{cmake_preset} --config {cmake_config} --target clean" ) - run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}") + run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}") cmake_build_cmd = ( f"cmake --build build/{cmake_preset} --config {cmake_config} --target install" @@ -182,7 +184,7 @@ def publish(args: PublishArgs): cmake_build_cmd += f" -j {cmake_jobs}" run(cmake_build_cmd) run( - f"dotnet publish {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version} -f {args.framework} -r {args.runtime} --sc" + f"dotnet publish {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version} -f {args.framework} -r {args.runtime} --sc" ) # Copy cpp bins print(f"[pseudo shell] cp -r install/{cmake_preset}/bin/* {publish_dir}") @@ -202,6 +204,7 @@ def _main(): PublishArgs( configuration=args.configuration, clean=args.clean, + csproj_refs=args.csproj_refs, cmake_jobs=args.cmake_jobs, verbosity=args.verbosity, dry_run=args.dry_run,