Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Core.EventStoreDB.Subscriptions.Batch;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Polly;

namespace Core.EntityFramework.Projections;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Core.Events;
using Core.EventStoreDB.Subscriptions;
using Core.EventStoreDB.Subscriptions.Batch;
using Core.EventStoreDB.Subscriptions.Checkpoints;
using Core.EventStoreDB.Subscriptions.Checkpoints.Postgres;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Core.EventStoreDB;
using Core.EventStoreDB.Commands;
using Core.EventStoreDB.Events;
using Core.EventStoreDB.Subscriptions;
using Core.OpenTelemetry;
using Core.Testing;
using EventStore.Client;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Core.EventStoreDB.Subscriptions.Checkpoints;
using Core.EventStoreDB.Subscriptions.Checkpoints.Postgres;
using Core.Testing.Fixtures;
using Npgsql;
using Xunit;

namespace Core.EventStoreDB.Tests.Subscriptions.Checkpoints;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Core.Events;
using Core.EventStoreDB.Subscriptions.Checkpoints;
using EventStore.Client;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using Core.BackgroundWorkers;
using Core.OpenTelemetry;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Npgsql;

namespace Core.EventStoreDB.Subscriptions.Checkpoints.Postgres;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Data;
using Npgsql;
using Polly;

namespace Core.EventStoreDB.Subscriptions.Checkpoints.Postgres;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Core.EventStoreDB.Subscriptions.Checkpoints;
using EventStore.Client;
using Microsoft.Extensions.DependencyInjection;
using Polly;

Expand Down
2 changes: 1 addition & 1 deletion Core.Testing/Fixtures/PostgresContainerFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Core.Testing.Fixtures;

public class PostgresContainerFixture: IAsyncLifetime
{
private readonly PostgreSqlContainer container = new PostgreSqlBuilder()
private readonly PostgreSqlContainer container = new PostgreSqlBuilder("postgres:18")
.WithReuse(true)
.Build();

Expand Down
1 change: 0 additions & 1 deletion Core.Testing/TestWebApplicationFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Core.Requests;
using FluentAssertions;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Open.ChannelExtensions;
Expand Down
4 changes: 2 additions & 2 deletions Core.WebApi/Swagger/MetadataOperationFilter.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Swashbuckle.AspNetCore.SwaggerGen;

namespace Core.WebApi.Swagger;
Expand All @@ -12,7 +12,7 @@ public class MetadataOperationFilter: IOperationFilter

public void Apply(OpenApiOperation operation, OperationFilterContext context)
{
operation.Parameters ??= new List<OpenApiParameter>();
operation.Parameters ??= new List<IOpenApiParameter>();

if (context.ApiDescription.HttpMethod != null && StateChangeMethods.Contains(context.ApiDescription.HttpMethod))
{
Expand Down
4 changes: 0 additions & 4 deletions Core/Events/EventBusBatchHandler.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
using System.Diagnostics;
using Core.OpenTelemetry;
using Microsoft.Extensions.Logging;

namespace Core.Events;

public class EventBusBatchHandler(
Expand Down
1 change: 0 additions & 1 deletion Core/Extensions/AsyncEnumerableExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Threading.Channels;
using Open.ChannelExtensions;

namespace Core.Extensions;
Expand Down
1 change: 0 additions & 1 deletion Core/Extensions/DIExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Collections.ObjectModel;
using Microsoft.Extensions.DependencyInjection;

namespace Core.Extensions;

Expand Down
84 changes: 41 additions & 43 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,30 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Alba" Version="8.1.1" />
<PackageVersion Include="Alba" Version="8.4.0" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="13.1.1" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="13.1.1" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.1" />
<PackageVersion Include="Aspire.Npgsql" Version="13.1.1" />
<PackageVersion Include="AspNetCore.HealthChecks.Kafka" Version="9.0.0" />
<PackageVersion Include="AutoMapper" Version="14.0.0" />
<PackageVersion Include="Bogus" Version="35.6.2" />
<PackageVersion Include="Confluent.Kafka" Version="2.8.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="AutoMapper" Version="16.0.0" />
<PackageVersion Include="Bogus" Version="35.6.5" />
<PackageVersion Include="Confluent.Kafka" Version="2.13.1" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
<PackageVersion Include="Dapper" Version="2.1.66" />
<PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.3.0" />
<PackageVersion Include="EventStore.Client.Grpc.Streams" Version="23.3.9" />
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
<PackageVersion Include="JsonNet.PrivateSettersContractResolvers" Version="1.0.0" />
<PackageVersion Include="Marten" Version="8.22.0" />
<PackageVersion Include="Marten.AspNetCore" Version="8.22.0" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.13" />
<PackageVersion Include="MediatR" Version="14.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
Expand All @@ -46,44 +45,43 @@
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" />
<PackageVersion Include="MongoDB.Driver" Version="3.2.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Npgsql" Version="9.0.3" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
<PackageVersion Include="MongoDB.Driver" Version="3.6.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Npgsql" Version="10.0.1" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="10.0.1" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.3" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="10.0.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="Ogooreck" Version="0.8.2" />
<PackageVersion Include="Open.ChannelExtensions" Version="9.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.11.2" />
<PackageVersion Include="Open.ChannelExtensions" Version="9.1.3" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
<PackageVersion Include="Polly" Version="8.5.2" />
<PackageVersion Include="PublicApiGenerator" Version="11.4.2" />
<PackageVersion Include="Quartz" Version="3.13.1" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.13.1" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.13.1" />
<PackageVersion Include="Quartz.OpenTelemetry.Instrumentation" Version="3.13.1" />
<PackageVersion Include="Quartz.Serialization.Json" Version="3.13.1" />
<PackageVersion Include="Scrutor" Version="6.0.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="Polly" Version="8.6.5" />
<PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
<PackageVersion Include="Quartz" Version="3.15.1" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="Quartz.OpenTelemetry.Instrumentation" Version="3.15.1" />
<PackageVersion Include="Quartz.Serialization.Json" Version="3.15.1" />
<PackageVersion Include="Scrutor" Version="7.0.0" />
<PackageVersion Include="Simple.Migrations" Version="0.9.21" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.2.0" />
<PackageVersion Include="Verify.Xunit" Version="28.11.0" />
<PackageVersion Include="WolverineFx.Http" Version="5.16.1" />
<PackageVersion Include="WolverineFx.Marten" Version="5.16.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.4" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.4" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.10.0" />
<PackageVersion Include="Verify.Xunit" Version="31.12.5" />
<PackageVersion Include="WolverineFx.Http" Version="5.16.2" />
<PackageVersion Include="WolverineFx.Marten" Version="5.16.2" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>

<!-- F# / ECommerce.Equinox packages -->
<ItemGroup>
<PackageVersion Include="Argu" Version="6.2.5" />
Expand All @@ -110,4 +108,4 @@
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="unquote" Version="6.1.0" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion Marten.Integration.Tests/TestsInfrastructure/MartenTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Marten.Integration.Tests.TestsInfrastructure;

public class MartenFixture : IAsyncLifetime
{
public readonly PostgreSqlContainer PostgreSqlContainer = new PostgreSqlBuilder()
public readonly PostgreSqlContainer PostgreSqlContainer = new PostgreSqlBuilder("postgres:18")
.Build();

public Task InitializeAsync() => PostgreSqlContainer.StartAsync();
Expand Down
2 changes: 1 addition & 1 deletion Sample/AsyncProjections/SmartHome.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Core.WebApi.OptimisticConcurrency;
using Core.WebApi.Swagger;
using JasperFx;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using SmartHome.Temperature;

var builder = WebApplication.CreateBuilder(args);
Expand Down
2 changes: 1 addition & 1 deletion Sample/CRUDToCQRS/01-CRUD/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ECommerce.Repositories;
using ECommerce.Services;
using ECommerce.Storage;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

var builder = WebApplication.CreateBuilder(args);

Expand Down
5 changes: 3 additions & 2 deletions Sample/CRUDToCQRS/02-CRUDWithCQRS/ECommerce/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
using ECommerce.Services;
using ECommerce.Storage;
using Microsoft.EntityFrameworkCore;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

builder.Services
.AddDbContext<ECommerceDbContext>()
.AddAutoMapper(typeof(ProductProfile).Assembly)
.AddAutoMapper(cfg => { }, typeof(ProductProfile).Assembly)
.AddTransient(sp => sp.GetRequiredService<ECommerceDbContext>().Set<Product>())
.AddTransient(sp => sp.GetRequiredService<ECommerceDbContext>().Set<Product>().AsNoTracking())
.AddScoped<ProductReadOnlyRepository>()
Expand Down
3 changes: 2 additions & 1 deletion Sample/CRUDToCQRS/03-DomainGrouping/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

Expand Down
2 changes: 1 addition & 1 deletion Sample/CRUDToCQRS/04-SlimmedDomain/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 2 additions & 1 deletion Sample/CRUDToCQRS/05-ExplicitDomain/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 2 additions & 1 deletion Sample/CRUDToCQRS/06-SlicedDomain/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 2 additions & 1 deletion Sample/CRUDToCQRS/07-FlattenedLayers/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

Expand Down
2 changes: 1 addition & 1 deletion Sample/CRUDToCQRS/08-SlicedEndpoints/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 2 additions & 1 deletion Sample/CRUDToCQRS/09-MultipleModules/ECommerce/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ECommerce.Domain;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;


var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 1 addition & 2 deletions Sample/ECommerce/Carts/Carts.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
using Core.WebApi.OptimisticConcurrency;
using Core.WebApi.Swagger;
using JasperFx;
using Marten.Exceptions;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

var builder = WebApplication.CreateBuilder(args);

Expand Down
3 changes: 1 addition & 2 deletions Sample/ECommerce/Orders/Orders.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
using Core.WebApi.OptimisticConcurrency;
using Core.WebApi.Swagger;
using JasperFx;
using Marten.Exceptions;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Orders;

var builder = WebApplication.CreateBuilder(args);
Expand Down
1 change: 0 additions & 1 deletion Sample/ECommerce/Orders/Orders/Orders/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Core.Marten.Repository;
using JasperFx.Events.Projections;
using Marten;
using Marten.Events.Projections;
using Microsoft.Extensions.DependencyInjection;
using Orders.Orders.CancellingOrder;
using Orders.Orders.CompletingOrder;
Expand Down
3 changes: 1 addition & 2 deletions Sample/ECommerce/Payments/Payments.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
using Core.WebApi.Swagger;
using JasperFx;
using Marten.Events.Daemon;
using Marten.Exceptions;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Payments;

var builder = WebApplication.CreateBuilder(args);
Expand Down
2 changes: 1 addition & 1 deletion Sample/ECommerce/Shipments/Shipments.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Core.OpenTelemetry;
using Core.WebApi.Middlewares.ExceptionHandling;
using Core.WebApi.Swagger;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Npgsql;
using OpenTelemetry.Trace;
using Shipments;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Core.ElasticSearch;
using Core.EventStoreDB;
using Core.WebApi.Middlewares.ExceptionHandling;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

namespace MarketBasketAnalytics.Api
{
Expand Down
Loading
Loading