Skip to content

Commit

Permalink
Merge master into binary_payloads
Browse files Browse the repository at this point in the history
  • Loading branch information
iancooper committed Nov 3, 2023
2 parents 4c22695 + 81bdddf commit 0331e92
Show file tree
Hide file tree
Showing 152 changed files with 1,234 additions and 703 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "7.0.8",
"version": "7.0.13",
"commands": [
"dotnet-ef"
]
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
dotnet-version: |
6.0.x
- run: dotnet --info
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/cache@v3
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
needs: [build]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
- name: docker check
run: docker ps -a
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand All @@ -291,7 +291,7 @@ jobs:
ACCEPT_EULA: Y
SA_PASSWORD: Password123!
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand All @@ -318,7 +318,7 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
- 8000:8000

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand All @@ -370,7 +370,7 @@ jobs:
AWS_DEFAULT_OUTPUT: json

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand All @@ -379,7 +379,7 @@ jobs:
- name: Install dependencies
run: dotnet restore
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v3
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -396,7 +396,7 @@ jobs:
needs: [ build ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand All @@ -412,7 +412,7 @@ jobs:
timeout-minutes: 5
needs: [build]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet 6
uses: actions/setup-dotnet@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup dotnet 6.0.x
uses: actions/setup-dotnet@v3
Expand Down
8 changes: 4 additions & 4 deletions samples/ASBTaskQueue/Greetings/Greetings.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.9.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.8" />
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions samples/KafkaSchemaRegistry/Greetings/Greetings.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="Confluent.SchemaRegistry" Version="2.1.1" />
<PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.1.1" />
<PackageReference Include="Confluent.SchemaRegistry" Version="2.2.0" />
<PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="2.2.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Confluent.SchemaRegistry" Version="2.1.1" />
<PackageReference Include="Confluent.SchemaRegistry" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion samples/OpenTelemetry/Producer/Producer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.5.1" />
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions samples/OpenTelemetry/Sweeper/Sweeper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.5.1" />
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.6.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/RMQTaskQueue/Greetings/Greetings.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ProjectReference Include="..\..\..\src\Paramore.Brighter\Paramore.Brighter.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.124" />
<PackageReference Include="MessagePack" Version="2.5.129" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
Expand Down
13 changes: 8 additions & 5 deletions samples/WebAPI_Dapper/GreetingsPorts/GreetingsPorts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Paramore.Brighter\Paramore.Brighter.csproj" />
<ProjectReference Include="..\GreetingsEntities\GreetingsEntities.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Paramore.Brighter.Dapper\Paramore.Brighter.Dapper.csproj" />
<ProjectReference Include="..\..\..\src\Paramore.Brighter.Sqlite.Dapper\Paramore.Brighter.Sqlite.Dapper.csproj" />
<ProjectReference Include="..\..\..\src\Paramore.Brighter\Paramore.Brighter.csproj" />
<ProjectReference Include="..\GreetingsEntities\GreetingsEntities.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.143" />
<PackageReference Include="Dapper" Version="2.1.15" />
<PackageReference Include="DapperExtensions" Version="1.7.0" />
<PackageReference Include="Paramore.Darker" Version="3.0.0" />
<PackageReference Include="Paramore.Darker.Policies" Version="3.0.0" />
<PackageReference Include="Paramore.Darker.QueryLogging" Version="3.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.8" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.13" />
<PackageReference Include="FluentMigrator" Version="3.3.2" />
<PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
</ItemGroup>
Expand Down
12 changes: 7 additions & 5 deletions samples/WebAPI_Dapper/SalutationPorts/SalutationPorts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Paramore.Brighter\Paramore.Brighter.csproj" />
<ProjectReference Include="..\SalutationEntities\SalutationEntities.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Paramore.Brighter.Dapper\Paramore.Brighter.Dapper.csproj" />
<ProjectReference Include="..\..\..\src\Paramore.Brighter\Paramore.Brighter.csproj" />
<ProjectReference Include="..\SalutationEntities\SalutationEntities.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.143" />
<PackageReference Include="Dapper" Version="2.1.15" />
<PackageReference Include="DapperExtensions" Version="1.7.0" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.105.5" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.203.11" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions samples/WebAPI_Dynamo/SalutationAnalytics/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static void ConfigureBrighter(
options.CommandProcessorLifetime = ServiceLifetime.Scoped;
options.PolicyRegistry = new SalutationPolicy();
options.InboxConfiguration = new InboxConfiguration(
ConfigureInbox(dynamoDb),
ConfigureInbox(awsCredentials, dynamoDb),
scope: InboxScope.Commands,
onceOnly: true,
actionOnExists: OnceOnlyAction.Throw
Expand Down Expand Up @@ -239,9 +239,9 @@ private static void CreateInbox(IAmazonDynamoDB client, IServiceCollection servi
}
}

private static IAmAnInbox ConfigureInbox(IAmazonDynamoDB dynamoDb)
private static IAmAnInbox ConfigureInbox(AWSCredentials credentials, IAmazonDynamoDB dynamoDb)
{
return new DynamoDbInbox(dynamoDb);
return new DynamoDbInbox(dynamoDb, new DynamoDbInboxConfiguration(credentials, RegionEndpoint.EUWest1));
}

private static IAmAnOutbox ConfigureOutbox(AWSCredentials credentials, IAmazonDynamoDB dynamoDb)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.105.5" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.203.11" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/WebAPI_EFCore/GreetingsPorts/GreetingsPorts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
<PackageReference Include="Paramore.Darker.Policies" Version="3.0.0" />
<PackageReference Include="Paramore.Darker.QueryLogging" Version="3.0.0" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion samples/WebAPI_EFCore/GreetingsWeb/GreetingsWeb.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.7" />
<PackageReference Include="Paramore.Darker.AspNetCore" Version="3.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.5.1" />
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 0331e92

Please sign in to comment.