Skip to content

Commit

Permalink
Bump Akka from 1.4.33 to 1.5.24 (#476)
Browse files Browse the repository at this point in the history
* Bump Akka from 1.4.33 to 1.5.24

Bumps [Akka](https://github.com/akkadotnet/akka.net) from 1.4.33 to 1.5.24.
- [Release notes](https://github.com/akkadotnet/akka.net/releases)
- [Changelog](https://github.com/akkadotnet/akka.net/blob/dev/RELEASE_NOTES.md)
- [Commits](akkadotnet/akka.net@1.4.33...1.5.24)

---
updated-dependencies:
- dependency-name: Akka
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* exclude Rider output from .gitignore settings

* fixed Akka.NET V1.5 upgrade errors

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Stannard <aaron@petabridge.com>
  • Loading branch information
dependabot[bot] and Aaronontheweb authored Jun 11, 2024
1 parent 131a74f commit 71504e3
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ api/
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Rider output
.idea/

# Build results
[Dd]ebug/
[Dd]ebugPublic/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ public BenchmarkActorBasePatternMatchActor(Counter counter, long maxExpectedMess

protected override bool Receive(object message)
{
return message.Match()
.With<string>(IncrementAndCheck)
.With<int>(IncrementAndCheck)
.With<SimpleData>(simpleDataMessage =>
{
if (simpleDataMessage.Age > 20)
{
IncrementAndCheck();
}
else
{
IncrementAndCheck();
}
})
.Default(o => IncrementAndCheck())
.WasHandled;
switch (message)
{
case string str:
IncrementAndCheck();
break;
case int i:
IncrementAndCheck();
break;
case SimpleData simpleDataMessage:
IncrementAndCheck();
break;
default: IncrementAndCheck();
break;
}

return true;
}

private void IncrementAndCheck()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Akka" Version="1.4.33" />
<PackageReference Include="Akka" Version="1.5.24" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/NBench.Tests/Collection/Timing/TimingCollectorSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public class TimingCollectorSpec
[InlineData(100L, 150L)]
// [InlineData(100L, 120L)] skipped because flakiness (result was ~120+)
[InlineData(200L, 300L)] // increased from 250 to 300 because flakiness (result was ~250+)
public void TimingCollector_should_report_time_deltas_accurately(long waitTime, long maxAllowedTime)
public async Task TimingCollector_should_report_time_deltas_accurately(long waitTime, long maxAllowedTime)
{
var timingCollector = new TimingCollector();
var delay = TimeSpan.FromMilliseconds(waitTime);
var initial = timingCollector.Collect();
Task.Delay(delay).Wait(delay);
await Task.Delay(delay);
var next = timingCollector.Collect();
var delta = next - initial;
Assert.True(delta < maxAllowedTime, $"Expected a time between {waitTime} ms and {maxAllowedTime} ms - got {delta} ms instead.");
Expand Down

0 comments on commit 71504e3

Please sign in to comment.