Skip to content

Commit

Permalink
Bump NuGet dependencies to match Akka.NET 1.5 (#163)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Arkatufus committed Feb 21, 2023
1 parent 4117353 commit 8294e54
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 31 deletions.
12 changes: 0 additions & 12 deletions NuGet.Config

This file was deleted.

Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
</ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Akka.MultiNode.TestAdapter.Tests/Internal/ParsingSpec.cs
Expand Up @@ -61,7 +61,8 @@ public void MessageSink_should_parse_Runner_log_message_correctly()
{
var loggingActor = Sys.ActorOf<LoggingActor>();
Sys.EventStream.Subscribe(TestActor, typeof(Debug));
loggingActor.Tell("LOG ME... but like the test runner this time!");
var message = "LOG ME... but like the test runner this time!";
loggingActor.Tell(message);

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

Assert.Equal(foundMessage.LogLevel(), runnerMessage.Level);
Assert.Equal(foundMessage.LogSource, runnerMessage.LogSource);
Assert.Equal(foundMessage.Message.ToString(), $"Received message {message}");
}

[Fact]
Expand Down
8 changes: 4 additions & 4 deletions src/Akka.MultiNode.TestAdapter/Internal/Sinks/MessageSink.cs
Expand Up @@ -101,10 +101,10 @@ public enum MultiNodeTestRunnerMessageType
/*
* Regular expressions - go big or go home. [Aaronontheweb]
*/
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|:|<|\.|\+|>|,|\[|/|-|]|%|\$|\+|\^|@)*)";
protected static readonly Regex RunnerLogMessageRegex = new Regex(RunnerLogMessageRegexString);
private const string RunnerLogMessageRegexString = @"\[(?<level>[\w]*)\]\[(?<date>[\d\/ :.Z+-]*)\]\[(?<thread>[\w|\s]*)\]\[(?<logsource>[\[\w:\/\(\)\]\.\$%\+#\^@)-]*)\]\s(?<message>.*)";
protected static readonly Regex RunnerLogMessageRegex = new Regex(RunnerLogMessageRegexString, RegexOptions.Compiled);

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

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

return true;
Expand Down
23 changes: 10 additions & 13 deletions src/common.props
@@ -1,33 +1,30 @@
<Project>
<PropertyGroup>
<Copyright>Copyright © 2013-2019 Akka.NET Team</Copyright>
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
<Authors>Akka.NET Team</Authors>
<VersionPrefix>1.0.0</VersionPrefix>
<PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
<PackageIconUrl>https://getakka.net/images/akkalogo.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
<NoWarn>$(NoWarn);CS1591;xUnit1013</NoWarn>
</PropertyGroup>
<PropertyGroup>
<XunitVersion>2.4.1</XunitVersion>
<TestSdkVersion>17.1.0</TestSdkVersion>
<HyperionVersion>0.9.12</HyperionVersion>
<XunitVersion>2.4.2</XunitVersion>
<XunitRunnerVersion>2.4.2</XunitRunnerVersion>
<TestSdkVersion>17.4.1</TestSdkVersion>
<CodeDomVersion>6.0.0</CodeDomVersion>
<TeamCityVersion>3.0.13</TeamCityVersion>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<DependencyModelVersion>5.0.0</DependencyModelVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
<NBenchVersion>1.2.2</NBenchVersion>
<ProtobufVersion>3.11.2</ProtobufVersion>
<NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
<NBenchVersion>2.0.1</NBenchVersion>
<ProtobufVersion>3.21.12</ProtobufVersion>
<NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
<NetTestVersion>net6.0</NetTestVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
<FluentAssertionsVersion>6.6.0</FluentAssertionsVersion>
<FsCheckVersion>2.9.0</FsCheckVersion>
<AkkaVersion>1.4.37</AkkaVersion>
<!--
<AkkaVersion>1.4.28-beta637717616449070703</AkkaVersion>
-->
<FsCheckVersion>2.16.5</FsCheckVersion>
<AkkaVersion>1.5.0-beta1</AkkaVersion>
<AkkaPackageTags>akka;actors;actor model;Akka;concurrency</AkkaPackageTags>
</PropertyGroup>
<PropertyGroup>
Expand Down

0 comments on commit 8294e54

Please sign in to comment.