From 1448993fa7bb12ebe764a3c9e73808a19ba4714d Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 24 Mar 2026 18:30:43 +0100 Subject: [PATCH] Update DLL HintPaths to use $(Configuration); prod DB switch Replaced hardcoded Debug paths in all .csproj files with $(Configuration) for AyCode and FruitBank DLL references, enabling correct DLL resolution for any build configuration. Switched appsettings.json connection string to use the FruitBank_PROD database. Added a null check for StockTaking in StockSignalREndpointServer.cs to prevent possible null reference exceptions. Noted some encoding issues in .csproj comments and copyright fields. No other functional changes. --- .../Controllers/StockSignalREndpointServer.cs | 13 ++---- .../Nop.Plugin.Misc.FruitBankPlugin.csproj | 44 +++++++++---------- .../Nop.Plugin.Misc.AuctionPlugin.csproj | 16 +++---- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/StockSignalREndpointServer.cs b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/StockSignalREndpointServer.cs index b3930c0..5903ce8 100644 --- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/StockSignalREndpointServer.cs +++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/StockSignalREndpointServer.cs @@ -1,23 +1,16 @@ -using System.Collections; -using AyCode.Core.Extensions; -using AyCode.Core.Loggers; +using AyCode.Core.Loggers; using AyCode.Services.SignalRs; -using DevExpress.Data.Helpers; -using DocumentFormat.OpenXml.Office2010.ExcelAc; using FruitBank.Common.Dtos; using FruitBank.Common.Entities; using FruitBank.Common.Enums; -using FruitBank.Common.Interfaces; using FruitBank.Common.Server.Interfaces; using FruitBank.Common.Server.Services.SignalRs; using FruitBank.Common.SignalRs; -using Mango.Nop.Core.Entities; using Mango.Nop.Core.Loggers; using Nop.Core; using Nop.Core.Domain.Orders; using Nop.Core.Events; using Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer; -using System.Linq; namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers; @@ -116,9 +109,9 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC { var stockTakingItem = await ctx.StockTakingItems.GetByIdAsync(stockTakingItemId, true); - if (stockTakingItem == null || stockTakingItem.StockTaking.IsClosed || stockTakingItem.IsMeasured) + if (stockTakingItem?.StockTaking == null || stockTakingItem.StockTaking.IsClosed || stockTakingItem.IsMeasured) { - _logger.Error($"StockTakingItem refresh ERROR! stockTakingItemId: {stockTakingItemId}; StockTaking is closed: {stockTakingItem?.StockTaking.IsClosed}; IsMeasured: {stockTakingItem?.IsMeasured}"); + _logger.Error($"StockTakingItem refresh ERROR! stockTakingItemId: {stockTakingItemId}; StockTaking is closed: {stockTakingItem?.StockTaking?.IsClosed}; IsMeasured: {stockTakingItem?.IsMeasured}"); return false; } diff --git a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj index 9803096..9088276 100644 --- a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj +++ b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj @@ -1,4 +1,4 @@ - + net9.0 $(SolutionDir)\Presentation\Nop.Web\Plugins\Misc.FruitBankPlugin @@ -100,68 +100,68 @@ - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Core.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Core.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Core.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Core.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Database.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Database.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Entities.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Entities.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Entities.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Entities.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Interfaces.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Interfaces.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Interfaces.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Interfaces.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Models.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Models.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Services.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Services.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Services.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Services.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Utils.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\AyCode.Utils.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\FruitBank.Common.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.Server.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\FruitBank.Common.Server.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\MessagePack.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\MessagePack.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\MessagePack.Annotations.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\MessagePack.Annotations.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.Http.Connections.Client.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Microsoft.AspNetCore.Http.Connections.Client.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Client.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Microsoft.AspNetCore.SignalR.Client.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Client.Core.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Microsoft.AspNetCore.SignalR.Client.Core.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.NET.StringTools.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Microsoft.NET.StringTools.dll - ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Newtonsoft.Json.dll + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\$(Configuration)\net9.0\Newtonsoft.Json.dll diff --git a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj index 6b5e9a9..3b482b3 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj +++ b/Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -164,25 +164,25 @@ - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Core.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Core.Server.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Entities.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Entities.Server.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Interfaces.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Interfaces.Server.dll - ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + ..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\$(Configuration)\net8.0\AyCode.Utils.dll