From 953329e5566e3463561d93644c33ce2f27b49698 Mon Sep 17 00:00:00 2001 From: Omar Boukli-Hacene Date: Sun, 31 Mar 2024 22:10:17 +0200 Subject: [PATCH] refactor: Restructure solution --- Aktabook.sln | 12 +++++--- src/Aktabook.Bus/Aktabook.Bus.csproj | 2 +- src/Aktabook.Bus/Program.cs | 2 +- src/Aktabook.Bus/packages.lock.json | 28 ++++++++--------- .../Aktabook.Infrastructure.BusInfra.csproj} | 0 .../BusMessageConvention.cs | 2 +- .../DefaultEndpointConfiguration.cs | 2 +- .../packages.lock.json | 0 .../Aktabook.PublicApi.V1.csproj | 2 +- src/Aktabook.PublicApi.V1/Program.cs | 2 +- src/Aktabook.PublicApi.V1/packages.lock.json | 28 ++++++++--------- .../Aktabook.Bus.IntegrationTest.csproj | 2 +- .../Fixtures/BusEndpointFixture.cs | 2 +- .../packages.lock.json | 28 ++++++++--------- test/Aktabook.Bus.UnitTest/packages.lock.json | 30 +++++++++---------- ...k.Infrastructure.BusInfra.UnitTest.csproj} | 2 +- .../BusMessageConventionUnitTest.cs | 2 +- .../packages.lock.json | 16 +++++----- .../packages.lock.json | 30 +++++++++---------- .../packages.lock.json | 30 +++++++++---------- 20 files changed, 113 insertions(+), 109 deletions(-) rename src/{Aktabook.Bus.Common/Aktabook.Bus.Common.csproj => Aktabook.Infrastructure.BusInfra/Aktabook.Infrastructure.BusInfra.csproj} (100%) rename src/{Aktabook.Bus.Common => Aktabook.Infrastructure.BusInfra}/BusMessageConvention.cs (95%) rename src/{Aktabook.Bus.Common => Aktabook.Infrastructure.BusInfra}/DefaultEndpointConfiguration.cs (92%) rename src/{Aktabook.Bus.Common => Aktabook.Infrastructure.BusInfra}/packages.lock.json (100%) rename test/{Aktabook.Bus.Common.UnitTest/Aktabook.Bus.Common.UnitTest.csproj => Aktabook.Infrastructure.BusInfra.UnitTest/Aktabook.Infrastructure.BusInfra.UnitTest.csproj} (91%) rename test/{Aktabook.Bus.Common.UnitTest => Aktabook.Infrastructure.BusInfra.UnitTest}/BusMessageConventionUnitTest.cs (97%) rename test/{Aktabook.Bus.Common.UnitTest => Aktabook.Infrastructure.BusInfra.UnitTest}/packages.lock.json (99%) diff --git a/Aktabook.sln b/Aktabook.sln index 4446003..71d1c3d 100644 --- a/Aktabook.sln +++ b/Aktabook.sln @@ -49,13 +49,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{AEE37ED9-309 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus", "src\Aktabook.Bus\Aktabook.Bus.csproj", "{10723647-7D1B-46F6-84F5-ADC1E90D9397}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.Common", "src\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj", "{468BB6F7-B6F5-4275-A857-7CC3F3B976E7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.BusInfra", "src\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj", "{468BB6F7-B6F5-4275-A857-7CC3F3B976E7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.IntegrationTest", "test\Aktabook.Bus.IntegrationTest\Aktabook.Bus.IntegrationTest.csproj", "{4F936CF1-3082-449E-9192-267E57B5D19A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.UnitTest", "test\Aktabook.Bus.UnitTest\Aktabook.Bus.UnitTest.csproj", "{F62DCDA3-055E-4989-9950-FC589CA35802}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.Common.UnitTest", "test\Aktabook.Bus.Common.UnitTest\Aktabook.Bus.Common.UnitTest.csproj", "{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.BusInfra.UnitTest", "test\Aktabook.Infrastructure.BusInfra.UnitTest\Aktabook.Infrastructure.BusInfra.UnitTest.csproj", "{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Diagnostics.HealthChecks", "src\Aktabook.Diagnostics.HealthChecks\Aktabook.Diagnostics.HealthChecks.csproj", "{C05A9CF0-7446-43C0-B3CE-C66228259D34}" EndProject @@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Diagnostics.OpenTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.Configuration.UnitTest", "test\Aktabook.Infrastructure.Configuration.UnitTest\Aktabook.Infrastructure.Configuration.UnitTest.csproj", "{F7F83AFB-F8E0-4617-B709-E4D534959DFA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{6DEAE75C-FDB3-42F0-8649-00BFF4FABE89}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -98,16 +100,18 @@ Global {2A3030AD-21F8-493C-9872-71840C5BF871} = {E2A34458-3906-44C1-B217-594E447CF882} {1F90D50C-2623-44A1-B38F-CE8CC560306D} = {3944B810-DA18-43D2-9099-F1972C14C393} {10723647-7D1B-46F6-84F5-ADC1E90D9397} = {AEE37ED9-309D-4DA6-989A-67095A554204} - {468BB6F7-B6F5-4275-A857-7CC3F3B976E7} = {AEE37ED9-309D-4DA6-989A-67095A554204} {4F936CF1-3082-449E-9192-267E57B5D19A} = {AEE37ED9-309D-4DA6-989A-67095A554204} {F62DCDA3-055E-4989-9950-FC589CA35802} = {AEE37ED9-309D-4DA6-989A-67095A554204} - {BE9A6FDC-4490-4223-B4B9-5C78133A8FA5} = {AEE37ED9-309D-4DA6-989A-67095A554204} {93EE2508-9865-49A5-AFEE-936C55C84332} = {0269BDFF-5922-419C-AB58-33F0950D51DB} {C05A9CF0-7446-43C0-B3CE-C66228259D34} = {0269BDFF-5922-419C-AB58-33F0950D51DB} {E99C3CCF-3CD4-4D4B-8140-39B5D97BEB86} = {0269BDFF-5922-419C-AB58-33F0950D51DB} {F9E057DA-CC3B-4360-A05B-20C076D5FEAA} = {0269BDFF-5922-419C-AB58-33F0950D51DB} {96C20188-B83A-406F-9F0A-8E6B88DFD2E0} = {0269BDFF-5922-419C-AB58-33F0950D51DB} {F7F83AFB-F8E0-4617-B709-E4D534959DFA} = {3944B810-DA18-43D2-9099-F1972C14C393} + {468BB6F7-B6F5-4275-A857-7CC3F3B976E7} = {3944B810-DA18-43D2-9099-F1972C14C393} + {BE9A6FDC-4490-4223-B4B9-5C78133A8FA5} = {3944B810-DA18-43D2-9099-F1972C14C393} + {AEE37ED9-309D-4DA6-989A-67095A554204} = {6DEAE75C-FDB3-42F0-8649-00BFF4FABE89} + {0B0D178E-9980-4BB2-B29F-2CA6EE52852D} = {6DEAE75C-FDB3-42F0-8649-00BFF4FABE89} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DA28654A-6A2F-493C-8F4F-23B88D77D2AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/Aktabook.Bus/Aktabook.Bus.csproj b/src/Aktabook.Bus/Aktabook.Bus.csproj index 264563f..9b209f1 100644 --- a/src/Aktabook.Bus/Aktabook.Bus.csproj +++ b/src/Aktabook.Bus/Aktabook.Bus.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/Aktabook.Bus/Program.cs b/src/Aktabook.Bus/Program.cs index dd45781..b297155 100644 --- a/src/Aktabook.Bus/Program.cs +++ b/src/Aktabook.Bus/Program.cs @@ -9,12 +9,12 @@ using Aktabook.Application; using Aktabook.Application.Services; using Aktabook.Bus; -using Aktabook.Bus.Common; using Aktabook.Connectors.OpenLibrary; using Aktabook.Connectors.OpenLibrary.DependencyInjection; using Aktabook.Data; using Aktabook.Data.Constants; using Aktabook.Diagnostics.OpenTelemetry; +using Aktabook.Infrastructure.BusInfra; using Aktabook.Infrastructure.Configuration; using Aktabook.Services.BookInfoRequestService; using Microsoft.EntityFrameworkCore; diff --git a/src/Aktabook.Bus/packages.lock.json b/src/Aktabook.Bus/packages.lock.json index 4d4032e..6f15d15 100644 --- a/src/Aktabook.Bus/packages.lock.json +++ b/src/Aktabook.Bus/packages.lock.json @@ -1540,20 +1540,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.connectors.openlibrary": { "type": "Project", "dependencies": { @@ -1612,6 +1598,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { diff --git a/src/Aktabook.Bus.Common/Aktabook.Bus.Common.csproj b/src/Aktabook.Infrastructure.BusInfra/Aktabook.Infrastructure.BusInfra.csproj similarity index 100% rename from src/Aktabook.Bus.Common/Aktabook.Bus.Common.csproj rename to src/Aktabook.Infrastructure.BusInfra/Aktabook.Infrastructure.BusInfra.csproj diff --git a/src/Aktabook.Bus.Common/BusMessageConvention.cs b/src/Aktabook.Infrastructure.BusInfra/BusMessageConvention.cs similarity index 95% rename from src/Aktabook.Bus.Common/BusMessageConvention.cs rename to src/Aktabook.Infrastructure.BusInfra/BusMessageConvention.cs index 5caa801..e5fb499 100644 --- a/src/Aktabook.Bus.Common/BusMessageConvention.cs +++ b/src/Aktabook.Infrastructure.BusInfra/BusMessageConvention.cs @@ -7,7 +7,7 @@ using Aktabook.Application.Messages.Commands; using Aktabook.Application.Messages.Events; -namespace Aktabook.Bus.Common; +namespace Aktabook.Infrastructure.BusInfra; public class BusMessageConvention : IMessageConvention { diff --git a/src/Aktabook.Bus.Common/DefaultEndpointConfiguration.cs b/src/Aktabook.Infrastructure.BusInfra/DefaultEndpointConfiguration.cs similarity index 92% rename from src/Aktabook.Bus.Common/DefaultEndpointConfiguration.cs rename to src/Aktabook.Infrastructure.BusInfra/DefaultEndpointConfiguration.cs index 3805106..0c67dc6 100644 --- a/src/Aktabook.Bus.Common/DefaultEndpointConfiguration.cs +++ b/src/Aktabook.Infrastructure.BusInfra/DefaultEndpointConfiguration.cs @@ -4,7 +4,7 @@ // SPDX-License-Identifier: MIT -namespace Aktabook.Bus.Common; +namespace Aktabook.Infrastructure.BusInfra; public static class DefaultEndpointConfiguration { diff --git a/src/Aktabook.Bus.Common/packages.lock.json b/src/Aktabook.Infrastructure.BusInfra/packages.lock.json similarity index 100% rename from src/Aktabook.Bus.Common/packages.lock.json rename to src/Aktabook.Infrastructure.BusInfra/packages.lock.json diff --git a/src/Aktabook.PublicApi.V1/Aktabook.PublicApi.V1.csproj b/src/Aktabook.PublicApi.V1/Aktabook.PublicApi.V1.csproj index 4600f6e..9877706 100644 --- a/src/Aktabook.PublicApi.V1/Aktabook.PublicApi.V1.csproj +++ b/src/Aktabook.PublicApi.V1/Aktabook.PublicApi.V1.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Aktabook.PublicApi.V1/Program.cs b/src/Aktabook.PublicApi.V1/Program.cs index 9d3ad3b..06d7ec9 100644 --- a/src/Aktabook.PublicApi.V1/Program.cs +++ b/src/Aktabook.PublicApi.V1/Program.cs @@ -8,8 +8,8 @@ using Aktabook.Application; using Aktabook.Application.MessageHandlers; using Aktabook.Application.Messages.Commands; -using Aktabook.Bus.Common; using Aktabook.Data.Constants; +using Aktabook.Infrastructure.BusInfra; using Aktabook.Infrastructure.Configuration; using Aktabook.PublicApi.V1.DependencyInjection; using Aktabook.PublicApi.V1.Validators; diff --git a/src/Aktabook.PublicApi.V1/packages.lock.json b/src/Aktabook.PublicApi.V1/packages.lock.json index 5a83bf4..0efaa7d 100644 --- a/src/Aktabook.PublicApi.V1/packages.lock.json +++ b/src/Aktabook.PublicApi.V1/packages.lock.json @@ -1504,20 +1504,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.data": { "type": "Project", "dependencies": { @@ -1539,6 +1525,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { diff --git a/test/Aktabook.Bus.IntegrationTest/Aktabook.Bus.IntegrationTest.csproj b/test/Aktabook.Bus.IntegrationTest/Aktabook.Bus.IntegrationTest.csproj index a8de1ac..401d389 100644 --- a/test/Aktabook.Bus.IntegrationTest/Aktabook.Bus.IntegrationTest.csproj +++ b/test/Aktabook.Bus.IntegrationTest/Aktabook.Bus.IntegrationTest.csproj @@ -30,7 +30,7 @@ - + diff --git a/test/Aktabook.Bus.IntegrationTest/Fixtures/BusEndpointFixture.cs b/test/Aktabook.Bus.IntegrationTest/Fixtures/BusEndpointFixture.cs index 30f1e65..a4866bd 100644 --- a/test/Aktabook.Bus.IntegrationTest/Fixtures/BusEndpointFixture.cs +++ b/test/Aktabook.Bus.IntegrationTest/Fixtures/BusEndpointFixture.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; using Aktabook.Application; using Aktabook.Application.Messages.Commands; -using Aktabook.Bus.Common; using Aktabook.Data.Testing.Fixtures; +using Aktabook.Infrastructure.BusInfra; using Aktabook.Infrastructure.Configuration; using NServiceBus; diff --git a/test/Aktabook.Bus.IntegrationTest/packages.lock.json b/test/Aktabook.Bus.IntegrationTest/packages.lock.json index 13fc785..30b7b22 100644 --- a/test/Aktabook.Bus.IntegrationTest/packages.lock.json +++ b/test/Aktabook.Bus.IntegrationTest/packages.lock.json @@ -1289,20 +1289,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.data": { "type": "Project", "dependencies": { @@ -1339,6 +1325,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { diff --git a/test/Aktabook.Bus.UnitTest/packages.lock.json b/test/Aktabook.Bus.UnitTest/packages.lock.json index 27df271..b6c1e6c 100644 --- a/test/Aktabook.Bus.UnitTest/packages.lock.json +++ b/test/Aktabook.Bus.UnitTest/packages.lock.json @@ -1989,12 +1989,12 @@ "aktabook.bus": { "type": "Project", "dependencies": { - "Aktabook.Bus.Common": "[1.0.0, )", "Aktabook.Connectors.OpenLibrary": "[1.0.0, )", "Aktabook.Data": "[1.0.0, )", "Aktabook.Diagnostics.HealthChecks": "[1.0.0, )", "Aktabook.Diagnostics.OpenTelemetry": "[1.0.0, )", "Aktabook.Diagnostics.Process": "[1.0.0, )", + "Aktabook.Infrastructure.BusInfra": "[1.0.0, )", "Aktabook.Infrastructure.Configuration": "[1.0.0, )", "Aktabook.Services.BookInfoRequestService": "[1.0.0, )", "AspNetCore.HealthChecks.Rabbitmq": "[6.0.2, )", @@ -2025,20 +2025,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.connectors.openlibrary": { "type": "Project", "dependencies": { @@ -2097,6 +2083,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { diff --git a/test/Aktabook.Bus.Common.UnitTest/Aktabook.Bus.Common.UnitTest.csproj b/test/Aktabook.Infrastructure.BusInfra.UnitTest/Aktabook.Infrastructure.BusInfra.UnitTest.csproj similarity index 91% rename from test/Aktabook.Bus.Common.UnitTest/Aktabook.Bus.Common.UnitTest.csproj rename to test/Aktabook.Infrastructure.BusInfra.UnitTest/Aktabook.Infrastructure.BusInfra.UnitTest.csproj index acb8872..d837c1d 100644 --- a/test/Aktabook.Bus.Common.UnitTest/Aktabook.Bus.Common.UnitTest.csproj +++ b/test/Aktabook.Infrastructure.BusInfra.UnitTest/Aktabook.Infrastructure.BusInfra.UnitTest.csproj @@ -27,7 +27,7 @@ - + diff --git a/test/Aktabook.Bus.Common.UnitTest/BusMessageConventionUnitTest.cs b/test/Aktabook.Infrastructure.BusInfra.UnitTest/BusMessageConventionUnitTest.cs similarity index 97% rename from test/Aktabook.Bus.Common.UnitTest/BusMessageConventionUnitTest.cs rename to test/Aktabook.Infrastructure.BusInfra.UnitTest/BusMessageConventionUnitTest.cs index 21dc057..10c525d 100644 --- a/test/Aktabook.Bus.Common.UnitTest/BusMessageConventionUnitTest.cs +++ b/test/Aktabook.Infrastructure.BusInfra.UnitTest/BusMessageConventionUnitTest.cs @@ -9,7 +9,7 @@ using FluentAssertions; using Xunit; -namespace Aktabook.Bus.Common.UnitTest; +namespace Aktabook.Infrastructure.BusInfra.UnitTest; public class BusMessageConventionUnitTest { diff --git a/test/Aktabook.Bus.Common.UnitTest/packages.lock.json b/test/Aktabook.Infrastructure.BusInfra.UnitTest/packages.lock.json similarity index 99% rename from test/Aktabook.Bus.Common.UnitTest/packages.lock.json rename to test/Aktabook.Infrastructure.BusInfra.UnitTest/packages.lock.json index 48b1a0e..236fba9 100644 --- a/test/Aktabook.Bus.Common.UnitTest/packages.lock.json +++ b/test/Aktabook.Infrastructure.BusInfra.UnitTest/packages.lock.json @@ -1214,23 +1214,23 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { + "aktabook.domain": { "type": "Project", "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", "System.Drawing.Common": "[6.0.0, )", "System.Net.Http": "[4.3.4, )", "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.domain": { + "aktabook.infrastructure.businfra": { "type": "Project", "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", "System.Drawing.Common": "[6.0.0, )", "System.Net.Http": "[4.3.4, )", "System.Text.RegularExpressions": "[4.3.1, )" diff --git a/test/Aktabook.PublicApi.V1.IntegrationTest/packages.lock.json b/test/Aktabook.PublicApi.V1.IntegrationTest/packages.lock.json index 61d4e45..dfc3a1f 100644 --- a/test/Aktabook.PublicApi.V1.IntegrationTest/packages.lock.json +++ b/test/Aktabook.PublicApi.V1.IntegrationTest/packages.lock.json @@ -1945,20 +1945,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.data": { "type": "Project", "dependencies": { @@ -1995,6 +1981,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { @@ -2012,7 +2012,7 @@ "type": "Project", "dependencies": { "Aktabook.Application": "[1.0.0, )", - "Aktabook.Bus.Common": "[1.0.0, )", + "Aktabook.Infrastructure.BusInfra": "[1.0.0, )", "Aktabook.Infrastructure.Configuration": "[1.0.0, )", "Aktabook.Services.BookInfoRequestService": "[1.0.0, )", "FluentValidation.DependencyInjectionExtensions": "[11.9.0, )", diff --git a/test/Aktabook.PublicApi.V1.UnitTest/packages.lock.json b/test/Aktabook.PublicApi.V1.UnitTest/packages.lock.json index 62dbac5..fcb0c17 100644 --- a/test/Aktabook.PublicApi.V1.UnitTest/packages.lock.json +++ b/test/Aktabook.PublicApi.V1.UnitTest/packages.lock.json @@ -1915,20 +1915,6 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, - "aktabook.bus.common": { - "type": "Project", - "dependencies": { - "Aktabook.Application": "[1.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "NServiceBus": "[8.1.6, )", - "NServiceBus.Newtonsoft.Json": "[3.0.0, )", - "System.Drawing.Common": "[6.0.0, )", - "System.Net.Http": "[4.3.4, )", - "System.Text.RegularExpressions": "[4.3.1, )" - } - }, "aktabook.data": { "type": "Project", "dependencies": { @@ -1950,6 +1936,20 @@ "System.Text.RegularExpressions": "[4.3.1, )" } }, + "aktabook.infrastructure.businfra": { + "type": "Project", + "dependencies": { + "Aktabook.Application": "[1.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "NServiceBus": "[8.1.6, )", + "NServiceBus.Newtonsoft.Json": "[3.0.0, )", + "System.Drawing.Common": "[6.0.0, )", + "System.Net.Http": "[4.3.4, )", + "System.Text.RegularExpressions": "[4.3.1, )" + } + }, "aktabook.infrastructure.configuration": { "type": "Project", "dependencies": { @@ -1967,7 +1967,7 @@ "type": "Project", "dependencies": { "Aktabook.Application": "[1.0.0, )", - "Aktabook.Bus.Common": "[1.0.0, )", + "Aktabook.Infrastructure.BusInfra": "[1.0.0, )", "Aktabook.Infrastructure.Configuration": "[1.0.0, )", "Aktabook.Services.BookInfoRequestService": "[1.0.0, )", "FluentValidation.DependencyInjectionExtensions": "[11.9.0, )",