Skip to content

Commit

Permalink
chore: upgrade deps, fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
yreynhout committed Oct 20, 2023
1 parent a341ef1 commit d5619db
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
<PackageReference Include="Google.Protobuf" Version="3.23.4" />
<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
<PackageReference Include="Grpc.Tools" Version="2.56.2">
<PackageReference Include="Google.Protobuf" Version="3.24.4" />
<PackageReference Include="Grpc.Net.Client" Version="2.58.0" />
<PackageReference Include="Grpc.Tools" Version="2.59.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="OpenTelemetry" Version="1.4.0-rc.2" />
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-rc.2" />
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
<PackageReference Include="PooledAwait" Version="1.0.49" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
<PackageReference Include="shortid" Version="4.0.0" />
<PackageReference Include="ToxiproxyNetCore" Version="1.0.35" />
<PackageReference Include="YamlDotNet" Version="13.1.1" />
<PackageReference Include="YamlDotNet" Version="13.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Benchmarks/Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.4.0-rc.2" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.0.0-rc9.14" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
<PackageReference Include="AutoFixture" Version="4.18.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
<PackageReference Include="Xunit" Version="2.5.0" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.0">
<PackageReference Include="Xunit" Version="2.5.3" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.0">
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NodaTime" Version="3.1.9" />
<PackageReference Include="NodaTime.Testing" Version="3.1.9" />
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
<PackageReference Include="shortid" Version="4.0.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="Verify.Xunit" Version="20.6.0" />
<PackageReference Include="Xunit" Version="2.5.0" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.0">
<PackageReference Include="Verify.Xunit" Version="22.1.4" />
<PackageReference Include="Xunit" Version="2.5.3" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.0">
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="Xunit" Version="2.5.0" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.0">
<PackageReference Include="Xunit" Version="2.5.3" />
<PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.0">
<PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public async Task ConnectContextReturnsExpectedResult()
var context = _fixture.Create<Context>();
var sut = CreateSystemUnderTest();

var result = await sut.ConnectAsync(context).ConfigureAwait(false);
var result = await sut.ConnectAsync(context);

Assert.NotNull(result);
}
Expand All @@ -52,12 +52,12 @@ public async Task SuccessiveConnectToSameContextReturnsSameInstance()
var context = _fixture.Create<Context>();
var sut = CreateSystemUnderTest();

var first = await sut.ConnectAsync(context).ConfigureAwait(false);
var second = await sut.ConnectAsync(context).ConfigureAwait(false);
var first = await sut.ConnectAsync(context);
var second = await sut.ConnectAsync(context);

Assert.Same(first, second);

await first.DisposeAsync().ConfigureAwait(false);
await first.DisposeAsync();
}

[Fact]
Expand All @@ -66,25 +66,25 @@ public async Task SuccessiveConnectToSameButDisposedContextReturnsNewInstance()
var context = _fixture.Create<Context>();
var sut = CreateSystemUnderTest();

var first = await sut.ConnectAsync(context).ConfigureAwait(false);
await first.DisposeAsync().ConfigureAwait(false);
var first = await sut.ConnectAsync(context);
await first.DisposeAsync();

var second = await sut.ConnectAsync(context).ConfigureAwait(false);
var second = await sut.ConnectAsync(context);

Assert.NotSame(first, second);

await second.DisposeAsync().ConfigureAwait(false);
await second.DisposeAsync();
}

[Fact]
public async Task DisposingHasExpectedResult()
{
var sut = CreateSystemUnderTest();

var first = await sut.ConnectAsync(Context.Default).ConfigureAwait(false);
var second = await sut.ConnectAsync(Context.Admin).ConfigureAwait(false);
var first = await sut.ConnectAsync(Context.Default);
var second = await sut.ConnectAsync(Context.Admin);

await sut.DisposeAsync().ConfigureAwait(false);
await sut.DisposeAsync();

Assert.Throws<ObjectDisposedException>(() => first.ControlChannel);
Assert.Throws<ObjectDisposedException>(() => second.ControlChannel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private async Task<IAxonServerConnection> CreateDisposedSystemUnderTest(
Action<IAxonServerConnectorOptionsBuilder>? configure = default)
{
var sut = await CreateSystemUnderTest(configure);
await sut.DisposeAsync().ConfigureAwait(false);
await sut.DisposeAsync();
return sut;
}

Expand All @@ -59,9 +59,9 @@ public async Task WhenDisposingWaitUntilConnectedAsyncReturnsExpectedResult()
var sut = await CreateSystemUnderTest(
options => options.WithRoutingServers(
new DnsEndPoint("127.0.0.0", AxonServerConnectorDefaults.Port)));
var wait = sut.WaitUntilConnectedAsync().ConfigureAwait(false);
await sut.DisposeAsync().ConfigureAwait(false);
await Assert.ThrowsAsync<TaskCanceledException>(async () => await wait).ConfigureAwait(false);
var wait = sut.WaitUntilConnectedAsync();
await sut.DisposeAsync();
await Assert.ThrowsAsync<TaskCanceledException>(async () => await wait);
}

[Fact]
Expand All @@ -70,9 +70,9 @@ public async Task WhenDisposingWaitUntilReadyAsyncReturnsExpectedResult()
var sut = await CreateSystemUnderTest(
options => options.WithRoutingServers(
new DnsEndPoint("127.0.0.0", AxonServerConnectorDefaults.Port)));
var wait = sut.WaitUntilReadyAsync().ConfigureAwait(false);
await sut.DisposeAsync().ConfigureAwait(false);
await Assert.ThrowsAsync<TaskCanceledException>(async () => await wait).ConfigureAwait(false);
var wait = sut.WaitUntilReadyAsync();
await sut.DisposeAsync();
await Assert.ThrowsAsync<TaskCanceledException>(async () => await wait);
}

[Fact]
Expand Down Expand Up @@ -100,21 +100,21 @@ public async Task WhenDisposedIsReadyReturnsExpectedResult()
public async Task WhenDisposedWaitUntilConnectedAsyncReturnsExpectedResult()
{
await using var sut = await CreateDisposedSystemUnderTest();
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await sut.WaitUntilConnectedAsync().ConfigureAwait(false)).ConfigureAwait(false);
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await sut.WaitUntilConnectedAsync());
}

[Fact]
public async Task WhenDisposedWaitUntilReadyAsyncReturnsExpectedResult()
{
await using var sut = await CreateDisposedSystemUnderTest();
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await sut.WaitUntilReadyAsync().ConfigureAwait(false)).ConfigureAwait(false);
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await sut.WaitUntilReadyAsync());
}

[Fact]
public async Task WhenDisposedCloseAsyncReturnsExpectedResult()
{
await using var sut = await CreateDisposedSystemUnderTest();
await sut.CloseAsync().ConfigureAwait(false);
await sut.CloseAsync();
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public async Task RecoverFromConnectionLoss()
AxonServerConnectorDefaults.DefaultReconnectOptions.ConnectionTimeout,
TimeSpan.FromMilliseconds(100),
false)))
.ConfigureAwait(false);
;
await connection.WaitUntilReadyAsync();

var responseId = InstructionId.New().ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public async Task RegisterEventProcessorCausesInitialInfoPollToHappen()
await registration.WaitUntilCompletedAsync();

//Allow the poll to happen
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand All @@ -124,7 +124,7 @@ public async Task RegisterEventProcessorCausesPeriodicInfoPollToHappen()
await sut.WaitUntilReadyAsync();

var control = sut.ControlChannel;
//var admin = sut.AdminChannel;

var name = _fixture.Create<EventProcessorName>();
var callCount = 0;
var completion = new TaskCompletionSource();
Expand All @@ -151,7 +151,7 @@ public async Task RegisterEventProcessorCausesPeriodicInfoPollToHappen()
await registration.WaitUntilCompletedAsync();

//Allow the poll to happen
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -193,7 +193,7 @@ public async Task RegisterEventProcessorWithBadSupplierThatThrowsHasExpectedResu
await registration.WaitUntilCompletedAsync();

//Allow the poll to happen
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -236,7 +236,7 @@ public async Task RegisterEventProcessorWithBadSupplierThatNeverReturnsHasExpect
await registration.WaitUntilCompletedAsync();

//Allow the poll to happen
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await completion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -270,7 +270,7 @@ public async Task EventProcessorHandlesStartRequestFromAdminChannel()
var result = await admin.StartEventProcessorAsync(name, TokenStoreIdentifier.Empty);
Assert.Equal( Result.Success, result);

await processor.StartCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await processor.StartCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -305,7 +305,7 @@ public async Task EventProcessorHandlesPauseRequestFromAdminChannel()
var result = await admin.PauseEventProcessorAsync(name, TokenStoreIdentifier.Empty);
Assert.Equal( Result.Success, result);

await processor.PauseCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await processor.PauseCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -381,7 +381,7 @@ public async Task EventProcessorHandlesMoveSegmentRequestFromAdminChannel()
var result = await admin.MoveEventProcessorSegmentAsync(name, id, new SegmentId(0), toClient.ClientIdentity.ClientInstanceId);
Assert.Equal( Result.Success, result);

await processor1.ReleaseSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await processor1.ReleaseSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -436,7 +436,7 @@ public async Task EventProcessorHandlesSplitSegmentRequestFromAdminChannel()
var result = await admin.SplitEventProcessorAsync(name, id);
Assert.Equal( Result.Success, result);

await processor.SplitSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await processor.SplitSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

[Fact]
Expand Down Expand Up @@ -491,7 +491,7 @@ public async Task EventProcessorHandlesMergeSegmentRequestFromAdminChannel()
var result = await admin.MergeEventProcessorAsync(name, id);
Assert.Equal( Result.Success, result);

await processor.MergeSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
await processor.MergeSegmentCompletion.Task.WaitAsync(TimeSpan.FromSeconds(10));
}

private class EmptyEventProcessor : IEventProcessorInstructionHandler
Expand Down

0 comments on commit d5619db

Please sign in to comment.