Skip to content

Commit

Permalink
Updated Marten to 4.0.0-rc.2 (together with other dependencies)
Browse files Browse the repository at this point in the history
  • Loading branch information
oskardudycz committed Jun 14, 2021
1 parent 4bee1e0 commit 73475fc
Show file tree
Hide file tree
Showing 79 changed files with 168 additions and 165 deletions.
4 changes: 2 additions & 2 deletions CQRS.Tests/CQRS.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion Core.Marten/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private static void SetStoreOptions(StoreOptions options, Config config,

options.UseDefaultSerialization(nonPublicMembersStorage: NonPublicMembersStorage.NonPublicSetters,
enumStorage: EnumStorage.AsString);
options.Events.Daemon.Mode = config.DaemonMode;
options.Projections.AsyncMode = config.DaemonMode;

configureOptions?.Invoke(options);
}
Expand Down
4 changes: 2 additions & 2 deletions Core.Marten/Core.Marten.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="3.1.0" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Ardalis.GuardClauses" Version="3.2.0" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Core.Streaming.Kafka/Core.Streaming.Kafka.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="1.6.3" />
<PackageReference Include="Confluent.Kafka" Version="1.7.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
4 changes: 2 additions & 2 deletions Core.Testing/Core.Testing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Core.Tests/Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion Core.WebApi/Core.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? storeOpt
return base.CreateSession(options =>
{
//It's needed to manually set that inline aggregation should be applied
options.Events.Projections.SelfAggregate<IssuesList>();
options.Projections.SelfAggregate<IssuesList>();
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? setStore
options.Events.DatabaseSchemaName = SchemaName;
//It's needed to manually set that inline aggregation should be applied
options.Events.Projections.SelfAggregate<IssuesList>();
options.Projections.SelfAggregate<IssuesList>();
});

return store.OpenSession();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public Reaggregation() : base(false)
{
options.Events.AddEventTypes(new[] { typeof(IssueCreated), typeof(IssueUpdated) });
//It's needed to manualy set that inline aggegation should be applied
options.Events.Projections.SelfAggregate<TIssue>();
options.Projections.SelfAggregate<TIssue>();
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? setStore
options.Events.DatabaseSchemaName = SchemaName;
//It's needed to manually set that inline aggregation should be applied
options.Events.Projections.SelfAggregate<IssuesList>();
options.Events.Projections.Add(new IssueDescriptionsProjection());
options.Projections.SelfAggregate<IssuesList>();
options.Projections.Add(new IssueDescriptionsProjection());
});

return store.OpenSession();
Expand Down
4 changes: 2 additions & 2 deletions Marten.Integration.Tests/Marten.Integration.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
4 changes: 2 additions & 2 deletions MediatR.Tests/MediatR.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="SharpTestsEx" Version="2.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Sample/AsyncProjections/SmartHome.Api/SmartHome.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private static void AddQueryHandlers(IServiceCollection services)
internal static void ConfigureMotionSensors(this StoreOptions options)
{
// Snapshots
options.Events.Projections.SelfAggregate<MotionSensor>();
options.Projections.SelfAggregate<MotionSensor>();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="3.1.0" />
<PackageReference Include="Ardalis.GuardClauses" Version="3.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private static void AddQueryHandlers(IServiceCollection services)
internal static void ConfigureTemperatureMeasurements(this StoreOptions options)
{
// Snapshots
options.Events.Projections.SelfAggregate<TemperatureMeasurement>(ProjectionLifecycle.Async);
options.Projections.SelfAggregate<TemperatureMeasurement>(ProjectionLifecycle.Async);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Marten" Version="4.0.0-alpha.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
<PackageReference Include="Marten" Version="4.0.0-rc.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -32,12 +32,12 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.7" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ private void ConfigureMarten(IServiceCollection services)
options.Events.DatabaseSchemaName = schemaName;
options.DatabaseSchemaName = schemaName;
options.Events.Projections.SelfAggregate<Account>();
options.Events.Projections.Add<AllAccountsSummaryViewProjection>();
options.Events.Projections.Add<AccountSummaryViewProjection>();
options.Events.Projections.Add<ClientsViewProjection>();
options.Projections.SelfAggregate<Account>();
options.Projections.Add<AllAccountsSummaryViewProjection>();
options.Projections.Add<AccountSummaryViewProjection>();
options.Projections.Add<ClientsViewProjection>();
options.Events.AddEventType(typeof(NewAccountCreated));
options.Events.AddEventType(typeof(NewInflowRecorded));
Expand Down
4 changes: 2 additions & 2 deletions Sample/ECommerce/Carts/Carts.Api.Tests/Carts.Api.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
8 changes: 4 additions & 4 deletions Sample/ECommerce/Carts/Carts.Api/Carts.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Sample/ECommerce/Carts/Carts.Tests/Carts.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.7" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion Sample/ECommerce/Carts/Carts/Carts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="3.1.0" />
<PackageReference Include="Ardalis.GuardClauses" Version="3.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions Sample/ECommerce/Carts/Carts/Carts/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ private static void AddEventHandlers(IServiceCollection services)
internal static void ConfigureCarts(this StoreOptions options)
{
// Snapshots
options.Events.Projections.SelfAggregate<Cart>();
options.Projections.SelfAggregate<Cart>();
// // projections
options.Events.Projections.Add<CartShortInfoProjection>();
options.Events.Projections.Add<CartDetailsProjection>();
options.Projections.Add<CartShortInfoProjection>();
options.Projections.Add<CartDetailsProjection>();
//
// // transformation
options.Events.Projections.Add<CartHistoryTransformation>();
options.Projections.Add<CartHistoryTransformation>();
}
}
}
Loading

0 comments on commit 73475fc

Please sign in to comment.