fix typo in notes

updating release notes
SP-283 Ladder does not display 6c spreads correctly
2020-01-30 07:39:22 -06:00 · 2020-01-30 07:37:51 -06:00 · 2020-01-29 12:43:01 -06:00 · 2020-01-10 22:39:27 +00:00 · 2020-01-10 14:43:06 -05:00
157 changed files with 986 additions and 1076 deletions
@@ -34,4 +34,3 @@ trace_data/
 /doc/user/public/*
 .ionide/*
 /.ignore
-CMakeDeps.cmake
@@ -46,7 +46,7 @@
            "sourceFileMap": {
                "/home/bts/spark/": "${workspaceRoot}"
            }
-        },     
+        },
        {
            "name": "(gdb) Launch",
            "type": "cppdbg",
@@ -345,11 +345,12 @@
            "name": ".NET Core Remote Launch",
            "type": "coreclr",
            "request": "launch",
-            "program": "sparkcmd",
+            "program": "/usr/bin/dotnet",
            "args": [
+                "sparkcmd.dll",
                "test",
+                "test_join_create_and_takeout_market"
            ],
-            "env": {"LD_LIBRARY_PATH" : "."},
            "stopAtEntry": false,
            "cwd": "/home/bts/spark/build/ninja_debug/server",
            "pipeTransport": {
@@ -360,11 +361,11 @@
                "debuggerPath": "/home/bts/vsdbg/vsdbg",
                "pipeCwd": "${workspaceRoot}",
                "quoteArgs": true
-            },           
+            },
            "sourceFileMap": {
                "/home/bts/spark/": "${workspaceRoot}"
            },
            "justMyCode": false
-        },               
+        },
    ]
 }
@@ -48,7 +48,6 @@ else ()
  add_subdirectory(doc/user)
  add_subdirectory(src/sdk)
  add_subdirectory(src/data_files)
-  add_subdirectory(src/client)

  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server
    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
@@ -60,17 +59,7 @@ else ()
    COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
    COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
    COMMENT "Creating server runtime layout"
-    DEPENDS sparkd data_files_dir spark_client_dir
    DEPENDS sparkd data_files_dir)  

  add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
-  
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.1/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
-else()
-   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.1/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
-endif()
-      
 endif()
@@ -1 +1 @@
-set(sources /home/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
+set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
@@ -4,6 +4,15 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+## 2.15.3
+### Bug Fixes
+  - Fixed a bug where some CME currency spreads exhibited incorrect tick values
+## 2.15.2
+### User Visible Changes  
+  - Excel RTD plugin can now receive ICE market data
+## 2.15.1
+### Bug Fixes
+  - Fixed a FIX log parsing issue that resulted in exchange gateway logon problems
 ## 2.15.0
 ### User Visible Changes  
  - Added ability to hide Ladder status messages via Ladder Settings -> Left Panel tab -> Show/Hide groupbox -> Status Message
@@ -1,95 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\sparkcmd\sparkcmd.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		MinSizeRel|x64 = MinSizeRel|x64
-		Release|x64 = Release|x64
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-	EndGlobalSection
-	# The dotnet (core) build cli does not support c++ projects.
-	# Until this changes, c++ projects/solutions must be built with msbuild.
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Debug|x64.ActiveCfg = Debug|x64
-		# {8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Debug|x64.Build.0 = Debug|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		# {8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Release|x64.ActiveCfg = Release|x64
-		# {8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Release|x64.Build.0 = Release|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		# {8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Debug|x64.ActiveCfg = Debug|x64
-		# {23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Debug|x64.Build.0 = Debug|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		# {23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Release|x64.ActiveCfg = Release|x64
-		# {23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Release|x64.Build.0 = Release|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		# {23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-EndGlobal
@@ -1,10 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2024
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{3335AAF0-489D-359D-8305-9B7A44E2C760}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
 EndProject
@@ -12,81 +12,213 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\spar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{2256015B-E7D5-3614-8F39-814CA68A4444}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4} = {8C03E81A-6981-3441-BF6C-6ECE7F0482E4}
+		{3335AAF0-489D-359D-8305-9B7A44E2C760} = {3335AAF0-489D-359D-8305-9B7A44E2C760}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_excel", "src\client\spark_excel\spark_excel.csproj", "{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		MinSizeRel|Any CPU = MinSizeRel|Any CPU
 		MinSizeRel|x64 = MinSizeRel|x64
+		MinSizeRel|x86 = MinSizeRel|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
 		RelWithDebInfo|x64 = RelWithDebInfo|x64
+		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Debug|x64.ActiveCfg = Debug|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Debug|x64.Build.0 = Debug|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Release|x64.ActiveCfg = Release|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.Release|x64.Build.0 = Release|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{8C03E81A-6981-3441-BF6C-6ECE7F0482E4}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.Build.0 = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x86.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|Any CPU.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.Build.0 = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x86.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Debug|x64.ActiveCfg = Debug|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Debug|x64.Build.0 = Debug|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Release|x64.ActiveCfg = Release|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.Release|x64.Build.0 = Release|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{23CC41FA-C9CE-3B77-BED8-71C058B05C4F}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.Build.0 = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x86.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|Any CPU.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.Build.0 = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x86.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.Build.0 = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x86.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1,19 +0,0 @@
-
-cmake_minimum_required(VERSION 3.5)
-project(spark_client)
-include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake)
-
-file(GLOB_RECURSE spark_client_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cs)
-file(GLOB_RECURSE spark_client_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.csproj)
-file(GLOB_RECURSE spark_ui_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.cs)
-file(GLOB_RECURSE spark_ui_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.csproj)
-list(REMOVE_ITEM spark_ui_sources ${spark_client_sources} )
-list(REMOVE_ITEM spark_ui_csproj ${spark_client_csproj} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/../
-   COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh
-   ARGS ${CMAKE_BUILD_TYPE} ${CMAKE_BINARY_DIR}
-   COMMENT "Building sparkcmd in netcore3"
-   DEPENDS libspark ${spark_client_sources} ${spark_client_csproj} ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh)
-
-   add_custom_target(spark_client_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/../)   
@@ -5,7 +5,6 @@
    <SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
    <SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
    <Externals>$(SparkRoot)\externals\windows</Externals>
-    <Externals Condition=" '$(OS)' != 'Windows_NT' ">$(SparkRoot)/externals/linux</Externals>
    <DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
    <ErrorReport>None</ErrorReport>
    <Prefer32Bit>False</Prefer32Bit>
@@ -20,25 +19,20 @@
    <OutputPath>$(BaseOutputPath)\bin</OutputPath>
    <BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
    <IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
-    <BaseIntermediateOutputPath Condition=" '$(OS)' != 'Windows_NT' ">$(BaseOutputPath)\linuxobj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition=" '$(OS)' != 'Windows_NT' ">$(BaseOutputPath)\linuxobj\$(MSBuildProjectName)</IntermediateOutputPath>
    <GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
 </PropertyGroup>

-
 <Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />

 <ItemGroup>
    <AvailableItemName Include="Proto2">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' " >CompileProto2</Targets>
-        <Targets Condition=" '$(OS)' != 'Windows_NT' " >CompileProto2Linux</Targets>
+        <Targets>CompileProto3</Targets>
    </AvailableItemName>
    <AvailableItemName Include="Proto3">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' " >CompileProto3</Targets>
-        <Targets Condition=" '$(OS)' != 'Windows_NT' " >CompileProto3Linux</Targets>
+        <Targets>CompileProto3</Targets>
    </AvailableItemName>
    <AvailableItemName Include="Proto3Excel">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' ">CompileProto3Excel</Targets>
+        <Targets>CompileProto3Excel</Targets>
    </AvailableItemName>    
 </ItemGroup>

@@ -49,14 +43,6 @@
    <protogen>$(Externals)\bin\protogen.exe</protogen>
 </PropertyGroup>

-<PropertyGroup Label="ProtoBuf" Condition=" '$(OS)' != 'Windows_NT' ">
-    <ProtocPluginBase>$(SparkRoot)/src/lib/api/service_compiler</ProtocPluginBase>
-    <ProtoInclude>$(Externals)/include</ProtoInclude>
-    <protoc>$(Externals)/bin/protoc</protoc>
-    <protoc_rename>$(Externals)/bin/lowercase_files.sh</protoc_rename>
-    <protogen>$(Externals)/bin/protogen</protogen>
-</PropertyGroup>
-
 <ItemDefinitionGroup>
    <Proto2>
    </Proto2>
@@ -3,7 +3,7 @@


 <Target Name="CompileProto2" 
-    Condition="'@(Proto2)'!='' AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto2)'!=''"
    Inputs="$(MSBuildProjectFile);$(protogen);%(Proto2.FullPath)" 
    Outputs="$(GenDir)\proto2\%(Proto2.filename).cs"
    AfterTargets="PreBuildEvent">
@@ -28,7 +28,7 @@
    passes wipes out the additional compile includes that we add.
 -->
 <Target Name="CompileProto3" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3)'!=''  AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto3)'!=''"
    Inputs="$(protoc);
    %(Proto3.Identity);$(ProtocPluginBase)\plugin.py;
    $(ProtocPluginBase)\templates\c#\client.pb.cs;
@@ -58,7 +58,7 @@
 </Target>

 <Target Name="CompileProto3Excel" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3Excel)'!='' AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto3Excel)'!=''"
    Inputs="$(protoc);
    %(Proto3Excel.Identity);$(ProtocPluginBase)\plugin.py;
    $(ProtocPluginBase)\templates\excel\excel.pb.cs;"
@@ -82,74 +82,12 @@
    </ItemGroup>
 </Target>

-
-<Target Name="CompileProto2Linux" 
-    Condition="'@(Proto2)'!='' AND '$(OS)' != 'Windows_NT' "
-    Inputs="$(MSBuildProjectFile);$(protogen);%(Proto2.FullPath)" 
-    Outputs="$(GenDir)/proto2/%(Proto2.filename).cs"
-    AfterTargets="PreBuildEvent">
-    <PropertyGroup>
-        <SourceRelativeFile>$([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), ''))</SourceRelativeFile>
-        <SourceRelativeDir>$([System.IO.Path]::GetDirectoryName($(SourceRelativeFile)))</SourceRelativeDir>
-        <WorkingDirectory>$(GenDir)/proto2</WorkingDirectory>
-    </PropertyGroup>
-    <MakeDir Directories="$(WorkingDirectory)" />
-    <Copy SourceFiles="%(Proto2.FullPath)" DestinationFolder="$(WorkingDirectory)" SkipUnchangedFiles="True" UseHardLinksIfPossible="True" />
-    <Error Text="protogen.exe does not exist. If you forgot to clone with externals try: git submodule update --init --recursive" Condition="!Exists($(protogen))" />
-    <Message Importance="High" Text="Doing Proto2 %(proto2.filename)" />
-    <Exec Command="$(Protogen) %(Proto2.filename)%(proto2.extension) --csharp_out=. -I. -I$(SourceRoot) -I$(Externals)/include"
-          WorkingDirectory="$(WorkingDirectory)" />
-    <ItemGroup>
-        <Compile Include="$(WorkingDirectory)/%(Proto2.filename).cs" />
-    </ItemGroup>
-</Target>
-
-<Target Name="CompileProto3Linux" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3)'!='' AND '$(OS)' != 'Windows_NT' "
-    Inputs="$(protoc);
-    %(Proto3.Identity);$(ProtocPluginBase)/plugin.py;
-    $(ProtocPluginBase)/templates/c#/client.pb.cs;
-    $(ProtocPluginBase)/templates/c#/server.pb.cs;
-    $(ProtocPluginBase)/templates/c#/immutable.pb.cs;"
-    Outputs="%(Proto3.OutCS);%(Proto3.OutCSServer);%(Proto3.OutCSClient);%(Proto3.OutCSImmutable)">
-    <MakeDir Directories="%(Proto3.OutBase)" />
-    <MakeDir Directories="$(IntermediateOutputPath)/gen" />
-   
-    <Message Importance="High" Text="Generating service %(Proto3.FileName)" />
-    <Exec Command="
-       PYTHONPATH=$(Externals)/python $(protoc) \
-       %(Proto3.FullPath) \
-       --error_format=gcc \
-       --proto_path=$(protoinc):$(SourceRoot) \
-       --plugin=&apos;protoc-gen-service=$(ProtocPluginBase)/plugin.py&apos; \
-       --service_out=lang=c#,strip_out_path=1:%(Proto3.OutBase) \
-       --csharp_out=%(CompileOptions)%(Proto3.OutBase)"
-      WorkingDirectory="%(relativedir)" />    
-      
-    <!-- <Exec Command="$(protoc_rename) %(Proto3.OutBase)"  />    -->
-            
-    <ItemGroup>
-       <Compile Include="%(Proto3.OutCS)" />
-       <Compile Include="%(Proto3.OutCSClient)" />
-       <Compile Include="%(Proto3.OutCSServer)" />
-       <Compile Include="%(Proto3.OutCSImmutable)" />
-    </ItemGroup>
-</Target>
-
-<!-- <Target Name="RenameProto3Linux" AfterTargets="CompileProto3Linux"
-   Condition="'@(Proto3)'!='' AND '$(OS)' != 'Windows_NT' ">
-   <Move SourceFiles="$(OutBase)\Apicore.cs" DestinationFiles="$(OutBase)\apicore.cs" />  
-   <Move SourceFiles="$(OutBase)\Apioptions.cs" DestinationFiles="$(OutBase)\apioptions.cs" />  
-   <Move SourceFiles="$(OutBase)\Co2.cs" DestinationFiles="$(OutBase)\co2.cs" />  
-</Target> -->
-
-
 <Target Name="AfterClean" AfterTargets="Clean">
    <Delete Files="%(Proto3.OutCS)" />
    <Delete Files="%(Proto3.OutCSClient)" />
    <Delete Files="%(Proto3.OutCSServer)" />
    <Delete Files="%(Proto3.OutCSImmutable)" />
-    <Delete Files="$(GenDir)/proto2/*" />
+    <Delete Files="$(GenDir)\proto2\*" />
    <Delete Files="%(Proto3Excel.OutCSExcel)" />
 </Target>

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#$1 = Debug / Release (CMAKE_BUILD_TYPE), $2 = CMAKE_BINARY_DIR
-cd "$(dirname "$0")"
-echo $PWD dotnet build -c $1 ./sparkcmd/
-dotnet build -c $1 -o $2/../$1/bin/netcoreapp3.1/linux-x64 ./sparkcmd/ 
-
-if [ "$1" == "Release" ]
-then
-   dotnet publish -c $1 -o $2/../$1/bin/netcoreapp3.1/linux-x64 ./sparkcmd/ 
-   ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.1/linux-x64/publish
-fi
-
-ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.1/linux-x64
@@ -2,7 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:mbts.ui.shell"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
             xmlns:converters="clr-namespace:mbts.ui.converters">
   <Application.Resources>
      <ResourceDictionary>
@@ -3,7 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:mbts="clr-namespace:mbts.ui"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >

  <sys:String x:Key="{x:Static mbts:Icons.AttachAlgosKey}">
@@ -6,7 +6,7 @@
                    xmlns:c="clr-namespace:mbts.ui.controls"
                    xmlns:cv="clr-namespace:mbts.ui.converters"
                    xmlns:usp="clr-namespace:mbts.ui.spark"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/Converters.xaml"/>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
@@ -4,7 +4,7 @@
                    xmlns:c="clr-namespace:mbts.ui.controls"
                    xmlns:cv="clr-namespace:mbts.ui.converters"
                    xmlns:usp="clr-namespace:mbts.ui.spark"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <cv:ValueMap x:Key="EmptyStringVisibilityConverter" Default="{u:Visibility Visible}">
    <cv:KeyValue Key="{x:Static sys:String.Empty}" Value="{u:Visibility Collapsed}"/>
    <cv:KeyValue Key="{x:Null}" Value="{u:Visibility Collapsed}"/>
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 namespace mbts.spark {
   partial class SyntheticEditorVM {
      class QuoteInsideMarketDistanceTowardModel : RowModelBase<uint> {
-         readonly Dictionary<uint, uint> _value_store = new Dictionary<uint, uint>();
+         IDictionary<int, uint> _value_store = new Dictionary<int, uint>();

         public override string display_name { get; } = "Toward Distance";
         public override string help_text { get; } = string.Empty;
@@ -21,7 +21,7 @@ namespace mbts.spark {
               _value_from_store(leg_tup);

         public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
-            _value_store[leg_tup.SecurityKey] = value;
+            _value_store[leg_tup.id] = value;
            if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance)
               inside_market_distance.OnTowardDistance = value;
         }
@@ -33,7 +33,7 @@ namespace mbts.spark {
            leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle;

         uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
-            _value_store.GetValueOrDefault(leg_tup.SecurityKey);
+            _value_store.GetValueOrDefault(leg_tup.id);
      }
   }
 }
@@ -11,7 +11,7 @@
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
  xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  u:StateManager.VisualState="{Binding selected_definition.algo_root, Converter={x:Static usp:AlgoStudioView.EditPaneVisualStateConverter}}"
  Background="{StaticResource CommonBackground}"
 >
@@ -11,7 +11,7 @@
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
  xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <UserControl.Resources>
    <ResourceDictionary>
@@ -9,7 +9,7 @@
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
  xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <UserControl.Resources>
    <ResourceDictionary>
@@ -9,7 +9,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
  TextElement.FontSize="{x:Static u:FontSizes.Small}"
 >
@@ -9,7 +9,7 @@
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
  xmlns:converters="clr-namespace:mbts.ui.converters"
  xmlns:txt="clr-namespace:mbts.ui.utility.text"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  Height="600"
  Width="420"
  Background="{x:Static mbts:BTSColors.common_background_brush}"
@@ -6,7 +6,7 @@
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  FocusVisualStyle="{x:Null}"
 >
  <UserControl.Resources>
@@ -10,7 +10,7 @@
             xmlns:c="clr-namespace:mbts.ui.controls"
             xmlns:usp="clr-namespace:mbts.ui.spark"
             xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
             xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api"
             mc:Ignorable="d"
             MaxHeight="240"
@@ -8,7 +8,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  InactiveSelectionOpacity="0.3"
 >
  <c:DIYGrid.Resources>
@@ -1,5 +1,7 @@
 <ResourceDictionary
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:ie="http://schemas.microsoft.com/expression/2010/interactions"
+  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:ob="clr-namespace:bts.shell.orderbook"
  xmlns:sp="clr-namespace:mbts.spark"
@@ -430,11 +432,11 @@
                    BorderBrush="{u:BTSColor UI.Button.normal_border}"
                    Background="{StaticResource ControlBackground}"
                  >
-                    <!--<i:Interaction.Triggers>
+                    <i:Interaction.Triggers>
                      <i:EventTrigger EventName="MouseLeave">
                        <ie:ChangePropertyAction TargetName="OverflowPopup" PropertyName="IsOpen" Value="False"/>
                      </i:EventTrigger>
-                    </i:Interaction.Triggers>-->
+                    </i:Interaction.Triggers>
                    <StackPanel Orientation="Vertical">
                      <MenuItem
                        c:RadioButtonGroupManager.Manager="{Binding Path='(c:RadioButtonGroupManager.Manager)', RelativeSource={RelativeSource AncestorType=ToolBar}}"
@@ -11,7 +11,7 @@
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:ut="clr-namespace:mbts.ui.utilities"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  xmlns:ob="clr-namespace:bts.shell.orderbook"
  Grid.Row="0"
  FocusManager.IsFocusScope="True"
@@ -5,7 +5,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <cv:MultiValueConverterPipe x:Key="CalculatorButtonsVisualStateConverter">
    <cv:BooleanNoneConverter/>
@@ -9,7 +9,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  FocusManager.IsFocusScope="True"
  Background="{StaticResource CommonBackground}"
 >
@@ -6,7 +6,7 @@
             xmlns:cv="clr-namespace:mbts.ui.converters"
             xmlns:usp="clr-namespace:mbts.ui.spark"
             xmlns:uag="clr-namespace:mbts.ui.spark.algo"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+             xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <UserControl.Resources>
    <ResourceDictionary>
      <ResourceDictionary.MergedDictionaries>
@@ -4,7 +4,7 @@
        xmlns:u="clr-namespace:mbts.ui"
        xmlns:cv="clr-namespace:mbts.ui.converters"
        xmlns:usp="clr-namespace:mbts.ui.spark"
-        xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
        u:WindowStyle.SizeToContent="WidthAndHeight"
        u:WindowStyle.TitleContent="{Binding bbo, Mode=OneWay}"
        Style="{StaticResource BTSWindowTitleTemplate}">
@@ -4,7 +4,7 @@
        xmlns:msys="clr-namespace:bts.api;assembly=spark_api"
        xmlns:u="clr-namespace:mbts.ui"
        xmlns:usp="clr-namespace:mbts.ui.spark"
-        xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
        u:WindowStyle.SizeToContent="WidthAndHeight"
        u:WindowStyle.TitleContent="{Binding bbo, Mode=OneWay}"
        Style="{StaticResource BTSWindowTitleTemplate}">
@@ -4,7 +4,7 @@
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Colors.xaml"/>
@@ -19,7 +19,7 @@ namespace bts.Properties {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -59,7 +59,34 @@ namespace bts.Properties {
                resourceCulture = value;
            }
        }
-        
+
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream reload_1911 {
+            get {
+                return ResourceManager.GetStream("reload_1911", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream cash_register_purchase {
+            get {
+                return ResourceManager.GetStream("cash_register_purchase", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream powerup {
+            get {
+                return ResourceManager.GetStream("powerup", resourceCulture);
+            }
+        }
+
        /// <summary>
        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
        /// </summary>
@@ -72,18 +99,9 @@ namespace bts.Properties {
        /// <summary>
        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
        /// </summary>
-        internal static System.IO.UnmanagedMemoryStream cash_register_purchase {
+        internal static System.IO.UnmanagedMemoryStream whistle {
            get {
-                return ResourceManager.GetStream("cash_register_purchase", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
-        internal static System.IO.UnmanagedMemoryStream game_over_arcade {
-            get {
-                return ResourceManager.GetStream("game_over_arcade", resourceCulture);
+                return ResourceManager.GetStream("whistle", resourceCulture);
            }
        }
        
@@ -105,6 +123,15 @@ namespace bts.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream game_over_arcade {
+            get {
+                return ResourceManager.GetStream("game_over_arcade", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized resource of type System.Byte[].
        /// </summary>
@@ -124,32 +151,5 @@ namespace bts.Properties {
                return ((byte[])(obj));
            }
        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
-        internal static System.IO.UnmanagedMemoryStream powerup {
-            get {
-                return ResourceManager.GetStream("powerup", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
-        internal static System.IO.UnmanagedMemoryStream reload_1911 {
-            get {
-                return ResourceManager.GetStream("reload_1911", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
-        /// </summary>
-        internal static System.IO.UnmanagedMemoryStream whistle {
-            get {
-                return ResourceManager.GetStream("whistle", resourceCulture);
-            }
-        }
    }
 }
@@ -118,34 +118,34 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="bell_counter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Sounds\bell_counter.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="cash_register_purchase" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Sounds\cash_register_purchase.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="game_over_arcade" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Sounds\game_over_arcade.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="game_sound_correct" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Sounds\game_sound_correct.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="game_sound_wrong" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Sounds\game_sound_wrong.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="Grab" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Images\Cursors\Grab.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="Grabbing" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Images\Cursors\Grabbing.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="whistle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sounds\whistle.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="bell_counter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sounds\bell_counter.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="powerup" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Sounds\powerup.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="cash_register_purchase" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sounds\cash_register_purchase.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="game_over_arcade" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sounds\game_over_arcade.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="game_sound_wrong" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sounds\game_sound_wrong.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="reload_1911" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Sounds\reload_1911.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="whistle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Sounds\whistle.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>
@@ -1,48 +1,56 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
-    <OutputType>WinExe</OutputType>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+    <TargetFramework>net471</TargetFramework>
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
    <Product>Spark</Product>
    <Description>Advanced Derivatives Trading</Description>
    <ApplicationManifest>spark.manifest</ApplicationManifest>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RootNamespace>bts</RootNamespace>
-    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <TreatWarningsAsErrors />
-    <GenerateProgramFile>false</GenerateProgramFile>
    <Configurations>Debug;Release</Configurations>
+    <Platforms>x64</Platforms>
+    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
+    <ApplicationIcon>logo.ico</ApplicationIcon>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>mbts.ui.shell.App</StartupObject>
+    <RootNamespace>bts</RootNamespace>
+    <LangVersion>7.2</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <Version>1.0.0</Version>
  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
-    <PackageReference Include="IronPython" Version="2.7.9" />
-    <PackageReference Include="NAudio" Version="1.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
-    <PackageReference Include="System.Composition.AttributedModel" Version="1.4.0" />
-    <FrameworkReference Remove="Microsoft.WindowsDesktop.App" />
-    <PackageReference Include="System.Reactive.Linq" Version="4.3.1" />
-    <FrameworkReference Update="Microsoft.WindowsDesktop.App" />
-    <PackageReference Include="protobuf-net" Version="2.4.4" />
-    <PackageReference Include="System.Reactive.Interfaces" Version="4.3.1" />
    <ProjectReference Include="../spark_api/spark_api.csproj" />
    <ProjectReference Include="../spark_core/spark_core.csproj" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="PresentationFramework.Aero" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
+    <PackageReference Include="IronPython" Version="2.7.7" />
+    <PackageReference Include="NAudio" Version="1.8.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="protobuf-net" Version="2.3.2" />
+    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+    <PackageReference Include="WPFTextBoxAutoComplete" Version="1.0.5" />
  </ItemGroup>
  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" Generator="MSBuild:Compile" />
+    <Page Include="**\*.xaml" Exclude="App.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
+    <Proto3 Include="core\Settings\UISettings.proto" />
    <Resource Include="**\*.ico" />
    <Resource Include="**\*.png" />
-    <Proto3 Include="core\Settings\UISettings.proto" />
    <ConfigDefaults Include="../../lib/config/defaults/*.conf" />
  </ItemGroup>
  <ItemGroup>
@@ -52,17 +60,8 @@
    <Content Include="logo.ico" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <EmbeddedResource Include="Sounds\game_sound_correct.wav" />
+    <EmbeddedResource Include="Sounds\whistle.wav" />
  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
+  <Target Name="diagnostic" AfterTargets="PreBuildEvent" />
 </Project>
@@ -147,8 +147,15 @@ namespace bts.api.diagnostic {
         }
      }

-      public override Task<ScriptResultMessage> run(ScriptLines request) =>
-         _dispatcher.InvokeAsync(() => {
+      public override Task<ScriptResultMessage> run(ScriptLines request) {
+
+         var tcs = new TaskCompletionSource<ScriptResultMessage>();
+         void ret(ScriptResultMessage r) {
+            tcs.TrySetResult(r);
+         }
+
+         _dispatcher.BeginInvoke(() => {
+
            // append lines to _pending
            foreach (var line in request.Lines) {
               _pending.AppendLine(line);
@@ -164,18 +171,23 @@ namespace bts.api.diagnostic {
               // If 'complete' run code
               case ScriptCodeParseResult.Complete:
                  _pending.Clear();
-                  //ret(run_code(code));
-                  return run_code(code);
+                  ret(run_code(code));
+                  break;
               // if 'invalid' return error
               case ScriptCodeParseResult.Invalid:
                  Console.WriteLine("Invalid");
                  _pending.Clear();
-                  return new ScriptResultMessage { Res = ScriptResult.Invalid, Message = code.GetCode() };
+                  ret(new ScriptResultMessage { Res = ScriptResult.Invalid, Message = code.GetCode() });
+                  break;
               // otherwise continue buffering
               default:
                  Console.WriteLine("Incomplete");
-                  return new ScriptResultMessage { Res = ScriptResult.Incomplete };
+                  ret(new ScriptResultMessage { Res = ScriptResult.Incomplete });
+                  break;
            }
-         }).Task;
+         });
+
+         return tcs.Task;
+      }
   }
 }
@@ -8,7 +8,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  FocusManager.IsFocusScope="True"
  u:WindowStyle.SizeToContent="WidthAndHeight"
  Background="{StaticResource CommonBackground}"
@@ -1,15 +1,23 @@
-using System.Threading.Tasks;
-
-namespace System.Windows.Threading {
-   public static class DispatcherHelper {
-      public static void Ignore(this DispatcherOperation dispatcher_operation) { }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;

+namespace System.Windows.Threading
+{
+   public static class DispatcherHelper
+   {
      #region Easy Invoke

      public static void Invoke(this Dispatcher d, Action action) {
         d.Invoke(action);
      }

+      public static void BeginInvoke(this Dispatcher d, Action action) {
+         d.BeginInvoke(action);
+      }
+
      public static void Invoke<T>(this Dispatcher d, Action<T> action, T arg1) {
         d.Invoke(action, arg1);
      }
@@ -3,7 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
@@ -3,7 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
@@ -3,7 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
@@ -11,7 +11,7 @@
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:ut="clr-namespace:mbts.ui.utilities"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <UserControl.Resources>
    <ResourceDictionary>
@@ -4,7 +4,7 @@
                    xmlns:c="clr-namespace:mbts.ui.controls"
                    xmlns:usp="clr-namespace:mbts.ui.spark"
                    xmlns:msp="clr-namespace:mbts.spark"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
    <ResourceDictionary Source="/view/Controls/DataGridEx/Filters/Views/DoubleMinMaxFilterControl.xaml"/>
@@ -3,7 +3,7 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/Buttons.xaml"/>
@@ -4,7 +4,7 @@
             xmlns:u="clr-namespace:mbts.ui"
             xmlns:converters="clr-namespace:mbts.ui.converters"
             xmlns:controls="clr-namespace:mbts.ui.controls"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+             xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/Converters.xaml"/>
  </ResourceDictionary.MergedDictionaries>
@@ -8,7 +8,7 @@
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Controls/TickUpDown/TickUpDown.xaml"/>
@@ -6,7 +6,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Controls/Popup/PopupControl.xaml"/>
@@ -6,7 +6,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:uag="clr-namespace:mbts.ui.spark.algo"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <!--Primitives--> 
  <sys:Double x:Key="TickUpDownMinWidth">37</sys:Double>
@@ -5,7 +5,7 @@
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:txt="clr-namespace:mbts.ui.utility.text"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/ComboBoxes.xaml"/>
@@ -4,7 +4,7 @@
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  xmlns:proto="clr-namespace:bts.proto"
 >
  <ResourceDictionary.MergedDictionaries>
@@ -3,7 +3,7 @@
                    xmlns:u="clr-namespace:mbts.ui"
                    xmlns:c="clr-namespace:mbts.ui.controls"
                    xmlns:cv="clr-namespace:mbts.ui.converters"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Colors.xaml"/>
  </ResourceDictionary.MergedDictionaries>
@@ -4,7 +4,7 @@
  xmlns:u="clr-namespace:mbts.ui"
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  xmlns:proto="clr-namespace:bts.proto"
 >
  <ResourceDictionary.MergedDictionaries>
@@ -4,7 +4,7 @@
                    xmlns:c="clr-namespace:mbts.ui.controls"
                    xmlns:cv="clr-namespace:mbts.ui.converters"
                    xmlns:txt="clr-namespace:mbts.ui.utility.text"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Colors.xaml"/>
  </ResourceDictionary.MergedDictionaries>
@@ -1,9 +1,13 @@
 <ResourceDictionary
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:ie="http://schemas.microsoft.com/expression/2010/interactions"
+  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
  xmlns:u="clr-namespace:mbts.ui"
+  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:usp="clr-namespace:mbts.ui.spark"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <!--Primitive Constants-->
  <sys:Double x:Key="VerticalPush1">4</sys:Double>
@@ -190,11 +194,11 @@
                    BorderBrush="{u:BTSColor UI.Button.normal_border}"
                    Background="{x:Static u:BTSColors.common_background_brush}"
                  >
-                    <!--<i:Interaction.Triggers>
+                    <i:Interaction.Triggers>
                      <i:EventTrigger EventName="MouseLeave">
                        <ie:ChangePropertyAction TargetName="OverflowPopup" PropertyName="IsOpen" Value="False"/>
                      </i:EventTrigger>
-                    </i:Interaction.Triggers>-->
+                    </i:Interaction.Triggers>
                    <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel"/>
                  </Border>
                </Popup>
@@ -288,7 +288,7 @@ namespace mbts.ui {
               if (selector != null) {
                  selector.Dispatcher.BeginInvoke(() => {
                     selector.SelectedItem = src;
-                  }).Ignore();
+                  });
               }

               new_window.Activate();
@@ -1,54 +1,52 @@
-//// from https://gist.github.com/ryanvs/8059757
+// from https://gist.github.com/ryanvs/8059757

-/// This class was commented out during the migration to .NET Core 3,
-/// bc it derives from a type defined in an assembly, System.Interactivity, that is incompatible w/ .NET Core 3.
-//using System;
-//using System.Threading;
-//using System.Windows;
-//using System.Windows.Controls;
-//using System.Windows.Controls.Primitives;
-//using System.Windows.Interactivity;
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Interactivity;

-//namespace mbts.ui
-//{
-//   internal class DropDownButtonBehavior : Behavior<Button> {
-//      private long attachedCount;
-//      private bool isContextMenuOpen;
+namespace mbts.ui
+{
+   internal class DropDownButtonBehavior : Behavior<Button> {
+      private long attachedCount;
+      private bool isContextMenuOpen;

-//      protected override void OnAttached() {
-//         base.OnAttached();
-//         AssociatedObject.AddHandler(Button.ClickEvent, new RoutedEventHandler(AssociatedObject_Click), true);
-//      }
+      protected override void OnAttached() {
+         base.OnAttached();
+         AssociatedObject.AddHandler(Button.ClickEvent, new RoutedEventHandler(AssociatedObject_Click), true);
+      }

-//      void AssociatedObject_Click(object sender, System.Windows.RoutedEventArgs e) {
-//         Button source = sender as Button;
-//         if (source != null && source.ContextMenu != null) {
-//            // Only open the ContextMenu when it is not already open. If it is already open,
-//            // when the button is pressed the ContextMenu will lose focus and automatically close.
-//            if (!isContextMenuOpen) {
-//               source.ContextMenu.AddHandler(ContextMenu.ClosedEvent, new RoutedEventHandler(ContextMenu_Closed), true);
-//               Interlocked.Increment(ref attachedCount);
-//               // If there is a drop-down assigned to this button, then position and display it 
-//               source.ContextMenu.PlacementTarget = source;
-//               source.ContextMenu.Placement = PlacementMode.Bottom;
-//               source.ContextMenu.IsOpen = true;
-//               isContextMenuOpen = true;
-//            }
-//         }
-//      }
+      void AssociatedObject_Click(object sender, System.Windows.RoutedEventArgs e) {
+         Button source = sender as Button;
+         if (source != null && source.ContextMenu != null) {
+            // Only open the ContextMenu when it is not already open. If it is already open,
+            // when the button is pressed the ContextMenu will lose focus and automatically close.
+            if (!isContextMenuOpen) {
+               source.ContextMenu.AddHandler(ContextMenu.ClosedEvent, new RoutedEventHandler(ContextMenu_Closed), true);
+               Interlocked.Increment(ref attachedCount);
+               // If there is a drop-down assigned to this button, then position and display it 
+               source.ContextMenu.PlacementTarget = source;
+               source.ContextMenu.Placement = PlacementMode.Bottom;
+               source.ContextMenu.IsOpen = true;
+               isContextMenuOpen = true;
+            }
+         }
+      }

-//      protected override void OnDetaching() {
-//         base.OnDetaching();
-//         AssociatedObject.RemoveHandler(Button.ClickEvent, new RoutedEventHandler(AssociatedObject_Click));
-//      }
+      protected override void OnDetaching() {
+         base.OnDetaching();
+         AssociatedObject.RemoveHandler(Button.ClickEvent, new RoutedEventHandler(AssociatedObject_Click));
+      }

-//      void ContextMenu_Closed(object sender, RoutedEventArgs e) {
-//         isContextMenuOpen = false;
-//         var contextMenu = sender as ContextMenu;
-//         if (contextMenu != null) {
-//            contextMenu.RemoveHandler(ContextMenu.ClosedEvent, new RoutedEventHandler(ContextMenu_Closed));
-//            Interlocked.Decrement(ref attachedCount);
-//         }
-//      }
-//   }
-//}
+      void ContextMenu_Closed(object sender, RoutedEventArgs e) {
+         isContextMenuOpen = false;
+         var contextMenu = sender as ContextMenu;
+         if (contextMenu != null) {
+            contextMenu.RemoveHandler(ContextMenu.ClosedEvent, new RoutedEventHandler(ContextMenu_Closed));
+            Interlocked.Decrement(ref attachedCount);
+         }
+      }
+   }
+}
@@ -3,7 +3,7 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:ui="clr-namespace:mbts.ui"
-		xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+		xmlns:sys="clr-namespace:System;assembly=mscorlib"
    xmlns:control="clr-namespace:mbts.ui.controls">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Controls/MultiSelectDropDown.xaml" />
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:u="clr-namespace:mbts.ui"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <Color x:Key="OptionMark.MouseOver.Background.Color">#FFF3F9FF</Color>
  <Color x:Key="OptionMark.MouseOver.Border.Color">#FF5593FF</Color>
  <Color x:Key="OptionMark.MouseOver.Glyph.Color">#FF212121</Color>
@@ -4,7 +4,7 @@
                    xmlns:u="clr-namespace:mbts.ui"
                    xmlns:cv="clr-namespace:mbts.ui.converters"
                    xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <cv:BooleanOrConverter x:Key="OrConverter" />
  <cv:BooleanAndConverter x:Key="AndConverter" />
  <cv:NotConverter x:Key="NotConverter" />
@@ -2,7 +2,7 @@
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:u="clr-namespace:mbts.ui"
                    xmlns:c="clr-namespace:mbts.ui.controls"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
  <ResourceDictionary.MergedDictionaries>
    <ResourceDictionary Source="/view/Resources/Converters.xaml" />
  </ResourceDictionary.MergedDictionaries>
@@ -4,6 +4,6 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:mbts="clr-namespace:mbts.ui"
 		xmlns:ui="clr-namespace:mbts.ui"
-		xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+		xmlns:sys="clr-namespace:System;assembly=mscorlib"
    xmlns:control="clr-namespace:mbts.ui.controls">
 </ResourceDictionary>
@@ -7,7 +7,8 @@
  xmlns:shell="clr-namespace:mbts.ui.shell"
  xmlns:c="clr-namespace:mbts.ui.controls"
  xmlns:converters="clr-namespace:mbts.ui.converters"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:autocomplete="clr-namespace:WPFTextBoxAutoComplete;assembly=WPFTextBoxAutoComplete"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  x:Name="_login_view"
  Width="520"
  Height="230"
@@ -150,6 +151,7 @@

        <TextBox
          x:Name="_username"
+          autocomplete:AutoCompleteBehavior.AutoCompleteItemsSource="{Binding KnownUsers}"
          HorizontalAlignment="Stretch"
          Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
        >
@@ -10,7 +10,7 @@
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:stg="clr-namespace:mbts.ui.settings"
  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
 >
  <Grid>
    <Grid.Resources>
@@ -10,7 +10,7 @@
  xmlns:cv="clr-namespace:mbts.ui.converters"
  xmlns:usp="clr-namespace:mbts.ui.spark"
  xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-  xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
  u:WindowStyle.AllowResize="True"
  u:WindowStyle.SizeToContent="WidthAndHeight"
  u:WindowStyle.TitleContent="{Binding}"
@@ -266,7 +266,7 @@ namespace mbts.spark {
         Window choose_name_dialog(string title, ProfileVM target, Action<ProfileVM, string> commit) {
            var text_box = new TextBox { Width = 160, Margin = new Thickness(8, 0, 0, 0), Text = target?.name ?? string.Empty };
            Behavior.SetFocusOnLoaded(text_box, true);
-            //WPFTextBoxAutoComplete.AutoCompleteBehavior.SetAutoCompleteItemsSource(text_box, skip_local.Select(vm => vm.name).ToList());
+            WPFTextBoxAutoComplete.AutoCompleteBehavior.SetAutoCompleteItemsSource(text_box, skip_local.Select(vm => vm.name).ToList());
            // panel
            var panel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(8) };
            panel.Children.Add(new TextBlock { Text = "Name:", VerticalAlignment = VerticalAlignment.Center });
@@ -6,7 +6,7 @@
             xmlns:local="clr-namespace:mbts.ui.shell"
             mc:Ignorable="d" 
             xmlns:controls="clr-namespace:mbts.ui.controls"
-             xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
             xmlns:ui="clr-namespace:mbts.ui"
             Width="250"
             MaxHeight="700"
@@ -292,7 +292,9 @@ namespace mbts.spark {
            int count = 0;
            double factored_base = log10_diff > 0 ? reduced_target_base * Math.Pow(10, Math.Ceiling(log10_diff)) : reduced_target_base;
            do {
-               if (factored_base % raw_base == 0)
+               // Note that the modulus operator is not used here due to rounding errors.
+               // Such a rounding errror was the cause of the bug https://bluetradesys.atlassian.net/browse/SP-283.
+               if (MathUtils.is_int(factored_base / raw_base))
                  return new TickFactors(factored_base, factored_base / raw_base);
               factored_base *= 10;
            } while (++count < 10);
@@ -1,33 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
    <Product>Spark</Product>
    <Description />
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
    <Version>1.0.0</Version>
-    <Configurations>Debug;Release</Configurations>
+    <LangVersion>7.2</LangVersion>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
-    <PackageReference Include="System.Reactive" Version="4.3.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
  </ItemGroup>

  <ItemGroup>
    <Proto3 Include="**/*.proto" />
    <Proto3 Include="../../lib/api/*.proto" />
    <Proto3 Include="../../lib/api/services/*.proto" />
-    <Proto3 Include="../../lib/md/protos/Co2.proto" />
+    <!--Proto3 Remove="../../lib/api/services/MarketDataRelay.proto" /-->
+    <Proto3 Include="../../lib/md/protos/co2.proto" />
    <Proto3 Include="../../lib/domain_model/Security.proto" />
    <Proto3 Include="../../lib/sparkproto/SparkProtos.proto" />
    <Proto3 Update="../../lib/api/services/OutOfProcessURLListener.proto">
+      <!-- <CompileOptions>internal_access:</CompileOptions> -->
    </Proto3>
  </ItemGroup>
 </Project>
@@ -28,8 +28,5 @@ namespace bts.utils

      [DllImport("libspark")]
      public static extern bool initialize_nothrow(StringBuilder buffer, int length);
-
-      //public static string bts_data_path()
-      //use mbts.config.Configuration.get<bts.config.System>().data_path;
   }
 }
@@ -75,6 +75,12 @@ namespace System.Collections.Generic {
      }

      #region GetValueOrDefault
+      public static TValue GetValueOrDefault<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> dictionary, TKey key) =>
+         dictionary.TryGetValue(key, out TValue result) ? result : default;
+
+      public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key) =>
+         dictionary.TryGetValue(key, out TValue result) ? result : default;
+
      public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue default_value) =>
         dictionary.TryGetValue(key, out TValue result) ? result : default_value;

@@ -607,6 +607,13 @@ namespace System.Collections.Generic {
            yield return ConvertUtils.try_convert<TResult>(obj);
      }

+      public static IEnumerable<(T1, T2)> Zip<T1, T2>(this IEnumerable<T1> source, IEnumerable<T2> other) {
+         using (var sen = source.GetEnumerator())
+         using (var oen = other.GetEnumerator())
+            while (sen.MoveNext() && oen.MoveNext())
+               yield return (sen.Current, oen.Current);
+      }
+
      struct EnumerableCount<T> {
         readonly ICollection<T> _collection;
         readonly IReadOnlyCollection<T> _ro_collection;
@@ -70,13 +70,10 @@ namespace bts.test {
         psi.RedirectStandardOutput = true;
         psi.RedirectStandardError = true;
         psi.UseShellExecute = false;
- 
+
         try{
            var p = Process.Start(psi);
            p.WaitForExit((int)time_out.TotalMilliseconds);
-            var errorlevel = p.ExitCode;
-            string stdout = p.StandardOutput.ReadToEnd();
-            string stderr = p.StandardError.ReadToEnd();
            if (p.HasExited) {
               return 0;
            }
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
+    <TargetFramework>netstandard2.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
    <Version>1.0.0</Version>
-    <Configurations>Debug;Release</Configurations>
+    <LangVersion>7.2</LangVersion>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="../spark_api/spark_api.csproj" />
-    <PackageReference Include="System.Reactive" Version="4.3.1" />
-    <PackageReference Include="protobuf-net" Version="2.4.4" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="protobuf-net" Version="2.3.2" />
  </ItemGroup>

  <ItemGroup>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ExcelDna.AddIn" version="0.34.6" targetFramework="net471" />
+  <package id="ExcelDna.Integration" version="0.34.6" targetFramework="net471" />
+</packages>
@@ -66,9 +66,23 @@ namespace bts.excel.rtd
         if (string.IsNullOrEmpty(contract))
            return Observable.Return(new []{"Can't Parse Contract: " + contract ?? string.Empty});

-         Func<SecurityImmutable, bool> where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype &&
-                                                x.Glbx.SecurityDesc == contract);
+         Func<SecurityImmutable, bool> desc = null;
+         switch(ven)
+         {
+            case Venue.Sim:
+            case Venue.Glbx:
+               desc = (x=> x.Glbx.SecurityDesc == contract);
+            break;
+            case Venue.Ice:
+               desc = (x=> x.Ice.SecurityDesc == contract);
+               break;
+            default:
+               desc = (x => true);
+            break;
+         }

+         Func<SecurityImmutable, bool> where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype && desc(x) );
+                                                
         var stream = market_data(ven).subscribe_combined(where);
         return stream;
      }      
@@ -1,51 +1,59 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  
-    <TargetFramework>net48</TargetFramework>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
+    <TargetFrameworks>net471</TargetFrameworks>
    <OutputType>Library</OutputType>
+    <!-- <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <IncludeSource>true</IncludeSource>
    <IncludeSymbols>true</IncludeSymbols>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput> -->
    
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
    <Product>Spark</Product>
    <Description />
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
    <Version>1.0.0</Version>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Reactive" Version="4.3.1" />
-    <PackageReference Include="System.Reactive.PlatformServices" Version="4.3.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />  
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
+	 <PackageReference Include="NUnit" Version="3.10.1" />  
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
    <PackageReference Include="System.Linq.Dynamic" Version="1.0.7" />
    
-    <PackageReference Include="ExcelDna.AddIn" Version="1.0.0" />
-    <PackageReference Include="ExcelDna.Integration" Version="1.0.0" />
-    <PackageReference Include="ExcelDna.IntelliSense" Version="1.1.0" />
-    <PackageReference Include="ExcelDna.Registration" Version="0.34.7" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="System.Xml.Linq" Version="3.5.21022.801" />
+    <PackageReference Include="ExcelDna.AddIn" Version="0.34.6" />  
+    <PackageReference Include="ExcelDna.Integration" Version="0.34.6" />      
+    <PackageReference Include="ExcelDna.IntelliSense" Version="1.1.0" />      
+    <PackageReference Include="ExcelDna.Registration" Version="0.34.7" />      
+  </ItemGroup>
+  
+  <ItemGroup>    
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />      
  </ItemGroup>

  <ItemGroup>
    <None Include="spark_excel-AddIn.dna" />
+    <None Include="packages.config" />
    <None Include="Properties\ExcelDna.Build.props" />
  </ItemGroup>  
  
  <ItemGroup>
-    <ProjectReference Include="../spark_api/spark_api.csproj" />
+    <ProjectReference Include="../spark_api/spark_api.csproj"/>
  </ItemGroup>
  
  <ItemGroup>
@@ -54,8 +62,21 @@
  </ItemGroup>
  
  <ItemGroup>
-    <None Include="spark_excel_example_2019.xlsm">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup> 
+    <None Include="spark_excel_example_2019.xlsm"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>  
+  </ItemGroup>
+  
+  <!-- <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
+      <BuildOutputInPackage Include="$(OutputPath)..\net471\libspark.dll"/>
+    </ItemGroup>
+  </Target>  
+   -->
+  
+  <!-- <Import Project="$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets" Condition="Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets')" /> -->
+  <Import Project="$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets"/>
+  <Target Name="EnsureExcelDnaTargetsImported" BeforeTargets="BeforeBuild" Condition="'$(ExcelDnaTargetsImported)' == ''">
+    <Error Condition="!Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>  
 </Project>
@@ -1,107 +1,107 @@
-# BTS Spark 
-
-
-Our offering consists of a client UI [Spark Client](https://www.bluetradingsystems.com/images/Images/spark/02.06.19/Ladder.png), a high performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols (typically FIX/TCP for execution and some proprietary protocol over UDP multicast for market data). 
-
-![alt text](https://www.bluetradingsystems.com/images/Images/api/API.png)
-
-
-# BTS Spark Client SDK
-
-We currently offer two API extension points. This repository, our BTS **Spark Client SDK** allows users to control our Spark Server externally, that is, out of process, using the exact same protocol our own Spark Client does. In other words, a client application developed via the Spark Client SDK, say a VB .NET UI, would be able to provide any functionality our own UI provides. 
-
-We currently offer bindings for the Spark protocol to C++, C# and Excel clients. Since the underlying transport is TCP, clients developed via the Spark Client SDK can be located anywhere in the world, as long as they can reach the Spark Server via TCP.  We do require a VPN or a secure network, since the Spark Protocol is currently not yet encrypted.
-
-Our second API extension point is intended for users that require adding functionality to our Spark Server.  If you are interested in extending the server process through custom order types, market data sources, or execution gateways, please see the [Spark Server SDK](https://github.com/BlueTradingSystems/spark_sdk).
-
-
-### In Depth
-
- * [Interface Overview](doc/Overview.md)
- * [Threading Notes](doc/Threading.md)
-
-
-
-
-## Getting Started
-
-### Git 
-
-* First clone the spark_client_sdk repo
-
-```
-> git clone https://github.com/BlueTradingSystems/spark_client_sdk.git
-```
-
-
-### Build
-* Use msbuild to target windows / .net 4.71
-   * Install studio here if you don't have it: https://visualstudio.microsoft.com/downloads/
-   * Use VSCode for editing, it's better: https://code.visualstudio.com/
-```
-> cd spark_client_sdk\src\spark_sdk
-spark_client_sdk\src\spark_sdk> msbuild /t:restore
-spark_client_sdk\src\spark_sdk> msbuild
- 
- ```
-
- * spark_sdk binaries will be produced in the bin\Debug directory
-
-### Connecting to Spark Server
-
-* Start your exe using the -ConfigServer parameter to point at a running Spark Server
- ```
-> spark_sdk.exe -ConfigServer http://location:8000/config
- ```
- Or create a file called spark.conf at %APPDATA%\bts\conf\ that contains:
- ```
-include: "http://location:8000/config/"
- ```
- 
-### Examples
-* Make sure you can connect to a running server
-* run spark_sdk.exe with no parameters to see help
-```
-spark_sdk\bin\Debug\net48> spark_sdk.exe -ConfigServer http://location:8000/config
-
-BTS Spark SDK
-Usages: spark_sdk [command] [arguments]
-
-Commands:
-   md <exchange> <security_type> <symbol> [<security_desc>]
-   order <account> <exchange> <security_type> <symbol> <security_desc> <signed_quantity> [<price>]
-Arguments:
-   --user=<bts user name>
-   --pass=<password>
-   --pump=<pump_interval_in_ms=100 default>
-   
-```   
-* To print simulated market data to the screen:
-
-   ```spark_sdk.exe md SIM FUTURE ES SIM:ESU9 --user=bts --pass= -ConfigServer http://location:8000/config```
-   
-* To send a 1 lot sell order for ES in account ACC A:
-
-   ```spark_sdk.exe order "ACC A" SIM FUTURE ES SIM:ESU9 -1 4000.5 --user=bts --pass= -ConfigServer http://location:8000/config   ```
-   
-   You should see an order status stream print to the screen after running this command 
-
-
-* Check out sample code
-   * [Market Data](src/spark_sdk/samples/MarketDataSample.cs)
-   * [Orders](src/spark_sdk/samples/OrderSample.cs)
-   * [Driver](src/spark_sdk/samples/SDKMain.cs) 
-
-```
- ### Excel
- * Most BTS Client API calls can be made through Excel 2016, load the example spreadsheet to see how
-  ```
- spark_sdk\bin\Debug\net48> start spark_excel-addin64-packed.xll 
- ```
- * This will start excel and load the bts addin
- * From excel, open  ```spark_sdk\bin\Debug\net48\spark_excel_example_2019.xlsm``` to get started
- * Check the [```excel```](excel/) directory for other example spreadsheets
- 
-
-
-* Send us an email for help: api_support@bluetradesys.com
+# BTS Spark 
+
+
+Our offering consists of a client UI [Spark Client](https://www.bluetradingsystems.com/images/Images/spark/02.06.19/Ladder.png), a high performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols (typically FIX/TCP for execution and some proprietary protocol over UDP multicast for market data). 
+
+![alt text](https://www.bluetradingsystems.com/images/Images/api/API.png)
+
+
+# BTS Spark Client SDK
+
+We currently offer two API extension points. This repository, our BTS **Spark Client SDK** allows users to control our Spark Server externally, that is, out of process, using the exact same protocol our own Spark Client does. In other words, a client application developed via the Spark Client SDK, say a VB .NET UI, would be able to provide any functionality our own UI provides. 
+
+We currently offer bindings for the Spark protocol to C++, C# and Excel clients. Since the underlying transport is TCP, clients developed via the Spark Client SDK can be located anywhere in the world, as long as they can reach the Spark Server via TCP.  We do require a VPN or a secure network, since the Spark Protocol is currently not yet encrypted.
+
+Our second API extension point is intended for users that require adding functionality to our Spark Server.  If you are interested in extending the server process through custom order types, market data sources, or execution gateways, please see the [Spark Server SDK](https://github.com/BlueTradingSystems/spark_sdk).
+
+
+### In Depth
+
+ * [Interface Overview](doc/Overview.md)
+ * [Threading Notes](doc/Threading.md)
+
+
+
+
+## Getting Started
+
+### Git 
+
+* First clone the spark_client_sdk repo
+
+```
+> git clone https://github.com/BlueTradingSystems/spark_client_sdk.git
+```
+
+
+### Build
+* Use msbuild to target windows / .net 4.71
+   * Install studio here if you don't have it: https://visualstudio.microsoft.com/downloads/
+   * Use VSCode for editing, it's better: https://code.visualstudio.com/
+```
+> cd spark_client_sdk\src\spark_sdk
+spark_client_sdk\src\spark_sdk> msbuild /t:restore
+spark_client_sdk\src\spark_sdk> msbuild
+ 
+ ```
+
+ * spark_sdk binaries will be produced in the bin\Debug directory
+
+### Connecting to Spark Server
+
+* Start your exe using the -ConfigServer parameter to point at a running Spark Server
+ ```
+> spark_sdk.exe -ConfigServer http://location:8000/config
+ ```
+ Or create a file called spark.conf at %APPDATA%\bts\conf\ that contains:
+ ```
+include: "http://location:8000/config/"
+ ```
+ 
+### Examples
+* Make sure you can connect to a running server
+* run spark_sdk.exe with no parameters to see help
+```
+spark_sdk\bin\Debug\net471> spark_sdk.exe -ConfigServer http://location:8000/config
+
+BTS Spark SDK
+Usages: spark_sdk [command] [arguments]
+
+Commands:
+   md <exchange> <security_type> <symbol> [<security_desc>]
+   order <account> <exchange> <security_type> <symbol> <security_desc> <signed_quantity> [<price>]
+Arguments:
+   --user=<bts user name>
+   --pass=<password>
+   --pump=<pump_interval_in_ms=100 default>
+   
+```   
+* To print simulated market data to the screen:
+
+   ```spark_sdk.exe md SIM FUTURE ES SIM:ESU9 --user=bts --pass= -ConfigServer http://location:8000/config```
+   
+* To send a 1 lot sell order for ES in account ACC A:
+
+   ```spark_sdk.exe order "ACC A" SIM FUTURE ES SIM:ESU9 -1 4000.5 --user=bts --pass= -ConfigServer http://location:8000/config   ```
+   
+   You should see an order status stream print to the screen after running this command 
+
+
+* Check out sample code
+   * [Market Data](src/spark_sdk/samples/MarketDataSample.cs)
+   * [Orders](src/spark_sdk/samples/OrderSample.cs)
+   * [Driver](src/spark_sdk/samples/SDKMain.cs) 
+
+```
+ ### Excel
+ * Most BTS Client API calls can be made through Excel 2016, load the example spreadsheet to see how
+  ```
+ spark_sdk\bin\Debug\net471> start spark_excel-addin64-packed.xll 
+ ```
+ * This will start excel and load the bts addin
+ * From excel, open  ```spark_sdk\bin\Debug\net471\spark_excel_example_2019.xlsm``` to get started
+ * Check the [```excel```](excel/) directory for other example spreadsheets
+ 
+
+
+* Send us an email for help: api_support@bluetradesys.com
@@ -1,43 +1,43 @@
-using System;
-using System.Linq;
-
-using bts.api;
-using bts.md;
-
-namespace bts.sdk.ui
-{
-   public class UISample : IDisposable
-   {
-      readonly MarketDataClient _md;
-      public UISample(MarketDataClient client)
-      {
-         _md = client;
-      }
-      
-      public void simple_price_ui(string exch, string sectype, string symbol, string security_desc, string refresh)
-      {
-#if NET48
-         System.Windows.Forms.Application.EnableVisualStyles();
-         System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
-         
-         Venue ven = MarketDataSample.parse_venue(exch);
-         SecurityType st = MarketDataSample.parse_security_type(sectype);
-         Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol };
-
-         System.Windows.Forms.Application.Run( new SparkSDKUI(_md, prod, security_desc, int.Parse(refresh) ));
-#endif
-
-
-      }
-      
-      
-
-      public void Dispose()
-      {
-#if NET48
-         System.Windows.Forms.Application.Exit();
-#endif
-      }
-   }
-}
-
+using System;
+using System.Linq;
+
+using bts.api;
+using bts.md;
+
+namespace bts.sdk.ui
+{
+   public class UISample : IDisposable
+   {
+      readonly MarketDataClient _md;
+      public UISample(MarketDataClient client)
+      {
+         _md = client;
+      }
+      
+      public void simple_price_ui(string exch, string sectype, string symbol, string security_desc, string refresh)
+      {
+#if NET471
+         System.Windows.Forms.Application.EnableVisualStyles();
+         System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
+         
+         Venue ven = MarketDataSample.parse_venue(exch);
+         SecurityType st = MarketDataSample.parse_security_type(sectype);
+         Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol };
+
+         System.Windows.Forms.Application.Run( new SparkSDKUI(_md, prod, security_desc, int.Parse(refresh) ));
+#endif
+
+
+      }
+      
+      
+
+      public void Dispose()
+      {
+#if NET471
+         System.Windows.Forms.Application.Exit();
+#endif
+      }
+   }
+}
+
@@ -1,77 +1,100 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition = " '$(OS)' != 'Windows_NT' ">linux-x64</RuntimeIdentifier>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
-    <OutputType>Exe</OutputType>
-    <GeneratePackageOnBuild Condition="$(Configuration) == 'Release'">true</GeneratePackageOnBuild>
-    <PackageOutputPath>$(OutputPath)\$(TargetFramework)</PackageOutputPath>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-
-    <Authors>Blue Trading Systems</Authors>
-    <Company>Blue Trading Systems</Company>
-    <Product>Spark</Product>
-    <Description />
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-    <Version>1.0.0</Version>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
-    <PackageReference Include="System.Reactive" Version="4.3.1" />
-    <PackageReference Include="System.Reactive.PlatformServices" Version="4.3.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-  </ItemGroup>
-
-  <!-- $(SparkRoot) is something we define on our build at BTS, if it's empty, this project file is in the wild-->
-  <ItemGroup Condition= " '$(SparkRoot)' != '' ">
-    <ProjectReference Include="../spark_api/spark_api.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition= " '$(SparkRoot)' != '' and '$(TargetFramework)' == 'net48' ">
-    <!-- This is so we can ship excel in the nupkg -->
-    <ProjectReference Include="../spark_excel/spark_excel.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition= " '$(SparkRoot)' != '' ">
-     <None Include="README.md" pack="true" PackagePath="." />
-     <None Include="$(OutputPath)\$(TargetFramework)\spark_excel_example_2019.xlsm" pack="true" PackagePath=".\excel\spark_excel_example_2019.xlsm" />
-     <None Include="$(OutputPath)\$(TargetFramework)\spark_excel-addin64-packed.xll" pack="true" PackagePath=".\excel\spark_excel-addin64-packed.xll" />
-     <None Include="$(OutputPath)\$(TargetFramework)\spark_excel-addin64.dna" pack="true" PackagePath=".\excel\spark_excel-addin64.dna" />
-     <None Include="doc/**" pack="true" PackagePath=".\doc\" />
-  </ItemGroup>
-
-  <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences" Condition= " '$(SparkRoot)' != '' ">
-    <ItemGroup>
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
-      <BuildOutputInPackage Include="$(OutputPath)..\net48\libspark.dll"/>
-    </ItemGroup>
-  </Target>
-
-  <!-- deployed sdk build -->
-  <ItemGroup Condition= " '$(SparkRoot)' == '' ">
-    <Reference Include="spark_api">
-      <HintPath>..\..\lib\$(TargetFramework)\spark_api.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-   <Target Name="copy_lib_deployed" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' " >
-     <Copy SourceFiles="..\..\lib\$(TargetFramework)\libspark.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
-   </Target>
-
-  <Target Name="copy_lib_deployed48" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net48'" >
-    <Copy SourceFiles="..\..\lib\$(TargetFramework)\spark_excel.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="..\..\excel\spark_excel_example_2019.xlsm" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="..\..\excel\spark_excel-addin64-packed.xll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="..\..\excel\spark_excel-addin64.dna" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
-   </Target>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <GeneratePackageOnBuild Condition="$(Configuration) == 'Release' or $(Configuration) == 'Release'">true</GeneratePackageOnBuild>
+    <PackageOutputPath>$(OutputPath)\net471</PackageOutputPath>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+
+    <Authors>Blue Trading Systems</Authors>
+    <Company>Blue Trading Systems</Company>
+    <Product>Spark</Product>
+    <Description />
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <Version>1.0.0</Version>
+    <LangVersion>7.2</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf" Version="3.6.1" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
+	 <PackageReference Include="NUnit" Version="3.10.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
+  <!-- <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+  -->
+  <!-- $(SparkRoot) is something we define on our build at BTS, if it's empty, this project file is in the wild-->
+  <ItemGroup Condition= " '$(SparkRoot)' != '' ">
+    <ProjectReference Include="../spark_api/spark_api.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition= " '$(SparkRoot)' != '' and '$(TargetFramework)' == 'net471' ">
+    <!-- This is so we can ship excel in the nupkg -->
+    <ProjectReference Include="../spark_excel/spark_excel.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition= " '$(SparkRoot)' != '' ">
+     <None Include="README.md" pack="true" PackagePath="." />
+     <None Include="$(OutputPath)\net471\spark_excel_example_2019.xlsm" pack="true" PackagePath=".\excel\spark_excel_example_2019.xlsm" />
+     <None Include="$(OutputPath)\net471\spark_excel-addin64-packed.xll" pack="true" PackagePath=".\excel\spark_excel-addin64-packed.xll" />
+     <None Include="$(OutputPath)\net471\spark_excel-addin64.dna" pack="true" PackagePath=".\excel\spark_excel-addin64.dna" />
+     <None Include="doc/**" pack="true" PackagePath=".\doc\" />
+  </ItemGroup>
+
+  <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences" Condition= " '$(SparkRoot)' != '' ">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
+      <BuildOutputInPackage Include="$(OutputPath)..\net471\libspark.dll"/>
+    </ItemGroup>
+  </Target>
+
+  <!-- deployed sdk build net471 -->
+  <ItemGroup Condition= " '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net471'">
+    <Reference Include="spark_api">
+      <HintPath>..\..\lib\net471\spark_api.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <!-- deployed sdk build netcoreapp2.1 -->
+  <ItemGroup Condition= " '$(SparkRoot)' == '' and '$(TargetFramework)' == 'netcoreapp2.1'">
+    <Reference Include="spark_api">
+      <HintPath>..\..\lib\netcoreapp2.1\spark_api.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+
+   <Target Name="copy_lib_deployed" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' " >
+     <Copy SourceFiles="..\..\lib\net471\libspark.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+   </Target>
+
+   <Target Name="copy_lib_deployed471" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net471'" >
+     <Copy SourceFiles="..\..\lib\net471\spark_excel.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+     <Copy SourceFiles="..\..\excel\spark_excel_example_2019.xlsm" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+     <Copy SourceFiles="..\..\excel\spark_excel-addin64-packed.xll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+     <Copy SourceFiles="..\..\excel\spark_excel-addin64.dna" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+   </Target>
+
+</Project>
@@ -1,45 +1,45 @@
-#if NET48
-
-namespace bts.sdk.ui
-{
-   partial class SparkSDKUI
-   {
-      /// <summary>
-      /// Required designer variable.
-      /// </summary>
-      private System.ComponentModel.IContainer components = null;
-
-      /// <summary>
-      /// Clean up any resources being used.
-      /// </summary>
-      /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-      protected override void Dispose(bool disposing)
-      {
-         if(disposing && (components != null))
-         {
-            components.Dispose();
-         }
-         base.Dispose(disposing);
-      }
-
-#region Windows Form Designer generated code
-
-      /// <summary>
-      /// Required method for Designer support - do not modify
-      /// the contents of this method with the code editor.
-      /// </summary>
-      private void InitializeComponent()
-      {
-         this.components = new System.ComponentModel.Container();
-         this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-         this.Text = "SparkSDKUI";
-      }
-
-#endregion
-   }
-}
-
-
-
-
+#if NET471
+
+namespace bts.sdk.ui
+{
+   partial class SparkSDKUI
+   {
+      /// <summary>
+      /// Required designer variable.
+      /// </summary>
+      private System.ComponentModel.IContainer components = null;
+
+      /// <summary>
+      /// Clean up any resources being used.
+      /// </summary>
+      /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+      protected override void Dispose(bool disposing)
+      {
+         if(disposing && (components != null))
+         {
+            components.Dispose();
+         }
+         base.Dispose(disposing);
+      }
+
+#region Windows Form Designer generated code
+
+      /// <summary>
+      /// Required method for Designer support - do not modify
+      /// the contents of this method with the code editor.
+      /// </summary>
+      private void InitializeComponent()
+      {
+         this.components = new System.ComponentModel.Container();
+         this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+         this.Text = "SparkSDKUI";
+      }
+
+#endregion
+   }
+}
+
+
+
+
 #endif
@@ -1,34 +1,34 @@
-#if NET48
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using bts.api;
-using bts.md;
-
-namespace bts.sdk.ui
-{
-   public partial class SparkSDKUI : Form
-   {
-      private DataGridView _dg = new DataGridView();
-      public SparkSDKUI(MarketDataClient client, Product prod, string security_desc, int interval)
-      {
-         InitializeComponent();
-         
-         _dg.Dock = DockStyle.Fill;
-         
-      }
-   }
-}
-
-
-
-
+#if NET471
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+using bts.api;
+using bts.md;
+
+namespace bts.sdk.ui
+{
+   public partial class SparkSDKUI : Form
+   {
+      private DataGridView _dg = new DataGridView();
+      public SparkSDKUI(MarketDataClient client, Product prod, string security_desc, int interval)
+      {
+         InitializeComponent();
+         
+         _dg.Dock = DockStyle.Fill;
+         
+      }
+   }
+}
+
+
+
+
 #endif
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platforms>x64</Platforms>
+    <TargetFramework>netstandard2.0</TargetFramework>
    <Platform>x64</Platform>
-    <Configurations>Debug;Release</Configurations>
+    <PlatformTarget>x64</PlatformTarget>
  </PropertyGroup>

  <ItemGroup>
@@ -1,33 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFramework>
-    <Platforms>x64</Platforms>
-    <Platform>x64</Platform>
    <OutputType>Exe</OutputType>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition=" '$(OS)' != 'Windows_NT' ">linux-x64</RuntimeIdentifier>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
-    
+    <TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
+    <RuntimeIdentifiers>win7-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
    <Authors>Blue Trading Systems</Authors>
    <Company>Blue Trading Systems</Company>
    <Product>Spark</Product>
+    <Platform>x64</Platform>
+    <PlatformTarget>x64</PlatformTarget>
    <Version>1.0.0</Version>
-    <Configurations>Debug;Release</Configurations>
+    <LangVersion>7.2</LangVersion>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="../spark_api/spark_api.csproj" />
+    <!--<ProjectReference Include="..\spark\Spark.csproj" />-->
    <ProjectReference Include="..\spark_core\spark_core.csproj" />
    <ProjectReference Include="..\spark_test\spark_test.csproj" />
+    <!--<Proto3 Include="**/*.proto" />-->
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="CommandLineParser" Version="2.6.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
  </ItemGroup>

 </Project>
@@ -0,0 +1 @@
+set(sources files/cert_secure_logon.txt;files/futures.coconut.xz;files/onixs_ice/ConnectivityConfiguration.APITest.xml;files/onixs_ice/ConnectivityConfiguration.PerfTest.xml;files/onixs_ice/ConnectivityConfiguration.Production.xml;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js)
@@ -0,0 +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/subprocess.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;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_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;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;ordermanLine truncated
@@ -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/subprocess.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;Line truncated
+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/subprocess.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;Line truncated
@@ -1,5 +1,5 @@
 syntax="proto3";
-import "lib/api/Apioptions.proto";
+import "lib/api/apioptions.proto";
 package bts.api;
 option csharp_namespace="bts.api";

@@ -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;
@@ -6,9 +6,6 @@ option csharp_namespace="bts.api";
 extend google.protobuf.ServiceOptions {
 	string service_description = 8501;
 }
-extend google.protobuf.MessageOptions {
-	string protofix_message_type = 8505;
-}
 extend google.protobuf.MethodOptions {
   string method_description = 8503;
   bool skip_excel_generation = 8504;
@@ -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"
@@ -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 <string>
 #include <vector>
@@ -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 <google/protobuf/io/zero_copy_stream.h>
 #include <functional>
@@ -2,7 +2,7 @@

 #include "ApiException.h"

-#include "lib/api/Apicore.pb.h"
+#include "lib/api/apicore.pb.h"

 #include <memory>
 #include <assert.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 {
@@ -2,8 +2,6 @@
 import os, sys
 from collections import namedtuple

-#open("/home/bts/data2", 'wb').write("a")
-
 DEBUG = 'DEBUG' in sys.argv

 # cd to scripts working directory
@@ -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";
@@ -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";
Author	SHA1	Message	Date
Jake Norbut	525d0eda30	fix typo in notes	2020-01-30 07:39:22 -06:00
Jake Norbut	e9e85b44c9	updating release notes	2020-01-30 07:37:51 -06:00
John Colvin	2654b2e446	SP-283 Ladder does not display 6c spreads correctly	2020-01-29 12:43:01 -06:00
Kevin Darby	b80f96fa5e	Merged in ice_excel (pull request #388 ) fix RTD crash for ice Approved-by: Jake Norbut <jake.norbut@bluetradesys.com>	2020-01-10 22:39:27 +00:00
Kevin Darby	b7dea6817c	fix RTD crash for ice	2020-01-10 14:43:06 -05:00
				`@@ -0,0 +1 @@`
				`set(sources files/cert_secure_logon.txt;files/futures.coconut.xz;files/onixs_ice/ConnectivityConfiguration.APITest.xml;files/onixs_ice/ConnectivityConfiguration.PerfTest.xml;files/onixs_ice/ConnectivityConfiguration.Production.xml;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_log.sql;files/perf_trace/perf_trace_analysis.sql;files/perf_trace/plotly-latest.min.js)`
				`@@ -0,0 +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/subprocess.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;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_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;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;ordermanLine truncated