From 8e8c4138e3dc3ddc8cd35cdf90c3c1fbff993fd5 Mon Sep 17 00:00:00 2001 From: Bob Hodgetts Date: Thu, 30 Apr 2026 00:01:16 +0100 Subject: [PATCH] CLI now runs on linux as well as windows, changes required migrated from System.Data.SqlClient to Microsoft.Data.SqlClient and fixing server cert issue (it expired in 2020) --- src/bnhtrade.Core/Config.cs | 16 +++++++++++++++- .../Data/Database/Account/CreateJournal.cs | 2 +- .../Data/Database/Account/ReadContact.cs | 2 +- .../Data/Database/Account/UpdateJournal.cs | 2 +- .../Data/Database/Amazon/FeeEstimate.cs | 2 +- .../Data/Database/AmazonFba/ReadShipmentInfo.cs | 2 +- .../Database/AmazonFba/ReadShipmentPrimaryKey.cs | 2 +- .../Data/Database/AmazonFba/SetShipmentInfo.cs | 2 +- src/bnhtrade.Core/Data/Database/Connection.cs | 5 ----- .../Database/Import/AmazonFbaCustomerReturn.cs | 2 +- .../Import/AmazonFbaInventoryAdjustment.cs | 2 +- .../Database/Import/AmazonFbaInventoryAgeData.cs | 2 +- .../Database/Import/AmazonFbaInventoryAgeRead.cs | 2 +- .../Database/Import/AmazonFbaInventoryData.cs | 2 +- .../Import/AmazonFbaInventoryLedgerDetail.cs | 2 +- .../Database/Import/AmazonFbaInventoryReceipt.cs | 2 +- .../Database/Import/AmazonFbaReimbursement.cs | 2 +- .../Database/Import/AmazonFbaRemovalOrder.cs | 2 +- .../Database/Import/AmazonFbaSaleShipment.cs | 2 +- .../Data/Database/Log/DateTimeLog.cs | 2 +- src/bnhtrade.Core/Data/Database/Log/LogEvent.cs | 2 +- .../Database/Product/CreateCompetitivePrice.cs | 2 +- .../Database/Product/ReadCompetitivePrice.cs | 2 +- .../Data/Database/Product/ReadProduct.cs | 2 +- .../Data/Database/Product/ReadProductId.cs | 2 +- .../Data/Database/ReadRandomData.cs | 2 +- .../Implementation/AmazonSettlementRepository.cs | 1 - .../Database/SKU/Price/CreatePricingDetail.cs | 2 +- .../Data/Database/SKU/Price/ReadParameter.cs | 2 +- .../Data/Database/SKU/Price/ReadPricingDetail.cs | 2 +- src/bnhtrade.Core/Data/Database/SKU/ReadSku.cs | 2 +- .../Data/Database/SKU/ReadSkuConditionInfo.cs | 2 +- .../Data/Database/SqlUpdateBuilder.cs | 2 +- .../Data/Database/SqlWhereBuilder.cs | 2 -- .../Data/Database/Stock/DeleteSkuTransaction.cs | 2 +- .../Data/Database/Stock/InsertSkuTransaction.cs | 2 +- .../Database/Stock/InsertSkuTransactionType.cs | 2 +- .../Data/Database/Stock/JournalCrud.cs | 2 +- .../Data/Database/Stock/ReadSkuTransaction.cs | 2 +- .../Database/Stock/ReadSkuTransactionType.cs | 2 +- .../Data/Database/Stock/ReadStatusBalance.cs | 2 +- .../Data/Database/Stock/ReadStatusTransaction.cs | 2 +- .../Data/Database/Stock/ReadStatusTypeBalance.cs | 2 +- .../Data/Database/Stock/ReadStockId.cs | 2 +- .../Data/Database/Stock/UpdateSkuTransaction.cs | 2 +- .../Data/Database/UnitOfWork/Connection.cs | 2 +- src/bnhtrade.Core/Data/Xero/SalesInvoice.cs | 1 - .../Logic/Account/CurrencyService.cs | 2 +- .../Logic/Account/GetTaxCodeInfo.cs | 1 - src/bnhtrade.Core/Logic/Account/Journal.cs | 2 +- src/bnhtrade.Core/Logic/Sku/Price/FbaPricing.cs | 2 +- .../Logic/Sku/Price/UpdateRepricingValues.cs | 2 +- src/bnhtrade.Core/Logic/Sku/SkuService.cs | 2 -- .../Logic/Stock/SkuTransactionCrud.cs | 2 +- .../Logic/Stock/SkuTransactionImport.cs | 2 +- .../Logic/Stock/SkuTransactionTypeCrud.cs | 2 +- src/bnhtrade.Core/Model/Account/Journal.cs | 3 +-- .../Model/Credentials/bnhtradeDB.cs | 2 +- src/bnhtrade.Core/Test/Account/Account.cs | 1 - src/bnhtrade.Core/bnhtrade.Core.csproj | 5 ++--- .../bnhtrade.ScheduledTasks.csproj | 2 +- 61 files changed, 69 insertions(+), 70 deletions(-) diff --git a/src/bnhtrade.Core/Config.cs b/src/bnhtrade.Core/Config.cs index 20bb1a9..b70940c 100644 --- a/src/bnhtrade.Core/Config.cs +++ b/src/bnhtrade.Core/Config.cs @@ -12,7 +12,21 @@ namespace bnhtrade.Core { public string GetAppDataPath() { - string path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\bnhtrade\"; + string path = null; + if (OperatingSystem.IsWindows()) + { + path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + + @"\bnhtrade\"; + } + else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) + { + path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + + "/.bnhtrade/"; + } + else + { + throw new PlatformNotSupportedException("Unsupported operating system"); + } return path; } diff --git a/src/bnhtrade.Core/Data/Database/Account/CreateJournal.cs b/src/bnhtrade.Core/Data/Database/Account/CreateJournal.cs index bfbb086..4df3dce 100644 --- a/src/bnhtrade.Core/Data/Database/Account/CreateJournal.cs +++ b/src/bnhtrade.Core/Data/Database/Account/CreateJournal.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Account/ReadContact.cs b/src/bnhtrade.Core/Data/Database/Account/ReadContact.cs index 489adad..5621f17 100644 --- a/src/bnhtrade.Core/Data/Database/Account/ReadContact.cs +++ b/src/bnhtrade.Core/Data/Database/Account/ReadContact.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Account/UpdateJournal.cs b/src/bnhtrade.Core/Data/Database/Account/UpdateJournal.cs index c7de34a..6633bba 100644 --- a/src/bnhtrade.Core/Data/Database/Account/UpdateJournal.cs +++ b/src/bnhtrade.Core/Data/Database/Account/UpdateJournal.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Amazon/FeeEstimate.cs b/src/bnhtrade.Core/Data/Database/Amazon/FeeEstimate.cs index 64331c7..d7b30d9 100644 --- a/src/bnhtrade.Core/Data/Database/Amazon/FeeEstimate.cs +++ b/src/bnhtrade.Core/Data/Database/Amazon/FeeEstimate.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentInfo.cs b/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentInfo.cs index 718ae05..25709c5 100644 --- a/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentInfo.cs +++ b/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentInfo.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentPrimaryKey.cs b/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentPrimaryKey.cs index 166267a..167e01a 100644 --- a/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentPrimaryKey.cs +++ b/src/bnhtrade.Core/Data/Database/AmazonFba/ReadShipmentPrimaryKey.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/AmazonFba/SetShipmentInfo.cs b/src/bnhtrade.Core/Data/Database/AmazonFba/SetShipmentInfo.cs index 9cefbff..c0b5aaf 100644 --- a/src/bnhtrade.Core/Data/Database/AmazonFba/SetShipmentInfo.cs +++ b/src/bnhtrade.Core/Data/Database/AmazonFba/SetShipmentInfo.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Connection.cs b/src/bnhtrade.Core/Data/Database/Connection.cs index c97c0e8..bfdc612 100644 --- a/src/bnhtrade.Core/Data/Database/Connection.cs +++ b/src/bnhtrade.Core/Data/Database/Connection.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Data.SqlClient; using System.Configuration; namespace bnhtrade.Core.Data.Database diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaCustomerReturn.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaCustomerReturn.cs index c58c5f1..4d37221 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaCustomerReturn.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaCustomerReturn.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAdjustment.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAdjustment.cs index a0d7ef6..b85a82c 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAdjustment.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAdjustment.cs @@ -1,5 +1,5 @@ using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; namespace bnhtrade.Core.Data.Database.Import diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeData.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeData.cs index 5cd5284..6eb13ef 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeData.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeData.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeRead.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeRead.cs index 4efb77b..34d07fc 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeRead.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryAgeRead.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryData.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryData.cs index cc9bd19..04f6ffa 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryData.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryData.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryLedgerDetail.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryLedgerDetail.cs index 88f1464..0815e28 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryLedgerDetail.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryLedgerDetail.cs @@ -2,7 +2,7 @@ using bnhtrade.Core.Logic.Amazon.Fba; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.Eventing.Reader; using System.IO; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryReceipt.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryReceipt.cs index 2216877..f991ef5 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryReceipt.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaInventoryReceipt.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Globalization; using System.IO; using System.Linq; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs index 77f2c54..279315c 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs @@ -3,7 +3,7 @@ using FikaAmazonAPI.ConstructFeed.Messages; using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Runtime.ConstrainedExecution; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaRemovalOrder.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaRemovalOrder.cs index a7ffdf4..ba4f69b 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaRemovalOrder.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaRemovalOrder.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaSaleShipment.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaSaleShipment.cs index 5397d2e..51443b4 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaSaleShipment.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaSaleShipment.cs @@ -1,7 +1,7 @@ using Dapper; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Data/Database/Log/DateTimeLog.cs b/src/bnhtrade.Core/Data/Database/Log/DateTimeLog.cs index a367350..b32832d 100644 --- a/src/bnhtrade.Core/Data/Database/Log/DateTimeLog.cs +++ b/src/bnhtrade.Core/Data/Database/Log/DateTimeLog.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Log/LogEvent.cs b/src/bnhtrade.Core/Data/Database/Log/LogEvent.cs index b3cc8f0..e074f90 100644 --- a/src/bnhtrade.Core/Data/Database/Log/LogEvent.cs +++ b/src/bnhtrade.Core/Data/Database/Log/LogEvent.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Product/CreateCompetitivePrice.cs b/src/bnhtrade.Core/Data/Database/Product/CreateCompetitivePrice.cs index df84a34..ad1823f 100644 --- a/src/bnhtrade.Core/Data/Database/Product/CreateCompetitivePrice.cs +++ b/src/bnhtrade.Core/Data/Database/Product/CreateCompetitivePrice.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Product/ReadCompetitivePrice.cs b/src/bnhtrade.Core/Data/Database/Product/ReadCompetitivePrice.cs index ef8a2aa..d68132f 100644 --- a/src/bnhtrade.Core/Data/Database/Product/ReadCompetitivePrice.cs +++ b/src/bnhtrade.Core/Data/Database/Product/ReadCompetitivePrice.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Product/ReadProduct.cs b/src/bnhtrade.Core/Data/Database/Product/ReadProduct.cs index ad436bc..f55de04 100644 --- a/src/bnhtrade.Core/Data/Database/Product/ReadProduct.cs +++ b/src/bnhtrade.Core/Data/Database/Product/ReadProduct.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Product/ReadProductId.cs b/src/bnhtrade.Core/Data/Database/Product/ReadProductId.cs index 21b561c..45c9cda 100644 --- a/src/bnhtrade.Core/Data/Database/Product/ReadProductId.cs +++ b/src/bnhtrade.Core/Data/Database/Product/ReadProductId.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/ReadRandomData.cs b/src/bnhtrade.Core/Data/Database/ReadRandomData.cs index 38a5c90..9fac6e6 100644 --- a/src/bnhtrade.Core/Data/Database/ReadRandomData.cs +++ b/src/bnhtrade.Core/Data/Database/ReadRandomData.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Repository/Implementation/AmazonSettlementRepository.cs b/src/bnhtrade.Core/Data/Database/Repository/Implementation/AmazonSettlementRepository.cs index 4de7b75..87dde05 100644 --- a/src/bnhtrade.Core/Data/Database/Repository/Implementation/AmazonSettlementRepository.cs +++ b/src/bnhtrade.Core/Data/Database/Repository/Implementation/AmazonSettlementRepository.cs @@ -2,7 +2,6 @@ using bnhtrade.Core.Data.Database.Repository.Interface; using bnhtrade.Core.Model.Amazon; using Microsoft.Data.SqlClient; -using Microsoft.VisualBasic.Logging; using System; using System.Collections.Generic; using System.Data; diff --git a/src/bnhtrade.Core/Data/Database/SKU/Price/CreatePricingDetail.cs b/src/bnhtrade.Core/Data/Database/SKU/Price/CreatePricingDetail.cs index 06d0e6e..106ef82 100644 --- a/src/bnhtrade.Core/Data/Database/SKU/Price/CreatePricingDetail.cs +++ b/src/bnhtrade.Core/Data/Database/SKU/Price/CreatePricingDetail.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Transactions; namespace bnhtrade.Core.Data.Database.Sku.Price diff --git a/src/bnhtrade.Core/Data/Database/SKU/Price/ReadParameter.cs b/src/bnhtrade.Core/Data/Database/SKU/Price/ReadParameter.cs index 4b5d028..7839832 100644 --- a/src/bnhtrade.Core/Data/Database/SKU/Price/ReadParameter.cs +++ b/src/bnhtrade.Core/Data/Database/SKU/Price/ReadParameter.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/SKU/Price/ReadPricingDetail.cs b/src/bnhtrade.Core/Data/Database/SKU/Price/ReadPricingDetail.cs index dd03317..16f64e1 100644 --- a/src/bnhtrade.Core/Data/Database/SKU/Price/ReadPricingDetail.cs +++ b/src/bnhtrade.Core/Data/Database/SKU/Price/ReadPricingDetail.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/SKU/ReadSku.cs b/src/bnhtrade.Core/Data/Database/SKU/ReadSku.cs index c800dab..bd3f43b 100644 --- a/src/bnhtrade.Core/Data/Database/SKU/ReadSku.cs +++ b/src/bnhtrade.Core/Data/Database/SKU/ReadSku.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/SKU/ReadSkuConditionInfo.cs b/src/bnhtrade.Core/Data/Database/SKU/ReadSkuConditionInfo.cs index cd0edc9..f1fe400 100644 --- a/src/bnhtrade.Core/Data/Database/SKU/ReadSkuConditionInfo.cs +++ b/src/bnhtrade.Core/Data/Database/SKU/ReadSkuConditionInfo.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/SqlUpdateBuilder.cs b/src/bnhtrade.Core/Data/Database/SqlUpdateBuilder.cs index 6a60bc7..7ed6239 100644 --- a/src/bnhtrade.Core/Data/Database/SqlUpdateBuilder.cs +++ b/src/bnhtrade.Core/Data/Database/SqlUpdateBuilder.cs @@ -1,7 +1,7 @@ using bnhtrade.Core.Data.Database._BoilerPlate; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/SqlWhereBuilder.cs b/src/bnhtrade.Core/Data/Database/SqlWhereBuilder.cs index ea498f0..20eeb7d 100644 --- a/src/bnhtrade.Core/Data/Database/SqlWhereBuilder.cs +++ b/src/bnhtrade.Core/Data/Database/SqlWhereBuilder.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; -using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/DeleteSkuTransaction.cs b/src/bnhtrade.Core/Data/Database/Stock/DeleteSkuTransaction.cs index b6d320d..0b87dbd 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/DeleteSkuTransaction.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/DeleteSkuTransaction.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransaction.cs b/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransaction.cs index c3e9023..781d8ff 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransaction.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransaction.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransactionType.cs b/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransactionType.cs index 4a6236f..61a0b5d 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransactionType.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransactionType.cs @@ -1,5 +1,5 @@ using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Transactions; namespace bnhtrade.Core.Data.Database.Stock diff --git a/src/bnhtrade.Core/Data/Database/Stock/JournalCrud.cs b/src/bnhtrade.Core/Data/Database/Stock/JournalCrud.cs index 65b0dfe..06785a7 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/JournalCrud.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/JournalCrud.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransaction.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransaction.cs index ec62928..040f02c 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransaction.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransaction.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransactionType.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransactionType.cs index df2d71d..671c21f 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransactionType.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransactionType.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusBalance.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusBalance.cs index 93ae836..e65ab1c 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusBalance.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusBalance.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTransaction.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTransaction.cs index b078322..3bec5de 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTransaction.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTransaction.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTypeBalance.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTypeBalance.cs index 69c9463..6789bd9 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTypeBalance.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadStatusTypeBalance.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/ReadStockId.cs b/src/bnhtrade.Core/Data/Database/Stock/ReadStockId.cs index a17e60f..0854aa2 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/ReadStockId.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/ReadStockId.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/Stock/UpdateSkuTransaction.cs b/src/bnhtrade.Core/Data/Database/Stock/UpdateSkuTransaction.cs index 09f835a..06d765d 100644 --- a/src/bnhtrade.Core/Data/Database/Stock/UpdateSkuTransaction.cs +++ b/src/bnhtrade.Core/Data/Database/Stock/UpdateSkuTransaction.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Data/Database/UnitOfWork/Connection.cs b/src/bnhtrade.Core/Data/Database/UnitOfWork/Connection.cs index b077cce..e4b298c 100644 --- a/src/bnhtrade.Core/Data/Database/UnitOfWork/Connection.cs +++ b/src/bnhtrade.Core/Data/Database/UnitOfWork/Connection.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Configuration; namespace bnhtrade.Core.Data.Database.UnitOfWork diff --git a/src/bnhtrade.Core/Data/Xero/SalesInvoice.cs b/src/bnhtrade.Core/Data/Xero/SalesInvoice.cs index 0caf1ee..d7cfd02 100644 --- a/src/bnhtrade.Core/Data/Xero/SalesInvoice.cs +++ b/src/bnhtrade.Core/Data/Xero/SalesInvoice.cs @@ -1,7 +1,6 @@ using bnhtrade.Core.Test.Amazon.SP_API; using CsvHelper; using CsvHelper.Configuration.Attributes; -using Microsoft.VisualBasic.Logging; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/src/bnhtrade.Core/Logic/Account/CurrencyService.cs b/src/bnhtrade.Core/Logic/Account/CurrencyService.cs index b8d929a..e35bf18 100644 --- a/src/bnhtrade.Core/Logic/Account/CurrencyService.cs +++ b/src/bnhtrade.Core/Logic/Account/CurrencyService.cs @@ -4,7 +4,7 @@ using FikaAmazonAPI.ConstructFeed.Messages; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Globalization; using System.Linq; using System.Text; diff --git a/src/bnhtrade.Core/Logic/Account/GetTaxCodeInfo.cs b/src/bnhtrade.Core/Logic/Account/GetTaxCodeInfo.cs index cc900e3..74571c9 100644 --- a/src/bnhtrade.Core/Logic/Account/GetTaxCodeInfo.cs +++ b/src/bnhtrade.Core/Logic/Account/GetTaxCodeInfo.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Windows.Forms; namespace bnhtrade.Core.Logic.Account { diff --git a/src/bnhtrade.Core/Logic/Account/Journal.cs b/src/bnhtrade.Core/Logic/Account/Journal.cs index 8cd434b..a386cdd 100644 --- a/src/bnhtrade.Core/Logic/Account/Journal.cs +++ b/src/bnhtrade.Core/Logic/Account/Journal.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Logic/Sku/Price/FbaPricing.cs b/src/bnhtrade.Core/Logic/Sku/Price/FbaPricing.cs index 18e25ec..c131872 100644 --- a/src/bnhtrade.Core/Logic/Sku/Price/FbaPricing.cs +++ b/src/bnhtrade.Core/Logic/Sku/Price/FbaPricing.cs @@ -1,7 +1,7 @@ using CsvHelper; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Globalization; using System.IO; using System.Linq; diff --git a/src/bnhtrade.Core/Logic/Sku/Price/UpdateRepricingValues.cs b/src/bnhtrade.Core/Logic/Sku/Price/UpdateRepricingValues.cs index 5ea3010..6f63b2e 100644 --- a/src/bnhtrade.Core/Logic/Sku/Price/UpdateRepricingValues.cs +++ b/src/bnhtrade.Core/Logic/Sku/Price/UpdateRepricingValues.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Transactions; namespace bnhtrade.Core.Logic.Sku.Price diff --git a/src/bnhtrade.Core/Logic/Sku/SkuService.cs b/src/bnhtrade.Core/Logic/Sku/SkuService.cs index 2ad1696..08e31b0 100644 --- a/src/bnhtrade.Core/Logic/Sku/SkuService.cs +++ b/src/bnhtrade.Core/Logic/Sku/SkuService.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Transactions; -using System.Windows.Forms; namespace bnhtrade.Core.Logic.Sku { diff --git a/src/bnhtrade.Core/Logic/Stock/SkuTransactionCrud.cs b/src/bnhtrade.Core/Logic/Stock/SkuTransactionCrud.cs index 4e8637d..790353f 100644 --- a/src/bnhtrade.Core/Logic/Stock/SkuTransactionCrud.cs +++ b/src/bnhtrade.Core/Logic/Stock/SkuTransactionCrud.cs @@ -1,7 +1,7 @@ using bnhtrade.Core.Data.Database; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading; diff --git a/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs b/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs index 1b1faef..318750f 100644 --- a/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs +++ b/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs @@ -3,7 +3,7 @@ using bnhtrade.Core.Model.Stock; using FikaAmazonAPI.AmazonSpApiSDK.Models.Restrictions; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Logic/Stock/SkuTransactionTypeCrud.cs b/src/bnhtrade.Core/Logic/Stock/SkuTransactionTypeCrud.cs index 62e9352..163afa4 100644 --- a/src/bnhtrade.Core/Logic/Stock/SkuTransactionTypeCrud.cs +++ b/src/bnhtrade.Core/Logic/Stock/SkuTransactionTypeCrud.cs @@ -1,7 +1,7 @@ using bnhtrade.Core.Data.Database; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/bnhtrade.Core/Model/Account/Journal.cs b/src/bnhtrade.Core/Model/Account/Journal.cs index 6b69896..b9d37d4 100644 --- a/src/bnhtrade.Core/Model/Account/Journal.cs +++ b/src/bnhtrade.Core/Model/Account/Journal.cs @@ -1,5 +1,4 @@ -using Microsoft.VisualBasic; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; diff --git a/src/bnhtrade.Core/Model/Credentials/bnhtradeDB.cs b/src/bnhtrade.Core/Model/Credentials/bnhtradeDB.cs index c8140ab..5fed5f3 100644 --- a/src/bnhtrade.Core/Model/Credentials/bnhtradeDB.cs +++ b/src/bnhtrade.Core/Model/Credentials/bnhtradeDB.cs @@ -28,7 +28,7 @@ namespace bnhtrade.Core.Model.Credentials { return "Data Source=" + DataSource + ";Initial Catalog=" + InitialCatalog + ";Persist Security Info=" + PersistSecurityInfo.ToString() + ";User ID=" + UserId + ";Password=" + UserPassword + ";MultipleActiveResultSets=" + MultipleActiveResultSets.ToString() - + ";Connect Timeout=" + ConnectionTimeout + ";Encrypt=True;TrustServerCertificate=True"; + + ";Connect Timeout=" + ConnectionTimeout + ";Encrypt=True"; } } diff --git a/src/bnhtrade.Core/Test/Account/Account.cs b/src/bnhtrade.Core/Test/Account/Account.cs index b58226a..7454605 100644 --- a/src/bnhtrade.Core/Test/Account/Account.cs +++ b/src/bnhtrade.Core/Test/Account/Account.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Windows.Forms.Design; using System.Xml; using System.Xml.Linq; diff --git a/src/bnhtrade.Core/bnhtrade.Core.csproj b/src/bnhtrade.Core/bnhtrade.Core.csproj index ee5c558..329a7cf 100644 --- a/src/bnhtrade.Core/bnhtrade.Core.csproj +++ b/src/bnhtrade.Core/bnhtrade.Core.csproj @@ -1,10 +1,8 @@  - net8.0-windows + net8.0 Library false - true - true @@ -40,6 +38,7 @@ + diff --git a/src/bnhtrade.ScheduledTasks/bnhtrade.ScheduledTasks.csproj b/src/bnhtrade.ScheduledTasks/bnhtrade.ScheduledTasks.csproj index 29c1d33..204280e 100644 --- a/src/bnhtrade.ScheduledTasks/bnhtrade.ScheduledTasks.csproj +++ b/src/bnhtrade.ScheduledTasks/bnhtrade.ScheduledTasks.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0 Exe bnhtrade_Scheduled_Tasks bnhtradeScheduledTasks