From bd42d4fd5120de96039cdfa951004d3345befa79 Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 8 Apr 2025 06:58:56 +0200 Subject: [PATCH] Devexpress version fixes... --- TIAM.Models.Server/TIAM.Models.Server.csproj | 4 ++++ TIAM.Models/TIAM.Models.csproj | 4 ++++ TIAM.Services.Server/TIAM.Services.Server.csproj | 1 + TIAM.Services/TIAM.Services.csproj | 4 ++++ TIAMSharedUI/Pages/Components/AuctionStep1.razor | 3 ++- TIAMSharedUI/Pages/Components/TransferStep1.razor | 3 ++- TIAMWebApp/Server/appsettings.json | 10 ++++++---- .../Shared/TIAMWebApp.Shared.Application.csproj | 1 + Tiam.Services.Client.Tests/SignalRDataSourceTest.cs | 12 ------------ 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/TIAM.Models.Server/TIAM.Models.Server.csproj b/TIAM.Models.Server/TIAM.Models.Server.csproj index ac3f432d..da7fe4cd 100644 --- a/TIAM.Models.Server/TIAM.Models.Server.csproj +++ b/TIAM.Models.Server/TIAM.Models.Server.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/TIAM.Models/TIAM.Models.csproj b/TIAM.Models/TIAM.Models.csproj index 140b006b..b610560d 100644 --- a/TIAM.Models/TIAM.Models.csproj +++ b/TIAM.Models/TIAM.Models.csproj @@ -12,6 +12,10 @@ + + + + diff --git a/TIAM.Services.Server/TIAM.Services.Server.csproj b/TIAM.Services.Server/TIAM.Services.Server.csproj index c4631780..6c4cb449 100644 --- a/TIAM.Services.Server/TIAM.Services.Server.csproj +++ b/TIAM.Services.Server/TIAM.Services.Server.csproj @@ -30,6 +30,7 @@ + diff --git a/TIAM.Services/TIAM.Services.csproj b/TIAM.Services/TIAM.Services.csproj index 5c1bbbf6..a78390c0 100644 --- a/TIAM.Services/TIAM.Services.csproj +++ b/TIAM.Services/TIAM.Services.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/TIAMSharedUI/Pages/Components/AuctionStep1.razor b/TIAMSharedUI/Pages/Components/AuctionStep1.razor index cd8fb15e..5d516980 100644 --- a/TIAMSharedUI/Pages/Components/AuctionStep1.razor +++ b/TIAMSharedUI/Pages/Components/AuctionStep1.razor @@ -1,4 +1,5 @@ -@using TIAMWebApp.Shared.Application.Models.PageModels; +@using DevExpress.Blazor +@using TIAMWebApp.Shared.Application.Models.PageModels; @using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @inject ISessionService sessionService; diff --git a/TIAMSharedUI/Pages/Components/TransferStep1.razor b/TIAMSharedUI/Pages/Components/TransferStep1.razor index 675b7d31..06c590ef 100644 --- a/TIAMSharedUI/Pages/Components/TransferStep1.razor +++ b/TIAMSharedUI/Pages/Components/TransferStep1.razor @@ -1,4 +1,5 @@ -@using TIAMWebApp.Shared.Application.Models; +@using DevExpress.Blazor +@using TIAMWebApp.Shared.Application.Models; @using TIAMWebApp.Shared.Application.Interfaces; @inject ISessionService sessionService; diff --git a/TIAMWebApp/Server/appsettings.json b/TIAMWebApp/Server/appsettings.json index 53fe55e4..06f5ddbd 100644 --- a/TIAMWebApp/Server/appsettings.json +++ b/TIAMWebApp/Server/appsettings.json @@ -1,8 +1,10 @@ { - "ConnectionStrings": { - //"DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" - "DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" - }, + "ConnectionStrings": { + //"DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + + //"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + "DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEVRELEASE;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + }, "Logging": { "LogLevel": { "Default": "Information", diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 5d2426bb..4101610b 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -22,6 +22,7 @@ + diff --git a/Tiam.Services.Client.Tests/SignalRDataSourceTest.cs b/Tiam.Services.Client.Tests/SignalRDataSourceTest.cs index 0b510966..da03ec26 100644 --- a/Tiam.Services.Client.Tests/SignalRDataSourceTest.cs +++ b/Tiam.Services.Client.Tests/SignalRDataSourceTest.cs @@ -1,21 +1,9 @@ -using System.Linq.Expressions; using AyCode.Core.Enums; -using AyCode.Core.Extensions; -using AyCode.Core.Helpers; using AyCode.Core.Loggers; using AyCode.Services.Loggers; -using AyCode.Services.SignalRs; -using Azure; -using DevExpress.DashboardBlazor; using DevExpress.Data.Filtering; using DevExpress.Data.Linq; using DevExpress.Data.Linq.Helpers; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using TIAM.Core.Loggers; -using TIAM.Database.DataLayers.Admins; -using TIAM.Database.Test; -using TIAM.Entities.ServiceProviders; using TIAM.Entities.Transfers; using TIAM.Services; using TIAMSharedUI.Shared;