Skip to content

Commit 8294e54

Browse files
authored
Bump NuGet dependencies to match Akka.NET 1.5 (#163)
* Bump NuGet dependencies to match Akka.NET 1.5 * Bump Akka.NET to 1.5.0-beta1 * Bump XUnit to 2.4.2 * Bump TestSdk to 17.4.1 * Bump FSCheck to 2.16.5 * Fix MessageString regex * Remove old NuGet.Config
1 parent 4117353 commit 8294e54

File tree

5 files changed

+18
-31
lines changed

5 files changed

+18
-31
lines changed

NuGet.Config

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1111
<PackageReference Include="xunit" Version="$(XunitVersion)" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
1313
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
1414
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
1515
</ItemGroup>

src/Akka.MultiNode.TestAdapter.Tests/Internal/ParsingSpec.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public void MessageSink_should_parse_Runner_log_message_correctly()
6161
{
6262
var loggingActor = Sys.ActorOf<LoggingActor>();
6363
Sys.EventStream.Subscribe(TestActor, typeof(Debug));
64-
loggingActor.Tell("LOG ME... but like the test runner this time!");
64+
var message = "LOG ME... but like the test runner this time!";
65+
loggingActor.Tell(message);
6566

6667
//capture the logged message
6768
var foundMessage = ExpectMsg<Debug>();
@@ -73,6 +74,7 @@ public void MessageSink_should_parse_Runner_log_message_correctly()
7374

7475
Assert.Equal(foundMessage.LogLevel(), runnerMessage.Level);
7576
Assert.Equal(foundMessage.LogSource, runnerMessage.LogSource);
77+
Assert.Equal(foundMessage.Message.ToString(), $"Received message {message}");
7678
}
7779

7880
[Fact]

src/Akka.MultiNode.TestAdapter/Internal/Sinks/MessageSink.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ public enum MultiNodeTestRunnerMessageType
101101
/*
102102
* Regular expressions - go big or go home. [Aaronontheweb]
103103
*/
104-
private const string RunnerLogMessageRegexString = @"\[(?<level>(\w)*)\]\[(?<time>\d{1,4}[- /.]\d{1,4}[- /.]\d{1,4}\s\d{1,2}:\d{1,2}:\d{1,2}(\s(AM|PM)){0,1})\](?<thread>\[(\w|\s)*\])\[(?<logsource>(\[|\w|:|/|\(|\)|\]|\.|-|\$|%|\+|#|\^|@)*)\]\s(?<message>(\w|\s|:|<|\.|\+|>|,|\[|/|-|]|%|\$|\+|\^|@)*)";
105-
protected static readonly Regex RunnerLogMessageRegex = new Regex(RunnerLogMessageRegexString);
104+
private const string RunnerLogMessageRegexString = @"\[(?<level>[\w]*)\]\[(?<date>[\d\/ :.Z+-]*)\]\[(?<thread>[\w|\s]*)\]\[(?<logsource>[\[\w:\/\(\)\]\.\$%\+#\^@)-]*)\]\s(?<message>.*)";
105+
protected static readonly Regex RunnerLogMessageRegex = new Regex(RunnerLogMessageRegexString, RegexOptions.Compiled);
106106

107-
private const string NodeLogFragmentRegexString = @"\[(\w){4}(?<node>[0-9]{1,2})(?<role>:\w+)?\](?<message>(.)*)";
107+
private const string NodeLogFragmentRegexString = @"\[\w{4}(?<node>[0-9]{1,4})[:]?(?<role>:\w+)?\](?<message>.*)";
108108
protected static readonly Regex NodeLogFragmentRegex = new Regex(NodeLogFragmentRegexString);
109109

110110
public static MultiNodeTestRunnerMessageType DetermineMessageType(string messageStr)
@@ -139,7 +139,7 @@ public static bool TryParseLogMessage(string messageStr, out LogMessageFragmentF
139139
var message = matchLog.Groups["message"].Value;
140140
var nodeIndex = Int32.Parse(matchLog.Groups["node"].Value);
141141
var nodeRoleGroup = matchLog.Groups["role"];
142-
var nodeRole = nodeRoleGroup.Success ? nodeRoleGroup.Value.Substring(1) : String.Empty;
142+
var nodeRole = nodeRoleGroup.Success ? nodeRoleGroup.Value : string.Empty;
143143
logMessage = new LogMessageFragmentForNode(nodeIndex, nodeRole, message, DateTime.UtcNow);
144144

145145
return true;

src/common.props

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
<Project>
22
<PropertyGroup>
3-
<Copyright>Copyright © 2013-2019 Akka.NET Team</Copyright>
3+
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
44
<Authors>Akka.NET Team</Authors>
55
<VersionPrefix>1.0.0</VersionPrefix>
6-
<PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
6+
<PackageIconUrl>https://getakka.net/images/akkalogo.png</PackageIconUrl>
77
<PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
88
<PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
99
<NoWarn>$(NoWarn);CS1591;xUnit1013</NoWarn>
1010
</PropertyGroup>
1111
<PropertyGroup>
12-
<XunitVersion>2.4.1</XunitVersion>
13-
<TestSdkVersion>17.1.0</TestSdkVersion>
14-
<HyperionVersion>0.9.12</HyperionVersion>
12+
<XunitVersion>2.4.2</XunitVersion>
13+
<XunitRunnerVersion>2.4.2</XunitRunnerVersion>
14+
<TestSdkVersion>17.4.1</TestSdkVersion>
1515
<CodeDomVersion>6.0.0</CodeDomVersion>
1616
<TeamCityVersion>3.0.13</TeamCityVersion>
1717
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
1818
<DependencyModelVersion>5.0.0</DependencyModelVersion>
19-
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
20-
<NBenchVersion>1.2.2</NBenchVersion>
21-
<ProtobufVersion>3.11.2</ProtobufVersion>
19+
<NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
20+
<NBenchVersion>2.0.1</NBenchVersion>
21+
<ProtobufVersion>3.21.12</ProtobufVersion>
2222
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
2323
<NetTestVersion>net6.0</NetTestVersion>
2424
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
2525
<FluentAssertionsVersion>6.6.0</FluentAssertionsVersion>
26-
<FsCheckVersion>2.9.0</FsCheckVersion>
27-
<AkkaVersion>1.4.37</AkkaVersion>
28-
<!--
29-
<AkkaVersion>1.4.28-beta637717616449070703</AkkaVersion>
30-
-->
26+
<FsCheckVersion>2.16.5</FsCheckVersion>
27+
<AkkaVersion>1.5.0-beta1</AkkaVersion>
3128
<AkkaPackageTags>akka;actors;actor model;Akka;concurrency</AkkaPackageTags>
3229
</PropertyGroup>
3330
<PropertyGroup>

0 commit comments

Comments
 (0)