From bf9e3cddecaf7bdd15a6b7b02f77144bc0f9a7e0 Mon Sep 17 00:00:00 2001 From: Jared Thirsk Date: Sun, 27 Nov 2022 04:53:18 -0700 Subject: [PATCH] net7.0 port, switched to central package management --- Directory.Packages.props | 54 +++++++++++++++++++ .../LionFire.Trading.Abstractions.csproj | 8 +-- .../LionFire.Trading.Agent.Program.csproj | 8 +-- .../LionFire.Trading.Agent.csproj | 18 +++---- .../LionFire.Trading.Cli.csproj | 10 ++-- .../LionFire.Trading.Data.Service.csproj | 10 ++-- .../LionFire.Trading.Feeds.Simulated.csproj | 4 +- .../LionFire.Trading.TrueFx.csproj | 4 +- ...Fire.Trading.HistoricalData.Orleans.csproj | 8 +-- .../LionFire.Trading.HistoricalData.csproj | 20 +++---- .../Backtesting/BacktestStats.cs | 2 + src/LionFire.Trading.Shared/Bots/BotBase.cs | 8 +-- src/LionFire.Trading.Triggers/PriceTrigger.cs | 6 ++- .../LionFire.Trading.cTrader.Redis.csproj | 10 ++-- .../LionFire.Trading - Copy.csproj | 28 +++++----- src/LionFire.Trading/LionFire.Trading.csproj | 38 ++++++------- .../LionFire.Trading.Spotware.Connect.csproj | 16 +++--- 17 files changed, 156 insertions(+), 96 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..2fdfec5 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,54 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/LionFire.Trading.Abstractions/LionFire.Trading.Abstractions.csproj b/src/LionFire.Trading.Abstractions/LionFire.Trading.Abstractions.csproj index 1bebe88..6b5cc24 100644 --- a/src/LionFire.Trading.Abstractions/LionFire.Trading.Abstractions.csproj +++ b/src/LionFire.Trading.Abstractions/LionFire.Trading.Abstractions.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/LionFire.Trading.Agent.Program/LionFire.Trading.Agent.Program.csproj b/src/LionFire.Trading.Agent.Program/LionFire.Trading.Agent.Program.csproj index 9262bd8..87c1f36 100644 --- a/src/LionFire.Trading.Agent.Program/LionFire.Trading.Agent.Program.csproj +++ b/src/LionFire.Trading.Agent.Program/LionFire.Trading.Agent.Program.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/LionFire.Trading.Agent/LionFire.Trading.Agent.csproj b/src/LionFire.Trading.Agent/LionFire.Trading.Agent.csproj index 7791cdb..2c02ecc 100644 --- a/src/LionFire.Trading.Agent/LionFire.Trading.Agent.csproj +++ b/src/LionFire.Trading.Agent/LionFire.Trading.Agent.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/LionFire.Trading.Cli/LionFire.Trading.Cli.csproj b/src/LionFire.Trading.Cli/LionFire.Trading.Cli.csproj index f8522f7..4405b86 100644 --- a/src/LionFire.Trading.Cli/LionFire.Trading.Cli.csproj +++ b/src/LionFire.Trading.Cli/LionFire.Trading.Cli.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/src/LionFire.Trading.DataCacheService/LionFire.Trading.Data.Service.csproj b/src/LionFire.Trading.DataCacheService/LionFire.Trading.Data.Service.csproj index c07aeb5..4735806 100644 --- a/src/LionFire.Trading.DataCacheService/LionFire.Trading.Data.Service.csproj +++ b/src/LionFire.Trading.DataCacheService/LionFire.Trading.Data.Service.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/LionFire.Trading.Feeds.Simulated/LionFire.Trading.Feeds.Simulated.csproj b/src/LionFire.Trading.Feeds.Simulated/LionFire.Trading.Feeds.Simulated.csproj index c01131e..0e3e146 100644 --- a/src/LionFire.Trading.Feeds.Simulated/LionFire.Trading.Feeds.Simulated.csproj +++ b/src/LionFire.Trading.Feeds.Simulated/LionFire.Trading.Feeds.Simulated.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/src/LionFire.Trading.Feeds.TrueFx/LionFire.Trading.TrueFx.csproj b/src/LionFire.Trading.Feeds.TrueFx/LionFire.Trading.TrueFx.csproj index f1d596d..9202396 100644 --- a/src/LionFire.Trading.Feeds.TrueFx/LionFire.Trading.TrueFx.csproj +++ b/src/LionFire.Trading.Feeds.TrueFx/LionFire.Trading.TrueFx.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -11,7 +11,7 @@ - + diff --git a/src/LionFire.Trading.HistoricalData.Orleans/LionFire.Trading.HistoricalData.Orleans.csproj b/src/LionFire.Trading.HistoricalData.Orleans/LionFire.Trading.HistoricalData.Orleans.csproj index 5c4f446..f9d5be0 100644 --- a/src/LionFire.Trading.HistoricalData.Orleans/LionFire.Trading.HistoricalData.Orleans.csproj +++ b/src/LionFire.Trading.HistoricalData.Orleans/LionFire.Trading.HistoricalData.Orleans.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/LionFire.Trading.HistoricalData/LionFire.Trading.HistoricalData.csproj b/src/LionFire.Trading.HistoricalData/LionFire.Trading.HistoricalData.csproj index 3180b15..f008d51 100644 --- a/src/LionFire.Trading.HistoricalData/LionFire.Trading.HistoricalData.csproj +++ b/src/LionFire.Trading.HistoricalData/LionFire.Trading.HistoricalData.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,15 +8,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/LionFire.Trading.Shared/Backtesting/BacktestStats.cs b/src/LionFire.Trading.Shared/Backtesting/BacktestStats.cs index 5e7479a..31f6e90 100644 --- a/src/LionFire.Trading.Shared/Backtesting/BacktestStats.cs +++ b/src/LionFire.Trading.Shared/Backtesting/BacktestStats.cs @@ -1,4 +1,6 @@  +using System; + namespace LionFire.Trading.Backtesting; public static class BacktestStats diff --git a/src/LionFire.Trading.Shared/Bots/BotBase.cs b/src/LionFire.Trading.Shared/Bots/BotBase.cs index e87ff04..a2f4bee 100644 --- a/src/LionFire.Trading.Shared/Bots/BotBase.cs +++ b/src/LionFire.Trading.Shared/Bots/BotBase.cs @@ -1415,10 +1415,10 @@ double GetFitness(GetFitnessArgs args) End = EndDate.Value, AverageTrade = args.AverageTrade, - AverageTradePerVolume = args.AverageTradePerVolume, + //AverageTradePerVolume = args.AverageTradePerVolume, // Where did this come from? Equity = args.Equity, //History - LosingTrades = args.LosingTrades, + LosingTrades =(int) args.LosingTrades, MaxBalanceDrawdown = args.MaxBalanceDrawdown, MaxBalanceDrawdownPercentages = args.MaxBalanceDrawdownPercentages, MaxEquityDrawdown = args.MaxEquityDrawdown, @@ -1429,8 +1429,8 @@ double GetFitness(GetFitnessArgs args) ProfitFactor = args.ProfitFactor, SharpeRatio = args.SharpeRatio, SortinoRatio = args.SortinoRatio, - TotalTrades = args.TotalTrades, - WinningTrades = args.WinningTrades, + TotalTrades = (int)args.TotalTrades, + WinningTrades = (int)args.WinningTrades, }; var duration = EndDate.Value - StartDate.Value; // Slight optimization of backtestResult.Duration diff --git a/src/LionFire.Trading.Triggers/PriceTrigger.cs b/src/LionFire.Trading.Triggers/PriceTrigger.cs index c002472..71f97bb 100644 --- a/src/LionFire.Trading.Triggers/PriceTrigger.cs +++ b/src/LionFire.Trading.Triggers/PriceTrigger.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; @@ -62,6 +63,9 @@ public Task Start() throw new NotImplementedException(); } - + public Task StartAsync(CancellationToken cancellationToken = default) + { + throw new NotImplementedException(); + } } } diff --git a/src/LionFire.Trading.cTrader.Redis/LionFire.Trading.cTrader.Redis.csproj b/src/LionFire.Trading.cTrader.Redis/LionFire.Trading.cTrader.Redis.csproj index ba23c80..10cd217 100644 --- a/src/LionFire.Trading.cTrader.Redis/LionFire.Trading.cTrader.Redis.csproj +++ b/src/LionFire.Trading.cTrader.Redis/LionFire.Trading.cTrader.Redis.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/src/LionFire.Trading/LionFire.Trading - Copy.csproj b/src/LionFire.Trading/LionFire.Trading - Copy.csproj index 5c3f082..34d8345 100644 --- a/src/LionFire.Trading/LionFire.Trading - Copy.csproj +++ b/src/LionFire.Trading/LionFire.Trading - Copy.csproj @@ -28,18 +28,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -47,8 +47,8 @@ - - + + diff --git a/src/LionFire.Trading/LionFire.Trading.csproj b/src/LionFire.Trading/LionFire.Trading.csproj index 27b1141..3f96110 100644 --- a/src/LionFire.Trading/LionFire.Trading.csproj +++ b/src/LionFire.Trading/LionFire.Trading.csproj @@ -1,4 +1,4 @@ - + 1.0.1 @@ -47,24 +47,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Spotware/LionFire.Trading.Spotware.Connect/LionFire.Trading.Spotware.Connect.csproj b/src/Spotware/LionFire.Trading.Spotware.Connect/LionFire.Trading.Spotware.Connect.csproj index 2890534..1082dc8 100644 --- a/src/Spotware/LionFire.Trading.Spotware.Connect/LionFire.Trading.Spotware.Connect.csproj +++ b/src/Spotware/LionFire.Trading.Spotware.Connect/LionFire.Trading.Spotware.Connect.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -18,18 +18,18 @@ - + - - - - - - + + + + + +