diff --git a/src/Akka.sln.DotSettings b/src/Akka.sln.DotSettings index 17e3ace15b0..1ed523b241c 100644 --- a/src/Akka.sln.DotSettings +++ b/src/Akka.sln.DotSettings @@ -8,12 +8,12 @@ False True True - //----------------------------------------------------------------------- -// <copyright file="${File.FileName}" company="Akka.NET Project"> -// Copyright (C) 2009-${CurrentDate.Year} Lightbend Inc. <http://www.lightbend.com> -// Copyright (C) 2013-${CurrentDate.Year} .NET Foundation <https://github.com/akkadotnet/akka.net> -// </copyright> -//----------------------------------------------------------------------- + ----------------------------------------------------------------------- + <copyright file="${File.FileName}" company="Akka.NET Project"> + Copyright (C) 2009-${CurrentDate.Year} Lightbend Inc. <http://www.lightbend.com> + Copyright (C) 2013-${CurrentDate.Year} .NET Foundation <https://github.com/akkadotnet/akka.net> + </copyright> +----------------------------------------------------------------------- FSM True True diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 91d5c62ecf8..7f267989967 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -37,7 +37,8 @@ 2.0.3 6.0.1 1.5.13 - 5.0.0 + [6.0.*,) + [6.0.*,) akka;actors;actor model;Akka;concurrency diff --git a/src/contrib/dependencyinjection/Akka.DependencyInjection.Tests/Akka.DependencyInjection.Tests.csproj b/src/contrib/dependencyinjection/Akka.DependencyInjection.Tests/Akka.DependencyInjection.Tests.csproj index ec0e8c3a461..28f5fa23120 100644 --- a/src/contrib/dependencyinjection/Akka.DependencyInjection.Tests/Akka.DependencyInjection.Tests.csproj +++ b/src/contrib/dependencyinjection/Akka.DependencyInjection.Tests/Akka.DependencyInjection.Tests.csproj @@ -12,8 +12,7 @@ - - + diff --git a/src/contrib/dependencyinjection/Akka.DependencyInjection/Akka.DependencyInjection.csproj b/src/contrib/dependencyinjection/Akka.DependencyInjection/Akka.DependencyInjection.csproj index 022a2d6ee53..3e23ba2afee 100644 --- a/src/contrib/dependencyinjection/Akka.DependencyInjection/Akka.DependencyInjection.csproj +++ b/src/contrib/dependencyinjection/Akka.DependencyInjection/Akka.DependencyInjection.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/core/Akka.Streams.TestKit.Tests/StreamTestKitSpec.cs b/src/core/Akka.Streams.TestKit.Tests/StreamTestKitSpec.cs index 17a995e71e0..a289c4d690e 100644 --- a/src/core/Akka.Streams.TestKit.Tests/StreamTestKitSpec.cs +++ b/src/core/Akka.Streams.TestKit.Tests/StreamTestKitSpec.cs @@ -57,7 +57,7 @@ await Source.From(Enumerable.Range(1, 3).Select(i => .ToStrictAsync(TimeSpan.FromMilliseconds(300)) .ToListAsync(); }) - .Should().ThrowAsync(); + .Should().ThrowAsync(); var error = err.Subject.First(); var aggregateException = error.InnerException; @@ -106,7 +106,7 @@ await Source.From(Enumerable.Range(1, 4)).RunWith(this.SinkProbe(), Materia .Request(4) .ExpectNextOrError(100, Ex()) .ExecuteAsync(); - }).Should().ThrowAsync().WithMessage("*OnNext(100)*"); + }).Should().ThrowAsync().WithMessage("*OnNext(100)*"); } [Fact] @@ -197,7 +197,7 @@ await Source.Single(1).RunWith(this.SinkProbe(), Materializer) .AsyncBuilder() .Request(1) .ExpectNextAsync(i => i == 2); - }).Should().ThrowAsync().WithMessage("Got a message of the expected type*"); + }).Should().ThrowAsync().WithMessage("Got a message of the expected type*"); } [Fact] @@ -231,7 +231,7 @@ await Source.Single(1).RunWith(this.SinkProbe(), Materializer) .Request(1) .MatchNext(i => i == 2) .ExecuteAsync(); - }).Should().ThrowAsync().WithMessage("Got a message of the expected type*"); + }).Should().ThrowAsync().WithMessage("Got a message of the expected type*"); } [Fact] diff --git a/src/core/Akka.Streams/Akka.Streams.csproj b/src/core/Akka.Streams/Akka.Streams.csproj index 3ce25a70b7b..2cbc1a29606 100644 --- a/src/core/Akka.Streams/Akka.Streams.csproj +++ b/src/core/Akka.Streams/Akka.Streams.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/core/Akka.TestKit.Tests/TestKitBaseTests/DilatedTests.cs b/src/core/Akka.TestKit.Tests/TestKitBaseTests/DilatedTests.cs index 5db4419d8ee..a748ae0cc3e 100644 --- a/src/core/Akka.TestKit.Tests/TestKitBaseTests/DilatedTests.cs +++ b/src/core/Akka.TestKit.Tests/TestKitBaseTests/DilatedTests.cs @@ -70,7 +70,7 @@ public async Task FishForMessageAsync_should_dilate_timeout() { var stopwatch = Stopwatch.StartNew(); await Awaiting(async () => await FishForMessageAsync(_=>false, TimeSpan.FromMilliseconds(Timeout))) - .Should().ThrowAsync(); + .Should().ThrowAsync(); stopwatch.Stop(); AssertDilated(stopwatch.ElapsedMilliseconds, $"Expected the timeout to be {ExpectedTimeout} but in fact it was {stopwatch.ElapsedMilliseconds}."); } diff --git a/src/core/Akka.TestKit/Akka.TestKit.csproj b/src/core/Akka.TestKit/Akka.TestKit.csproj index c6be7ca321e..1afc4261428 100644 --- a/src/core/Akka.TestKit/Akka.TestKit.csproj +++ b/src/core/Akka.TestKit/Akka.TestKit.csproj @@ -26,10 +26,10 @@ - + - + diff --git a/src/core/Akka.Tests/Akka.Tests.csproj b/src/core/Akka.Tests/Akka.Tests.csproj index 2941f3a10ef..bbb058ce659 100644 --- a/src/core/Akka.Tests/Akka.Tests.csproj +++ b/src/core/Akka.Tests/Akka.Tests.csproj @@ -4,7 +4,7 @@ Akka.Tests $(NetFrameworkTestVersion);$(NetTestVersion) - $(NetTestVersion) + $(NetTestVersion) diff --git a/src/core/Akka/Akka.csproj b/src/core/Akka/Akka.csproj index 3aea8c1b1e1..5c1e6b10ef1 100644 --- a/src/core/Akka/Akka.csproj +++ b/src/core/Akka/Akka.csproj @@ -14,14 +14,12 @@ - + - + - - $(ConfigurationManagerVersion) - + diff --git a/src/examples/HeadlessService/AkkaHeadlesssService/AkkaHeadlesssService.csproj b/src/examples/HeadlessService/AkkaHeadlesssService/AkkaHeadlesssService.csproj index 5cb18860bb4..c80d91cf95f 100644 --- a/src/examples/HeadlessService/AkkaHeadlesssService/AkkaHeadlesssService.csproj +++ b/src/examples/HeadlessService/AkkaHeadlesssService/AkkaHeadlesssService.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/examples/WindowsService/AkkaWindowsService/AkkaWindowsService.csproj b/src/examples/WindowsService/AkkaWindowsService/AkkaWindowsService.csproj index b2ce8912c4f..6d28d030fe7 100644 --- a/src/examples/WindowsService/AkkaWindowsService/AkkaWindowsService.csproj +++ b/src/examples/WindowsService/AkkaWindowsService/AkkaWindowsService.csproj @@ -8,8 +8,8 @@ - - + +