diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1460af53..6598ac20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,16 +226,16 @@ Lux.API:IIS01:deploy: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -Lux.Core:SDK:deploy: +EgwCoreLib.Lux.Core:SDK:deploy: stage: deploy tags: - win variables: - APP_NAME: Lux.Core + APP_NAME: EgwCoreLib.Lux.Core SOL_NAME: Lux.All rules: - if: $CI_COMMIT_BRANCH == 'develop' - - if: $CI_COMMIT_BRANCH =~ /^feature\/Lux.Core.+/ + - if: $CI_COMMIT_BRANCH =~ /^feature\/EgwCoreLib.Lux.Core.+/ when: always needs: ["Lux.UI:build"] before_script: @@ -249,16 +249,16 @@ Lux.Core:SDK:deploy: - '& "$env:NUGET_PATH" setapikey $NUGET_API_KEY -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push $env:APP_NAME/bin/Debug/EgwCoreLib.$env:APP_NAME.$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' -Lux.Data:SDK:deploy: +EgwCoreLib.Lux.Data:SDK:deploy: stage: deploy tags: - win variables: - APP_NAME: Lux.Data + APP_NAME: EgwCoreLib.Lux.Data SOL_NAME: Lux.All rules: - if: $CI_COMMIT_BRANCH == 'develop' - - if: $CI_COMMIT_BRANCH =~ /^feature\/Lux.Data.+/ + - if: $CI_COMMIT_BRANCH =~ /^feature\/EgwCoreLib.Lux.Data.+/ when: always needs: ["Lux.UI:build"] before_script: diff --git a/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.Designer.cs b/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.Designer.cs index c2fa5547..f78a46bf 100644 --- a/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.Designer.cs +++ b/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.Designer.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace Lux.Data.Migrations +namespace EgwCoreLib.Lux.Data.Migrations { [DbContext(typeof(DataLayerContext))] [Migration("20250707171119_InitDb")] diff --git a/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.cs b/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.cs index 19aedccc..2ed7245d 100644 --- a/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.cs +++ b/EgwCoreLib.Lux.Data/Migrations/20250707171119_InitDb.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; #pragma warning disable CA1814 // Prefer jagged arrays over multidimensional -namespace Lux.Data.Migrations +namespace EgwCoreLib.Lux.Data.Migrations { /// public partial class InitDb : Migration diff --git a/EgwCoreLib.Lux.Data/Migrations/DataLayerContextModelSnapshot.cs b/EgwCoreLib.Lux.Data/Migrations/DataLayerContextModelSnapshot.cs index 93c6d258..5729a679 100644 --- a/EgwCoreLib.Lux.Data/Migrations/DataLayerContextModelSnapshot.cs +++ b/EgwCoreLib.Lux.Data/Migrations/DataLayerContextModelSnapshot.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace Lux.Data.Migrations +namespace EgwCoreLib.Lux.Data.Migrations { [DbContext(typeof(DataLayerContext))] partial class DataLayerContextModelSnapshot : ModelSnapshot diff --git a/EgwCoreLib.Lux.Data/Services/RedisSubscriberServiceOld.cs b/EgwCoreLib.Lux.Data/Services/RedisSubscriberServiceOld.cs index 96eb1d3d..30731298 100644 --- a/EgwCoreLib.Lux.Data/Services/RedisSubscriberServiceOld.cs +++ b/EgwCoreLib.Lux.Data/Services/RedisSubscriberServiceOld.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Lux.Data.Services +namespace EgwCoreLib.Lux.Data.Services { public class RedisSubscriberServiceOld : BackgroundService { diff --git a/Lux.API/Controllers/JwdController.cs b/Lux.API/Controllers/JwdController.cs index 8122576a..c5ac5689 100644 --- a/Lux.API/Controllers/JwdController.cs +++ b/Lux.API/Controllers/JwdController.cs @@ -1,6 +1,6 @@ using EgwMultiEngineManager; -using Lux.Core.RestPayload; -using Lux.Data; +using EgwCoreLib.Lux.Core.RestPayload; +using EgwCoreLib.Lux.Data; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Diagnostics; diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs index c8905c9b..a6c2738f 100644 --- a/Lux.API/Controllers/WindowController.cs +++ b/Lux.API/Controllers/WindowController.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.Services; using EgwMultiEngineManager; -using Lux.Data; +using EgwCoreLib.Lux.Data; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index 50d0c6ba..013201a4 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.Services; using EgwMultiEngineManager; -using Lux.Data; +using EgwCoreLib.Lux.Data; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/Lux.API/Services/RedisSubscriberService.cs b/Lux.API/Services/RedisSubscriberService.cs index dcd82a60..f85425a6 100644 --- a/Lux.API/Services/RedisSubscriberService.cs +++ b/Lux.API/Services/RedisSubscriberService.cs @@ -1,5 +1,5 @@ using EgwCoreLib.Lux.Data.Services; -using Lux.Data; +using EgwCoreLib.Lux.Data; namespace Lux.API.Services { diff --git a/Lux.All.sln b/Lux.All.sln index 8363c9b0..63b485cb 100644 --- a/Lux.All.sln +++ b/Lux.All.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.14.36203.30 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Core", "EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj", "{CCE87D58-1E6C-47B3-A28C-65BFCF5F1D0C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Data", "Lux.Data\EgwCoreLib.Lux.Data.csproj", "{9BA9FBAC-0D76-41CA-9970-A8DB982CC5F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Data", "EgwCoreLib.Lux.Data\EgwCoreLib.Lux.Data.csproj", "{9BA9FBAC-0D76-41CA-9970-A8DB982CC5F0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{E94496AD-22BB-4443-9A81-11D19AFBE0A3}" EndProject diff --git a/Lux.UI/Components/Pages/ResetCache.razor b/Lux.UI/Components/Pages/ResetCache.razor index 7c1731e9..e68af44d 100644 --- a/Lux.UI/Components/Pages/ResetCache.razor +++ b/Lux.UI/Components/Pages/ResetCache.razor @@ -1,6 +1,6 @@ @page "/ResetCache" @using EgwCoreLib.Lux.Data.Services -@using Lux.Data.Services +@using EgwCoreLib.Lux.Data.Services diff --git a/TestApp/Program.cs b/TestApp/Program.cs index 12d2a458..b7489eaa 100644 --- a/TestApp/Program.cs +++ b/TestApp/Program.cs @@ -1,5 +1,5 @@ // See https://aka.ms/new-console-template for more information -using Lux.Data.Controllers; +using EgwCoreLib.Lux.Data.Controllers; Console.WriteLine("--------------"); Console.WriteLine("Lux DB test");