From 88045ea4328ff9642fe8aeb16804e91b58bd6aaa Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 09:23:35 -0500 Subject: [PATCH 1/3] Add netcore publish to jenkinsbuild.cmd --- src/client/spark_test/spark_test.csproj | 2 +- src/client/sparkcmd/sparkcmd.csproj | 3 +-- tools/jenkinsbuild.cmd | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 1c755b687..8a6c94761 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -1,7 +1,7 @@ - net471 + netstandard2.0 x64 x64 diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 31c2efcd9..af47bcfb5 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -2,8 +2,7 @@ Exe - net471 - + net471;netcoreapp2.1 win7-x64;ubuntu.16.04-x64 Blue Trading Systems Blue Trading Systems diff --git a/tools/jenkinsbuild.cmd b/tools/jenkinsbuild.cmd index debcee509..a6f345831 100644 --- a/tools/jenkinsbuild.cmd +++ b/tools/jenkinsbuild.cmd @@ -13,6 +13,11 @@ IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END msbuild /m /p:debugtype=portable /p:platform=x64 /clp:verbosity=minimal /clp:summary spark_client.sln /p:Configuration=release IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END +:: build netcore +cd src\client\sparkcmd +dotnet publish -f netcoreapp2.1 -c release +IF %ERRORLEVEL% NEQ 0 GOTO :ERROR_AND_END + GOTO :END :ERROR_AND_END From dab95d7e91a02fd8ddb1cccdcdafddf3ce8a784f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 29 Jan 2019 09:23:54 -0500 Subject: [PATCH 2/3] Make sure every sparkcmd command respects -configserver --- src/client/sparkcmd/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 1feb68ecb..634895efd 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -9,6 +9,7 @@ using System.Linq; namespace sparkcmd { class Program { static void Main(string[] args) { + mbts.config.Configuration.initialize(); var commands = ConsoleCommandDispatcher.FindCommandsInSameAssemblyAs(typeof(Program)); ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); return; From d81ef8668c4af1afccb2bafaf35f9a75d8b7fe6b Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 29 Jan 2019 09:31:14 -0500 Subject: [PATCH 3/3] Return int from sparkcmd --- src/client/sparkcmd/Program.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 634895efd..790308e27 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -8,11 +8,10 @@ using System.Linq; namespace sparkcmd { class Program { - static void Main(string[] args) { + static int Main(string[] args) { mbts.config.Configuration.initialize(); var commands = ConsoleCommandDispatcher.FindCommandsInSameAssemblyAs(typeof(Program)); - ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); - return; + return ConsoleCommandDispatcher.DispatchCommand(commands, args, Console.Out); } } } \ No newline at end of file