diff --git a/Core.Api.Testing/ApiFixture.cs b/Core.Api.Testing/ApiFixture.cs deleted file mode 100644 index 0fad1c2a7..000000000 --- a/Core.Api.Testing/ApiFixture.cs +++ /dev/null @@ -1,95 +0,0 @@ -// using System.Net; -// using System.Net.Http.Headers; -// using Core.Serialization.Newtonsoft; -// using Xunit; -// -// namespace Core.Api.Testing; -// -// public abstract class ApiFixture: IAsyncLifetime where TProgram : class -// { -// protected readonly TestContext Sut; -// -// protected HttpClient Client => Sut.Client; -// -// protected abstract string ApiUrl { get; } -// -// protected ApiFixture() -// { -// Environment.SetEnvironmentVariable("SchemaName", GetType().Name.ToLower()); -// -// Sut = CreateTestContext(); -// } -// -// public virtual TestContext CreateTestContext() => new(); -// -// public virtual Task InitializeAsync() => Task.CompletedTask; -// -// public virtual Task DisposeAsync() -// { -// Sut.Dispose(); -// Client.Dispose(); -// return Task.CompletedTask; -// } -// -// // TODO: Add Poly here -// public async Task Get(string path = "", int maxNumberOfRetries = 0, -// int retryIntervalInMs = 1000, Func>? check = null) -// { -// HttpResponseMessage queryResponse; -// var retryCount = maxNumberOfRetries; -// -// var doCheck = check ?? (response => new(response.StatusCode == HttpStatusCode.OK)); -// do -// { -// queryResponse = await Client.GetAsync( -// $"{ApiUrl}/{path}" -// ); -// -// if (retryCount == 0 || (await doCheck(queryResponse))) -// break; -// -// await Task.Delay(retryIntervalInMs); -// retryCount--; -// } while (true); -// -// return queryResponse; -// } -// -// public Task Post(string path, object body, RequestOptions? requestOptions = null) -// => Send(HttpMethod.Post, path, body, requestOptions); -// -// public Task Post(object body, RequestOptions? requestOptions = null) => -// Post(string.Empty, body, requestOptions); -// -// public Task Put(string path, object? body = null, RequestOptions? requestOptions = null) -// => Send(HttpMethod.Put, path, body, requestOptions); -// -// public Task Delete(string path, RequestOptions? requestOptions = null) -// => Send(HttpMethod.Delete, path, null, requestOptions); -// -// public Task Delete(RequestOptions? requestOptions = null) => -// Delete(string.Empty, requestOptions); -// -// public async Task Send(HttpMethod method, string path, object? body = null, -// RequestOptions? requestOptions = null) -// { -// using var request = new HttpRequestMessage(method, $"{ApiUrl}/{path}"); -// -// if (requestOptions?.IfMatch != null) -// request.Headers.IfMatch.Add(new EntityTagHeaderValue($"\"{requestOptions.IfMatch}\"", true)); -// -// if (method == HttpMethod.Post || method == HttpMethod.Put || method == HttpMethod.Patch) -// { -// request.Content = body != null -// ? body.ToJsonStringContent() -// : new StringContent(string.Empty); -// } -// -// return await Client.SendAsync(request); -// } -// } -// -// public class RequestOptions -// { -// public string? IfMatch { get; set; } -// } diff --git a/Core.Api.Testing/Core.Api.Testing.csproj b/Core.Api.Testing/Core.Api.Testing.csproj deleted file mode 100644 index b6b75f3c2..000000000 --- a/Core.Api.Testing/Core.Api.Testing.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - net6.0 - false - - - - - - - - - - - - - - - - - diff --git a/Core.Api.Testing/ResponseExtensions.cs b/Core.Api.Testing/ResponseExtensions.cs deleted file mode 100644 index f56460ebf..000000000 --- a/Core.Api.Testing/ResponseExtensions.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Core.Serialization.Newtonsoft; -using FluentAssertions; - -namespace Core.Api.Testing; - -public static class ResponseExtensions -{ - public static async Task GetResultFromJson(this HttpResponseMessage response) - { - var result = await response.Content.ReadAsStringAsync(); - - result.Should().NotBeNull(); - result.Should().NotBeEmpty(); - - return result.FromJson(); - } -} diff --git a/Core.Api.Testing/TestContext.cs b/Core.Api.Testing/TestContext.cs deleted file mode 100644 index 3b41a7e10..000000000 --- a/Core.Api.Testing/TestContext.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace Core.Api.Testing; - -public class TestContext: IDisposable where TProgram : class -{ - public HttpClient Client { get; } - public IServiceProvider Services => applicationFactory.Services; - - private readonly WebApplicationFactory applicationFactory; - - public TestContext() - { - applicationFactory = new WebApplicationFactory() - .WithWebHostBuilder( - builder => - { - var projectDir = Directory.GetCurrentDirectory(); - - builder - .UseEnvironment("Development") - .UseContentRoot(projectDir) - .UseConfiguration(new ConfigurationBuilder() - .SetBasePath(projectDir) - .AddJsonFile("appsettings.json", true) - .Build() - ); - } - ); - - - Client = applicationFactory.CreateClient(); - } - - public void Dispose() - { - applicationFactory.Dispose(); - Client.Dispose(); - } -} diff --git a/Core.Testing/ApiFixture.cs b/Core.Testing/TestWebApplicationFactory.cs similarity index 54% rename from Core.Testing/ApiFixture.cs rename to Core.Testing/TestWebApplicationFactory.cs index 4c3de4408..62285bf58 100644 --- a/Core.Testing/ApiFixture.cs +++ b/Core.Testing/TestWebApplicationFactory.cs @@ -85,70 +85,3 @@ public async Task ShouldPublishInternalEventOfType( } while (!finished); } } - -// public abstract class ApiWithEventsFixture: ApiFixture where TProject : class -// { -// private readonly EventsLog eventsLog = new(); -// private readonly DummyExternalEventProducer externalEventProducer = new(); -// private readonly DummyExternalCommandBus externalCommandBus = new(); -// -// public override TestContext CreateTestContext() => -// new(services => -// { -// SetupServices?.Invoke(services); -// services.AddSingleton(eventsLog); -// services.AddSingleton(typeof(IEventHandler<>), typeof(EventListener<>)); -// services.AddSingleton(externalEventProducer); -// services.AddSingleton(sp => -// new EventBusDecoratorWithExternalProducer(sp.GetRequiredService(), -// sp.GetRequiredService())); -// services.AddSingleton(externalCommandBus); -// services.AddSingleton(); -// }); -// -// -// public void PublishedExternalEventsOfType() where TEvent : IExternalEvent -// { -// externalEventProducer.PublishedEvents.OfType().ToList().Should().NotBeEmpty(); -// } -// -// public async Task PublishInternalEvent(object @event, CancellationToken ct = default) -// { -// using var scope = Sut.Services.CreateScope(); -// var eventBus = scope.ServiceProvider.GetRequiredService(); -// await eventBus.Publish(@event, ct); -// } -// -// public IReadOnlyCollection PublishedInternalEventsOfType() => -// eventsLog.PublishedEvents.OfType().ToList(); -// -// // TODO: Add Poly here -// public async Task ShouldPublishInternalEventOfType( -// Expression> predicate, -// int maxNumberOfRetries = 5, -// int retryIntervalInMs = 1000) -// { -// var retryCount = maxNumberOfRetries; -// var finished = false; -// -// do -// { -// try -// { -// PublishedInternalEventsOfType().Should() -// .HaveCount(1) -// .And.Contain(predicate); -// -// finished = true; -// } -// catch -// { -// if (retryCount == 0) -// throw; -// } -// -// await Task.Delay(retryIntervalInMs); -// retryCount--; -// } while (!finished); -// } -// } diff --git a/EventSourcing.NetCore.sln b/EventSourcing.NetCore.sln index 05f73d9e9..33ef104cd 100644 --- a/EventSourcing.NetCore.sln +++ b/EventSourcing.NetCore.sln @@ -220,8 +220,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommerce", "Sample\EventSt EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommerce.Api.Tests", "Sample\EventStoreDB\Simple\ECommerce.Api.Tests\ECommerce.Api.Tests.csproj", "{36C7CF36-254A-48D5-8181-9196DB1A034B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Api.Testing", "Core.Api.Testing\Core.Api.Testing.csproj", "{E96D4B8C-AF32-4434-BB5D-5C88675DC084}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommerce.Core", "Sample\EventStoreDB\Simple\ECommerce.Core\ECommerce.Core.csproj", "{D3351193-F63A-43F1-BB70-C9F4D25887CA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventPipelines", "EventPipelines", "{D9799DB3-9D11-4909-8133-64CD96F6E1AC}" @@ -593,10 +591,6 @@ Global {36C7CF36-254A-48D5-8181-9196DB1A034B}.Debug|Any CPU.Build.0 = Debug|Any CPU {36C7CF36-254A-48D5-8181-9196DB1A034B}.Release|Any CPU.ActiveCfg = Release|Any CPU {36C7CF36-254A-48D5-8181-9196DB1A034B}.Release|Any CPU.Build.0 = Release|Any CPU - {E96D4B8C-AF32-4434-BB5D-5C88675DC084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E96D4B8C-AF32-4434-BB5D-5C88675DC084}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E96D4B8C-AF32-4434-BB5D-5C88675DC084}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E96D4B8C-AF32-4434-BB5D-5C88675DC084}.Release|Any CPU.Build.0 = Release|Any CPU {D3351193-F63A-43F1-BB70-C9F4D25887CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3351193-F63A-43F1-BB70-C9F4D25887CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3351193-F63A-43F1-BB70-C9F4D25887CA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -835,7 +829,6 @@ Global {414D1D34-1002-4159-B738-DF3EE042F9FD} = {11DD4963-5BB4-4E1B-9475-8EB10C822BFC} {C8CBBED5-8999-4643-96E6-E56B3A940F97} = {11DD4963-5BB4-4E1B-9475-8EB10C822BFC} {36C7CF36-254A-48D5-8181-9196DB1A034B} = {11DD4963-5BB4-4E1B-9475-8EB10C822BFC} - {E96D4B8C-AF32-4434-BB5D-5C88675DC084} = {0570E45A-2EB6-4C4C-84E4-2C80E1FECEB5} {D3351193-F63A-43F1-BB70-C9F4D25887CA} = {11DD4963-5BB4-4E1B-9475-8EB10C822BFC} {D9799DB3-9D11-4909-8133-64CD96F6E1AC} = {A7186B6B-D56D-4AEF-B6B7-FAA827764C34} {622B15BD-9675-431E-B3F0-336D4E50E30F} = {D9799DB3-9D11-4909-8133-64CD96F6E1AC} diff --git a/Sample/ECommerce/PracticalEventSourcing.sln b/Sample/ECommerce/PracticalEventSourcing.sln index 4707393e6..d01e4bac2 100644 --- a/Sample/ECommerce/PracticalEventSourcing.sln +++ b/Sample/ECommerce/PracticalEventSourcing.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\Core\Core.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Marten", "..\..\Core.Marten\Core.Marten.csproj", "{9268B3EA-71E1-4B50-A459-5732F4977942}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{8A50B198-C3ED-4DE8-8D63-11FF005C53C1}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.WebApi", "..\..\Core.WebApi\Core.WebApi.csproj", "{72ACB5C8-FD64-4041-BA20-BFCC5A04E97C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Carts", "Carts", "{190C033E-DF29-4F8F-A048-7E860ADD082D}" @@ -62,12 +60,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A98BE9E3-8 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Kafka", "..\..\Core.Kafka\Core.Kafka.csproj", "{1B9111A1-DCA6-42BF-A073-402024780D8D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{714E605E-6EB2-41F4-A2BC-FACD7F781907}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Api.Testing", "..\..\Core.Api.Testing\Core.Api.Testing.csproj", "{3EFCB989-6F16-4D69-8C3D-7F862243FAB9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Serialization", "..\..\Core.Serialization\Core.Serialization.csproj", "{F519CFB6-9B4D-4317-B442-32B5F4EC5A4C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -76,7 +72,6 @@ Global GlobalSection(NestedProjects) = preSolution {607CC0DE-712A-4FFB-9862-FEB4F10100D2} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} {9268B3EA-71E1-4B50-A459-5732F4977942} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} - {8A50B198-C3ED-4DE8-8D63-11FF005C53C1} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} {72ACB5C8-FD64-4041-BA20-BFCC5A04E97C} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} {6ED65CEC-8661-483F-A7BE-5B6EAAE7E5A2} = {190C033E-DF29-4F8F-A048-7E860ADD082D} {AB956DE1-6927-49D3-986C-6298AD92FC04} = {190C033E-DF29-4F8F-A048-7E860ADD082D} @@ -95,9 +90,8 @@ Global {494CAEE8-548A-481A-AAD2-3CADD2A198B4} = {8C72B8D9-1542-4703-9530-90EABB6A6DF4} {30E21C9B-5680-4F09-9FDA-6447A25EB1F7} = {8C72B8D9-1542-4703-9530-90EABB6A6DF4} {1B9111A1-DCA6-42BF-A073-402024780D8D} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} - {714E605E-6EB2-41F4-A2BC-FACD7F781907} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} - {3EFCB989-6F16-4D69-8C3D-7F862243FAB9} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} {F519CFB6-9B4D-4317-B442-32B5F4EC5A4C} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} + {E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA} = {CC9592F6-C639-4C1E-A089-E5A7F4B9BAEA} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {607CC0DE-712A-4FFB-9862-FEB4F10100D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -108,10 +102,6 @@ Global {9268B3EA-71E1-4B50-A459-5732F4977942}.Debug|Any CPU.Build.0 = Debug|Any CPU {9268B3EA-71E1-4B50-A459-5732F4977942}.Release|Any CPU.ActiveCfg = Release|Any CPU {9268B3EA-71E1-4B50-A459-5732F4977942}.Release|Any CPU.Build.0 = Release|Any CPU - {8A50B198-C3ED-4DE8-8D63-11FF005C53C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A50B198-C3ED-4DE8-8D63-11FF005C53C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A50B198-C3ED-4DE8-8D63-11FF005C53C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A50B198-C3ED-4DE8-8D63-11FF005C53C1}.Release|Any CPU.Build.0 = Release|Any CPU {72ACB5C8-FD64-4041-BA20-BFCC5A04E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {72ACB5C8-FD64-4041-BA20-BFCC5A04E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU {72ACB5C8-FD64-4041-BA20-BFCC5A04E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -184,17 +174,13 @@ Global {1B9111A1-DCA6-42BF-A073-402024780D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B9111A1-DCA6-42BF-A073-402024780D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B9111A1-DCA6-42BF-A073-402024780D8D}.Release|Any CPU.Build.0 = Release|Any CPU - {714E605E-6EB2-41F4-A2BC-FACD7F781907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {714E605E-6EB2-41F4-A2BC-FACD7F781907}.Debug|Any CPU.Build.0 = Debug|Any CPU - {714E605E-6EB2-41F4-A2BC-FACD7F781907}.Release|Any CPU.ActiveCfg = Release|Any CPU - {714E605E-6EB2-41F4-A2BC-FACD7F781907}.Release|Any CPU.Build.0 = Release|Any CPU - {3EFCB989-6F16-4D69-8C3D-7F862243FAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EFCB989-6F16-4D69-8C3D-7F862243FAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EFCB989-6F16-4D69-8C3D-7F862243FAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EFCB989-6F16-4D69-8C3D-7F862243FAB9}.Release|Any CPU.Build.0 = Release|Any CPU {F519CFB6-9B4D-4317-B442-32B5F4EC5A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F519CFB6-9B4D-4317-B442-32B5F4EC5A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F519CFB6-9B4D-4317-B442-32B5F4EC5A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F519CFB6-9B4D-4317-B442-32B5F4EC5A4C}.Release|Any CPU.Build.0 = Release|Any CPU + {E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4A93074-B2CC-4036-AAC6-4AD1D9BDE9EA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Sample/EventStoreDB/Simple/ECommerce.sln b/Sample/EventStoreDB/Simple/ECommerce.sln index 77c1c10aa..2ecfb7727 100644 --- a/Sample/EventStoreDB/Simple/ECommerce.sln +++ b/Sample/EventStoreDB/Simple/ECommerce.sln @@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{1F491B11-2 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.WebApi", "..\..\..\Core.WebApi\Core.WebApi.csproj", "{AE9175ED-054C-46F6-A91D-0F2691BD935B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Api.Testing", "..\..\..\Core.Api.Testing\Core.Api.Testing.csproj", "{3C69FDAF-20C4-49C4-A648-C0AD8958CB3D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommerce.Core", "ECommerce.Core\ECommerce.Core.csproj", "{3DF5E171-72BD-4129-B66C-5428029CF932}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{6C654A81-F8CF-46DE-9CD8-442162F3F6FD}" @@ -30,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\..\Core\Core. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Serialization", "..\..\..\Core.Serialization\Core.Serialization.csproj", "{E65E4940-C29F-4558-AB21-8AC2F54528DE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\..\Core.Testing\Core.Testing.csproj", "{A1894305-B86B-411D-ABCE-115CF5142D92}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,10 +37,10 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {AE9175ED-054C-46F6-A91D-0F2691BD935B} = {1F491B11-2201-4616-976F-A3012D95BD9C} - {3C69FDAF-20C4-49C4-A648-C0AD8958CB3D} = {1F491B11-2201-4616-976F-A3012D95BD9C} {8D0F5E6A-F460-4FE0-BD5E-02356D7D56CB} = {1F491B11-2201-4616-976F-A3012D95BD9C} {39647310-1DEE-4464-94CC-59CBC2A2B185} = {1F491B11-2201-4616-976F-A3012D95BD9C} {E65E4940-C29F-4558-AB21-8AC2F54528DE} = {1F491B11-2201-4616-976F-A3012D95BD9C} + {A1894305-B86B-411D-ABCE-115CF5142D92} = {1F491B11-2201-4616-976F-A3012D95BD9C} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7AA17923-7368-449B-95E6-5A64C1FAF4B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -59,10 +59,6 @@ Global {AE9175ED-054C-46F6-A91D-0F2691BD935B}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE9175ED-054C-46F6-A91D-0F2691BD935B}.Release|Any CPU.ActiveCfg = Release|Any CPU {AE9175ED-054C-46F6-A91D-0F2691BD935B}.Release|Any CPU.Build.0 = Release|Any CPU - {3C69FDAF-20C4-49C4-A648-C0AD8958CB3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C69FDAF-20C4-49C4-A648-C0AD8958CB3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C69FDAF-20C4-49C4-A648-C0AD8958CB3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C69FDAF-20C4-49C4-A648-C0AD8958CB3D}.Release|Any CPU.Build.0 = Release|Any CPU {3DF5E171-72BD-4129-B66C-5428029CF932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DF5E171-72BD-4129-B66C-5428029CF932}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DF5E171-72BD-4129-B66C-5428029CF932}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -79,5 +75,9 @@ Global {E65E4940-C29F-4558-AB21-8AC2F54528DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {E65E4940-C29F-4558-AB21-8AC2F54528DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {E65E4940-C29F-4558-AB21-8AC2F54528DE}.Release|Any CPU.Build.0 = Release|Any CPU + {A1894305-B86B-411D-ABCE-115CF5142D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1894305-B86B-411D-ABCE-115CF5142D92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1894305-B86B-411D-ABCE-115CF5142D92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1894305-B86B-411D-ABCE-115CF5142D92}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Sample/MeetingsManagement/MeetingsManagement.sln b/Sample/MeetingsManagement/MeetingsManagement.sln index cda1f4177..eaf3855fb 100644 --- a/Sample/MeetingsManagement/MeetingsManagement.sln +++ b/Sample/MeetingsManagement/MeetingsManagement.sln @@ -22,10 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\Core\Core.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Marten", "..\..\Core.Marten\Core.Marten.csproj", "{31ABC8F7-C632-4D32-9586-65F18EDA1916}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Streaming.Kafka", "..\..\Core.Streaming.Kafka\Core.Streaming.Kafka.csproj", "{1F206BA4-8E67-48B0-8E47-5246DA6EFB7D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Streaming", "..\..\Core.Streaming\Core.Streaming.csproj", "{E936B698-88EF-42D4-A51B-F7FE3E36A1DF}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{4773E9E2-0F69-48DD-89A1-DFF525507FF3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeetingsManagement", "MeetingsManagement\MeetingsManagement.csproj", "{D6E09C85-AF7F-43B4-B8C8-F5D0612A78DA}" @@ -40,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeetingsSearch.Api", "Meeti EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeetingsSearch.IntegrationTests", "MeetingsSearch.IntegrationTests\MeetingsSearch.IntegrationTests.csproj", "{224CAF4C-10EB-4AF7-8949-F7EE475E3B43}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Kafka", "..\..\Core.Kafka\Core.Kafka.csproj", "{8E93A9DC-AD14-475F-8C08-9CEBE7322C5B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -54,14 +52,6 @@ Global {31ABC8F7-C632-4D32-9586-65F18EDA1916}.Debug|Any CPU.Build.0 = Debug|Any CPU {31ABC8F7-C632-4D32-9586-65F18EDA1916}.Release|Any CPU.ActiveCfg = Release|Any CPU {31ABC8F7-C632-4D32-9586-65F18EDA1916}.Release|Any CPU.Build.0 = Release|Any CPU - {1F206BA4-8E67-48B0-8E47-5246DA6EFB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F206BA4-8E67-48B0-8E47-5246DA6EFB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F206BA4-8E67-48B0-8E47-5246DA6EFB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F206BA4-8E67-48B0-8E47-5246DA6EFB7D}.Release|Any CPU.Build.0 = Release|Any CPU - {E936B698-88EF-42D4-A51B-F7FE3E36A1DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E936B698-88EF-42D4-A51B-F7FE3E36A1DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E936B698-88EF-42D4-A51B-F7FE3E36A1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E936B698-88EF-42D4-A51B-F7FE3E36A1DF}.Release|Any CPU.Build.0 = Release|Any CPU {4773E9E2-0F69-48DD-89A1-DFF525507FF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4773E9E2-0F69-48DD-89A1-DFF525507FF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {4773E9E2-0F69-48DD-89A1-DFF525507FF3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -90,6 +80,10 @@ Global {224CAF4C-10EB-4AF7-8949-F7EE475E3B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {224CAF4C-10EB-4AF7-8949-F7EE475E3B43}.Release|Any CPU.ActiveCfg = Release|Any CPU {224CAF4C-10EB-4AF7-8949-F7EE475E3B43}.Release|Any CPU.Build.0 = Release|Any CPU + {8E93A9DC-AD14-475F-8C08-9CEBE7322C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E93A9DC-AD14-475F-8C08-9CEBE7322C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E93A9DC-AD14-475F-8C08-9CEBE7322C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E93A9DC-AD14-475F-8C08-9CEBE7322C5B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Sample/Warehouse.MinimalAPI/Warehouse.sln b/Sample/Warehouse.MinimalAPI/Warehouse.sln index 8c4b3b3d9..10ce2ff55 100644 --- a/Sample/Warehouse.MinimalAPI/Warehouse.sln +++ b/Sample/Warehouse.MinimalAPI/Warehouse.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Warehouse.Api", "Warehouse. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.WebApi", "..\..\Core.WebApi\Core.WebApi.csproj", "{A7A09EBA-0B66-4402-A063-69B47D43A66D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Api.Testing", "..\..\Core.Api.Testing\Core.Api.Testing.csproj", "{49B8A573-5F71-4087-B30D-D72459ABA0E2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{A50C04D5-DDAD-4415-8C42-BAA28EEC360C}" ProjectSection(SolutionItems) = preProject README.md = README.md @@ -18,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CI", "CI", "{01E4F2B8-04B8- docker-compose.yml = docker-compose.yml EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{52685284-D4B2-47F6-9786-BCFEE4387C51}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,7 +25,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {A7A09EBA-0B66-4402-A063-69B47D43A66D} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} - {49B8A573-5F71-4087-B30D-D72459ABA0E2} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} + {52685284-D4B2-47F6-9786-BCFEE4387C51} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {46D1830E-55B1-4F36-959F-2ACF936BFC7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -36,9 +36,9 @@ Global {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Release|Any CPU.Build.0 = Release|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Release|Any CPU.Build.0 = Release|Any CPU + {52685284-D4B2-47F6-9786-BCFEE4387C51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52685284-D4B2-47F6-9786-BCFEE4387C51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52685284-D4B2-47F6-9786-BCFEE4387C51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52685284-D4B2-47F6-9786-BCFEE4387C51}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Sample/Warehouse/Warehouse.sln b/Sample/Warehouse/Warehouse.sln index 66cf6431b..281b29797 100644 --- a/Sample/Warehouse/Warehouse.sln +++ b/Sample/Warehouse/Warehouse.sln @@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Warehouse.Api.Tests", "Ware EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.WebApi", "..\..\Core.WebApi\Core.WebApi.csproj", "{A7A09EBA-0B66-4402-A063-69B47D43A66D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Api.Testing", "..\..\Core.Api.Testing\Core.Api.Testing.csproj", "{49B8A573-5F71-4087-B30D-D72459ABA0E2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Testing", "..\..\Core.Testing\Core.Testing.csproj", "{07D91C3E-2781-4ECA-A053-6A66DF712FC7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,7 +19,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {A7A09EBA-0B66-4402-A063-69B47D43A66D} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} - {49B8A573-5F71-4087-B30D-D72459ABA0E2} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} + {07D91C3E-2781-4ECA-A053-6A66DF712FC7} = {F6A27B3D-4018-4E66-A008-3E1280C8C685} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {00DCEE41-018D-4CCA-99F3-00876BEB7E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -38,9 +38,9 @@ Global {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7A09EBA-0B66-4402-A063-69B47D43A66D}.Release|Any CPU.Build.0 = Release|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B8A573-5F71-4087-B30D-D72459ABA0E2}.Release|Any CPU.Build.0 = Release|Any CPU + {07D91C3E-2781-4ECA-A053-6A66DF712FC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07D91C3E-2781-4ECA-A053-6A66DF712FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07D91C3E-2781-4ECA-A053-6A66DF712FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07D91C3E-2781-4ECA-A053-6A66DF712FC7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal