From eb79264b9bb14b3426f7a5a3181ffa2a8946cb7e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 5 Nov 2019 18:19:17 -0500 Subject: [PATCH] netcore builds on linux through dotnet build --- docker/linux | 2 +- externals | 2 +- src/client/Directory.Build.Props | 18 ++++- src/client/Directory.Build.Targets | 70 +++++++++++++++++-- src/client/spark_api/spark_api.csproj | 3 +- src/client/spark_core/spark_core.csproj | 3 +- src/client/spark_sdk/spark_sdk.csproj | 7 +- src/client/spark_test/spark_test.csproj | 3 +- src/client/sparkcmd/sparkcmd.csproj | 10 ++- src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/apicore.proto | 2 +- src/lib/api/apigateway.proto | 2 +- src/lib/api/core/ApiClientInterop.cpp | 2 +- src/lib/api/core/ApiInteropCommon.h | 2 +- src/lib/api/public/ApiServer.h | 2 +- src/lib/api/public/Result.h | 2 +- src/lib/api/public/ServerChannel.h | 2 +- src/lib/api/services/AdminService.proto | 4 +- .../api/services/AlgoDefinitionService.proto | 4 +- src/lib/api/services/AlgoService.proto | 4 +- src/lib/api/services/ApiUnitTestService.proto | 2 +- src/lib/api/services/AuthService.proto | 4 +- .../api/services/BasePositionService.proto | 2 +- src/lib/api/services/ErrorReportService.proto | 2 +- src/lib/api/services/HelloService.proto | 2 +- src/lib/api/services/MBOService.proto | 4 +- src/lib/api/services/MarginService.proto | 4 +- .../services/MarketDataAuxiliaryService.proto | 4 +- src/lib/api/services/MarketDataRelay.proto | 6 +- src/lib/api/services/MoneyFileService.proto | 2 +- src/lib/api/services/OrderService.proto | 4 +- .../services/OutOfProcessURLListener.proto | 2 +- src/lib/api/services/PersistenceService.proto | 2 +- src/lib/api/services/PositionService.proto | 4 +- .../api/services/ShellDiagnosticService.proto | 4 +- .../api/services/ShellLatencyService.proto | 4 +- .../services/SyntheticSecurityService.proto | 4 +- src/lib/domain_model/Security.proto | 2 +- src/lib/md/MDConsumerInterop.cpp | 2 +- src/lib/md/common.h | 2 +- src/lib/md/relay/QueryServer.cpp | 4 +- src/lib/md/relay/QueryServer.h | 2 +- src/lib/md/relay/RelayClient.cpp | 2 +- src/lib/md/relay/RelayClient.h | 2 +- src/lib/md/relay/RelayRecorder.cpp | 2 +- src/lib/md/test/Co2ManagedTestHelper.cpp | 2 +- src/lib/orderman/events/TickerUpdateEvent.h | 2 +- src/lib/sparkproto/SparkProtos.proto | 2 +- src/server/sparkd/http/ApiGateway.h | 2 +- src/server/sparkd/http/WebServer.cpp | 2 +- .../md/platforms/ice_onixs/ICEListener.cpp | 2 +- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 2 +- .../md/platforms/mdp3_onixs/MDP3Listener.cpp | 2 +- .../md/platforms/mdp3_onixs/MDP3Main.cpp | 2 +- src/web/ui/src/ui.fsproj | 2 +- tools/replicator/replicate_to_linux_vm.py | 2 +- 56 files changed, 165 insertions(+), 77 deletions(-) diff --git a/docker/linux b/docker/linux index c40e6eba4..68f43cef8 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit c40e6eba4ba72480a68cf784b6ffbcacc3fbf4af +Subproject commit 68f43cef8d3edbda05a9517421092ada3c392aff diff --git a/externals b/externals index 6d8f64ca5..187ea89fc 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 6d8f64ca5cee3acbf9addb51428f25d54b9f906a +Subproject commit 187ea89fc1e35762df1034269984c743cca54860 diff --git a/src/client/Directory.Build.Props b/src/client/Directory.Build.Props index d8ea6bc1c..e72d04725 100644 --- a/src/client/Directory.Build.Props +++ b/src/client/Directory.Build.Props @@ -5,6 +5,7 @@ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..)) $([System.IO.Path]::GetFullPath($(SparkRoot)\src)) $(SparkRoot)\externals\windows + $(SparkRoot)/externals/linux $([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot))))) None False @@ -22,17 +23,20 @@ $(BaseOutputPath)\gen\$(MSBuildProjectName) + - CompileProto3 + CompileProto2 + CompileProto2Linux - CompileProto3 + CompileProto3 + CompileProto3Linux - CompileProto3Excel + CompileProto3Excel @@ -43,6 +47,14 @@ $(Externals)\bin\protogen.exe + + $(SparkRoot)/src/lib/api/service_compiler + $(Externals)/include + $(Externals)/bin/protoc + $(Externals)/bin/lowercase_files.sh + $(Externals)/bin/protogen + + diff --git a/src/client/Directory.Build.Targets b/src/client/Directory.Build.Targets index 305c0c8fe..2aa10b04e 100644 --- a/src/client/Directory.Build.Targets +++ b/src/client/Directory.Build.Targets @@ -3,7 +3,7 @@ @@ -28,7 +28,7 @@ passes wipes out the additional compile includes that we add. --> + + + + $([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), '')) + $([System.IO.Path]::GetDirectoryName($(SourceRelativeFile))) + $(GenDir)/proto2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/client/spark_api/spark_api.csproj b/src/client/spark_api/spark_api.csproj index a0d60f3e1..e81b0ecc7 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/client/spark_api/spark_api.csproj @@ -1,6 +1,7 @@ netstandard2.0 + netstandard2.0 Blue Trading Systems Blue Trading Systems Spark @@ -25,7 +26,7 @@ - + diff --git a/src/client/spark_core/spark_core.csproj b/src/client/spark_core/spark_core.csproj index 4514324d0..e93b9ceca 100644 --- a/src/client/spark_core/spark_core.csproj +++ b/src/client/spark_core/spark_core.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0 + netstandard2.0 true x64 AnyCPU diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index e2f93fec3..73f3db4b8 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -1,6 +1,11 @@ - netcoreapp2.1;net471 + net471 + win7-x64 + + netcoreapp2.2 + linux-x64 + Exe true $(OutputPath)\net471 diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 308bc8928..884888c7d 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0 + netstandard2.0 x64 x64 diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index b05a9d2d3..3eaa3bae6 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -2,8 +2,14 @@ Exe - net471;netcoreapp2.1 - win7-x64;ubuntu.16.04-x64 + net471 + win7-x64 + + netcoreapp3.0 + linux-x64 + true + true + Blue Trading Systems Blue Trading Systems Spark diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index 0f42c5041..ded2fc636 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/Apioptions.proto;api/apicore.proto;api/apigateway.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/HistoricalDataService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/UI.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/fix.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/fix.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/Co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 6de2eab0d..e6e30c2c3 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -1,5 +1,5 @@ syntax="proto3"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; package bts.api; option csharp_namespace="bts.api"; diff --git a/src/lib/api/apigateway.proto b/src/lib/api/apigateway.proto index 1463f8354..57bd84315 100644 --- a/src/lib/api/apigateway.proto +++ b/src/lib/api/apigateway.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.gateway; option csharp_namespace="bts.api.gateway"; -import "lib/api/apicore.proto"; +import "lib/api/Apicore.proto"; message GatewayLogin { string username = 1; diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index 6c29be4b7..521698efa 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -8,7 +8,7 @@ #include "../public/ServiceContext.h" #include "../public/Result.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" #include "lib/config/protos/quickbus_cfg.pb.h" #include "lib/config/protos/system.pb.h" #include "lib/config/protos/Ports.pb.h" diff --git a/src/lib/api/core/ApiInteropCommon.h b/src/lib/api/core/ApiInteropCommon.h index 0dd6b1a09..2b2043c8e 100644 --- a/src/lib/api/core/ApiInteropCommon.h +++ b/src/lib/api/core/ApiInteropCommon.h @@ -1,7 +1,7 @@ #pragma once #include "lib/utils/bts_export.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" #include #include diff --git a/src/lib/api/public/ApiServer.h b/src/lib/api/public/ApiServer.h index d4200f93e..375f61766 100644 --- a/src/lib/api/public/ApiServer.h +++ b/src/lib/api/public/ApiServer.h @@ -5,7 +5,7 @@ #include "ApiUtils.h" #include "ServerChannel.h" #include "StatefulPublisher.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" #include #include diff --git a/src/lib/api/public/Result.h b/src/lib/api/public/Result.h index 22b868434..100663ae7 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib/api/public/Result.h @@ -2,7 +2,7 @@ #include "ApiException.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" #include #include diff --git a/src/lib/api/public/ServerChannel.h b/src/lib/api/public/ServerChannel.h index bce1c6661..39915fbf3 100644 --- a/src/lib/api/public/ServerChannel.h +++ b/src/lib/api/public/ServerChannel.h @@ -2,7 +2,7 @@ #include "../core/ApiClientInterop.h" #include "../core/ApiServerInterop.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" namespace bts { namespace api { diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 1a1f57fff..1744d5d9b 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.admin; option csharp_namespace="bts.api.admin"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; //import "google/protobuf/timestamp.proto"; import "lib/domain_model/Security.proto"; import "lib/api/services/OrderService.proto"; diff --git a/src/lib/api/services/AlgoDefinitionService.proto b/src/lib/api/services/AlgoDefinitionService.proto index 2f8133238..96a0ed05d 100644 --- a/src/lib/api/services/AlgoDefinitionService.proto +++ b/src/lib/api/services/AlgoDefinitionService.proto @@ -2,8 +2,8 @@ syntax="proto3"; package bts.api.orderman.algo; option csharp_namespace="bts.api.orderman.algo"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; import "lib/api/services/OrderService.proto"; import "google/protobuf/timestamp.proto"; diff --git a/src/lib/api/services/AlgoService.proto b/src/lib/api/services/AlgoService.proto index 85b290095..75c5a2740 100644 --- a/src/lib/api/services/AlgoService.proto +++ b/src/lib/api/services/AlgoService.proto @@ -2,8 +2,8 @@ syntax="proto3"; package bts.api.orderman; option csharp_namespace="bts.api.orderman"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; import "lib/api/services/OrderService.proto"; import "google/protobuf/timestamp.proto"; diff --git a/src/lib/api/services/ApiUnitTestService.proto b/src/lib/api/services/ApiUnitTestService.proto index 6b8f3b63b..cd2c977c8 100644 --- a/src/lib/api/services/ApiUnitTestService.proto +++ b/src/lib/api/services/ApiUnitTestService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.test; option csharp_namespace="bts.api.test"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; message EmptyRequest {} message UnitTestResult { diff --git a/src/lib/api/services/AuthService.proto b/src/lib/api/services/AuthService.proto index f7b984497..c05cf5c0a 100644 --- a/src/lib/api/services/AuthService.proto +++ b/src/lib/api/services/AuthService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.user; option csharp_namespace="bts.api.user"; -import "lib/api/apicore.proto"; -import "lib/api/apioptions.proto"; +import "lib/api/Apicore.proto"; +import "lib/api/Apioptions.proto"; message OperatorID { string tag50 = 10; } diff --git a/src/lib/api/services/BasePositionService.proto b/src/lib/api/services/BasePositionService.proto index e6dc77d2f..98de26e7f 100644 --- a/src/lib/api/services/BasePositionService.proto +++ b/src/lib/api/services/BasePositionService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; import "lib/api/services/PositionService.proto"; message GMI_ParseResult { diff --git a/src/lib/api/services/ErrorReportService.proto b/src/lib/api/services/ErrorReportService.proto index d5d382d9d..090b7b9bd 100644 --- a/src/lib/api/services/ErrorReportService.proto +++ b/src/lib/api/services/ErrorReportService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.support; option csharp_namespace="bts.support"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; import "google/protobuf/timestamp.proto"; message FileData { diff --git a/src/lib/api/services/HelloService.proto b/src/lib/api/services/HelloService.proto index 3e9cbf7a2..bc6e0be6e 100644 --- a/src/lib/api/services/HelloService.proto +++ b/src/lib/api/services/HelloService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.test; option csharp_namespace="bts.api.test"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; message HelloRequest { string name = 1; diff --git a/src/lib/api/services/MBOService.proto b/src/lib/api/services/MBOService.proto index af8e89d56..268881469 100644 --- a/src/lib/api/services/MBOService.proto +++ b/src/lib/api/services/MBOService.proto @@ -2,8 +2,8 @@ syntax="proto3"; package bts.md; option csharp_namespace="bts.md"; option cc_enable_arenas=true; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; message OrderPIQ { uint32 order_id = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index d2d9d67b5..38a877ac4 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; import "lib/api/services/PositionService.proto"; message MarginResult { diff --git a/src/lib/api/services/MarketDataAuxiliaryService.proto b/src/lib/api/services/MarketDataAuxiliaryService.proto index 559f4f3f4..f044b361c 100644 --- a/src/lib/api/services/MarketDataAuxiliaryService.proto +++ b/src/lib/api/services/MarketDataAuxiliaryService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.md.auxiliary; option csharp_namespace="bts.api.md.auxiliary"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; message VolumeAtPriceLevel{ int32 record_id = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/MarketDataRelay.proto b/src/lib/api/services/MarketDataRelay.proto index 197eecae0..ee622dddf 100644 --- a/src/lib/api/services/MarketDataRelay.proto +++ b/src/lib/api/services/MarketDataRelay.proto @@ -2,10 +2,10 @@ syntax="proto3"; package bts.co2; option csharp_namespace="bts.co2"; option cc_enable_arenas=true; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; import "lib/domain_model/Security.proto"; -import "lib/md/protos/co2.proto"; +import "lib/md/protos/Co2.proto"; message ProductListReply { repeated bts.api.Product products = 1; diff --git a/src/lib/api/services/MoneyFileService.proto b/src/lib/api/services/MoneyFileService.proto index 5418fc1f8..049bca9f2 100644 --- a/src/lib/api/services/MoneyFileService.proto +++ b/src/lib/api/services/MoneyFileService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; import "lib/api/services/MarginService.proto"; message Money_ParseResult { diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 3448f79ea..46d18c597 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -2,11 +2,11 @@ syntax="proto3"; package bts.api.orderman; option csharp_namespace="bts.api.orderman"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; import "lib/domain_model/Security.proto"; import "google/protobuf/timestamp.proto"; import "lib/sparkproto/SparkProtos.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apicore.proto"; service OrderService { option (bts.api.service_description)="Implements order management"; diff --git a/src/lib/api/services/OutOfProcessURLListener.proto b/src/lib/api/services/OutOfProcessURLListener.proto index 0069a7a0f..288959535 100644 --- a/src/lib/api/services/OutOfProcessURLListener.proto +++ b/src/lib/api/services/OutOfProcessURLListener.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.browser; option csharp_namespace="bts.api.browser"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; message URIRequest { string uri = 1; diff --git a/src/lib/api/services/PersistenceService.proto b/src/lib/api/services/PersistenceService.proto index a2f27a65e..9ec6da6c3 100644 --- a/src/lib/api/services/PersistenceService.proto +++ b/src/lib/api/services/PersistenceService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.persistence; option csharp_namespace="bts.api.persistence"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; message Record { string key = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index 24e3630c6..47107d70b 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; import "lib/domain_model/Security.proto"; import "google/protobuf/timestamp.proto"; diff --git a/src/lib/api/services/ShellDiagnosticService.proto b/src/lib/api/services/ShellDiagnosticService.proto index a12c9245c..5a6e7ad13 100644 --- a/src/lib/api/services/ShellDiagnosticService.proto +++ b/src/lib/api/services/ShellDiagnosticService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.diagnostic; option csharp_namespace="bts.api.diagnostic"; -import "lib/api/apicore.proto"; -import "lib/api/apioptions.proto"; +import "lib/api/Apicore.proto"; +import "lib/api/Apioptions.proto"; message ScriptLines { int32 id = 1; diff --git a/src/lib/api/services/ShellLatencyService.proto b/src/lib/api/services/ShellLatencyService.proto index 8d1a253ae..c394165e0 100644 --- a/src/lib/api/services/ShellLatencyService.proto +++ b/src/lib/api/services/ShellLatencyService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.metrics; option csharp_namespace="bts.metrics"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "lib/api/Apioptions.proto"; +import "lib/api/Apicore.proto"; message Tick { int32 key = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/SyntheticSecurityService.proto b/src/lib/api/services/SyntheticSecurityService.proto index d347a87cb..daa33738f 100644 --- a/src/lib/api/services/SyntheticSecurityService.proto +++ b/src/lib/api/services/SyntheticSecurityService.proto @@ -3,8 +3,8 @@ package bts.api.synthetic; option csharp_namespace="bts.api.synthetic"; -import "lib/api/apicore.proto"; -import "lib/api/apioptions.proto"; +import "lib/api/Apicore.proto"; +import "lib/api/Apioptions.proto"; import "lib/domain_model/Security.proto"; //import "google/protobuf/timestamp.proto"; import "lib/sparkproto/SparkProtos.proto"; diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index d0ee67220..b1a909a86 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -2,7 +2,7 @@ syntax="proto3"; package bts.api; option csharp_namespace="bts.api"; option cc_enable_arenas=true; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; enum Venue { VENUE_UNSET = 0; diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index 88972112d..a778793b8 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -7,7 +7,7 @@ #include "relay/RelayClient.h" #include "lib/utils/Dispatcher.h" #include "lib/utils/defer.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include #include #include diff --git a/src/lib/md/common.h b/src/lib/md/common.h index 06f07b294..b59af57be 100644 --- a/src/lib/md/common.h +++ b/src/lib/md/common.h @@ -6,7 +6,7 @@ #include "lib/domain_model/SecurityKey.h" #include "IntPrice.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/domain_model/Security.pb.h" #include diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index e404ff2b1..fc8472c94 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -14,9 +14,9 @@ #include "lib/logging/logging.h" #include "lib/config/protos/system.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/md/SecurityCache.h" -#include "lib/api/apicore.pb.h" +#include "lib/api/Apicore.pb.h" #include "lib/api/services/MarketDataRelay.server.pb.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" diff --git a/src/lib/md/relay/QueryServer.h b/src/lib/md/relay/QueryServer.h index 186089658..88294304f 100644 --- a/src/lib/md/relay/QueryServer.h +++ b/src/lib/md/relay/QueryServer.h @@ -8,7 +8,7 @@ #include #include -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" namespace bts { namespace api { class ServiceContext; } diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index 0cc92b7a4..7128c78f4 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -12,7 +12,7 @@ #include "lib/config/protos/system.pb.h" #include "lib/config/protos/MarketData.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/api/services/MarketDataRelay.client.pb.h" #include "lib/api/public/ServiceContext.h" #include "lib/utils/base64.hpp" diff --git a/src/lib/md/relay/RelayClient.h b/src/lib/md/relay/RelayClient.h index e4694012a..422af9327 100644 --- a/src/lib/md/relay/RelayClient.h +++ b/src/lib/md/relay/RelayClient.h @@ -8,7 +8,7 @@ #include #include -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" namespace bts { namespace pubsub { diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index f443c0926..e582977ac 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -8,7 +8,7 @@ #include "lib/utils/bts_chrono.h" #include "lib/md/common.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/md/SecurityIDRecorder.h" #include "lib/config/protos/system.pb.h" #include "lib/config/protos/MarketData.pb.h" diff --git a/src/lib/md/test/Co2ManagedTestHelper.cpp b/src/lib/md/test/Co2ManagedTestHelper.cpp index a59e9a618..68430b4c1 100644 --- a/src/lib/md/test/Co2ManagedTestHelper.cpp +++ b/src/lib/md/test/Co2ManagedTestHelper.cpp @@ -2,7 +2,7 @@ #include "lib/utils/bts_export.h" #include "../coconut2.h" #include "lib/config/config.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/utils/TimeStamp.h" #include #include diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index 029d0fc04..ab1b6e538 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -5,7 +5,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_chrono.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "boost/container/small_vector.hpp" namespace bts { diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index e1b14e4fa..2c4f31834 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.spark; option csharp_namespace="bts.spark"; -import "lib/api/apioptions.proto"; +import "lib/api/Apioptions.proto"; // /***************************************Algo Order Support Data**********************************/ diff --git a/src/server/sparkd/http/ApiGateway.h b/src/server/sparkd/http/ApiGateway.h index 3d8fb3f8f..ea5a2bd8b 100644 --- a/src/server/sparkd/http/ApiGateway.h +++ b/src/server/sparkd/http/ApiGateway.h @@ -1,7 +1,7 @@ #pragma once #include "lib/api/public/ServiceContext.h" -#include "lib/api/apigateway.pb.h" +#include "lib/api/Apigateway.pb.h" #include #include diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index c5d8e8160..ce1414dba 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -3,7 +3,7 @@ #include "MultipartFormDecoder.h" #include "lib/utils/Dispatcher.h" #include "lib/api/core/ApiClientInterop.h" -#include "lib/api/apigateway.pb.h" +#include "lib/api/Apigateway.pb.h" #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index d9bc8a316..7f392f5d8 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -3,7 +3,7 @@ #include #include "lib/utils/helper_macros.h" #include "lib/config/protos/MarketData.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" using namespace std; using namespace bts::co2; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index c9cb6a79b..e77a1796e 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -10,7 +10,7 @@ #include "lib/utils/Dispatcher.h" #include "lib/utils/proto_helper.h" #include "lib/utils/bts_chrono.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/config/protos/MarketData.pb.h" #include "lib/config/protos/system.pb.h" diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index 90684219c..0eed10a26 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -3,7 +3,7 @@ #include #include "lib/utils/helper_macros.h" #include "lib/config/protos/MarketData.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" using namespace std; using namespace bts::co2; diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index 78547f12a..4082bcc4c 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -8,7 +8,7 @@ #include "lib/os/os.h" #include "lib/utils/Dispatcher.h" #include "lib/utils/proto_helper.h" -#include "lib/md/protos/co2.pb.h" +#include "lib/md/protos/Co2.pb.h" #include "lib/config/protos/MarketData.pb.h" #include "lib/config/protos/system.pb.h" diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index 6ff9f4c53..c8e39c1f8 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.1 diff --git a/tools/replicator/replicate_to_linux_vm.py b/tools/replicator/replicate_to_linux_vm.py index dcecaab1d..4be1da630 100644 --- a/tools/replicator/replicate_to_linux_vm.py +++ b/tools/replicator/replicate_to_linux_vm.py @@ -13,7 +13,7 @@ ignore = Regex .*\.pyc ignore = Path x64 ignore = Path .vs ignore = Path .vscode -ignore = Path src/client +ignore = Path src/client/spark ignore = Path src/web/api/node_modules ignore = Path src/web/ui/node_modules ignore = Path src/web/ui/src/obj