Merge branch 'run_system_tests' into SPARK-1992-position-limits-test

This commit is contained in:
Michael Harding committed 2019-01-29 10:46:37 -05:00
commit cd0b0ac2d3
4 files changed
+10 -6

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net471</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<Platform>x64</Platform>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
+3 -3
View File
@@ -8,10 +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);
}
}
}
+1 -2
View File
@@ -2,8 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net471</TargetFramework>
<!--<TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>-->
<TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
<RuntimeIdentifiers>win7-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
<Authors>Blue Trading Systems</Authors>
<Company>Blue Trading Systems</Company>
+5
View File
@@ -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