Skip to content

Commit 533eaa8

Browse files
dbeuchlerdbeuchler
authored
Merge pull request PHOENIXCONTACT#883 from PHOENIXCONTACT/fix/dependencies
Use minimal minor of 3rd-party dependencies
2 parents 13a7307 + 301d7b8 commit 533eaa8

19 files changed

+63
-61
lines changed

‎Directory.Packages.props‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,22 @@
4242
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
4343

4444
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
45-
<PackageVersion Include="Microsoft.Identity.Web" Version="4.1.1" />
46-
<PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="4.1.0" />
45+
<PackageVersion Include="Microsoft.Identity.Web" Version="4.0.0" />
46+
<PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="4.0.0" />
4747

4848
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
4949

5050
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
51-
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
52-
<PackageVersion Include="AutoMapper" Version="14.0.0" />
5351
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
5452

5553
<PackageVersion Include="Castle.Windsor" Version="6.0.0" />
5654

5755
<!-- Dependencies for drivers and adapters -->
5856
<PackageVersion Include="System.IO.Ports" Version="10.0.0" />
59-
<PackageVersion Include="MQTTnet" Version="4.3.1.873" />
57+
<PackageVersion Include="MQTTnet" Version="5.0.1.1416" />
6058
<PackageVersion Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.376.213" />
6159

62-
<PackageVersion Include="InfluxDB.LineProtocol" Version="1.1.1" />
60+
<PackageVersion Include="InfluxDB.LineProtocol" Version="1.1.0" />
6361
<PackageVersion Include="InfluxDB.Client" Version="4.18.0" />
6462
<PackageVersion Include="CsvHelper" Version="33.1.0" />
6563

‎MORYX-Framework.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drivers", "Drivers", "{93C9
216216
EndProject
217217
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.Mqtt", "src\Moryx.Drivers.Mqtt\Moryx.Drivers.Mqtt.csproj", "{7EDCD56F-EF56-40DF-A25F-5896990D2407}"
218218
EndProject
219-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Resources.Mqtt.Tests", "src\Tests\Moryx.Recources.Mqtt.Tests\Moryx.Resources.Mqtt.Tests.csproj", "{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}"
220-
EndProject
221219
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.OpcUa", "src\Moryx.Drivers.OpcUa\Moryx.Drivers.OpcUa.csproj", "{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}"
222220
EndProject
223221
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.OpcUa.Tests", "src\Tests\Moryx.Drivers.OpcUa.Tests\Moryx.Drivers.OpcUa.Tests.csproj", "{CB5BC342-4952-4419-ABB9-0D240684A3DE}"
@@ -308,6 +306,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Shifts.Management.Int
308306
EndProject
309307
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Model.SqlServer", "src\Moryx.Model.SqlServer\Moryx.Model.SqlServer.csproj", "{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}"
310308
EndProject
309+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.Drivers.Mqtt.Tests", "src\Tests\Moryx.Drivers.Mqtt.Tests\Moryx.Drivers.Mqtt.Tests.csproj", "{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}"
310+
EndProject
311311
Global
312312
GlobalSection(SolutionConfigurationPlatforms) = preSolution
313313
Debug|Any CPU = Debug|Any CPU
@@ -646,10 +646,6 @@ Global
646646
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Debug|Any CPU.Build.0 = Debug|Any CPU
647647
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Release|Any CPU.ActiveCfg = Release|Any CPU
648648
{7EDCD56F-EF56-40DF-A25F-5896990D2407}.Release|Any CPU.Build.0 = Release|Any CPU
649-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
650-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Debug|Any CPU.Build.0 = Debug|Any CPU
651-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Release|Any CPU.ActiveCfg = Release|Any CPU
652-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54}.Release|Any CPU.Build.0 = Release|Any CPU
653649
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
654650
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
655651
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -810,6 +806,10 @@ Global
810806
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Debug|Any CPU.Build.0 = Debug|Any CPU
811807
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Release|Any CPU.ActiveCfg = Release|Any CPU
812808
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306}.Release|Any CPU.Build.0 = Release|Any CPU
809+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
810+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
811+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
812+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F}.Release|Any CPU.Build.0 = Release|Any CPU
813813
EndGlobalSection
814814
GlobalSection(SolutionProperties) = preSolution
815815
HideSolutionNode = FALSE
@@ -893,7 +893,6 @@ Global
893893
{39EDE0BB-F7D8-4E2E-9D1B-36A7A245FA05} = {8BBF84BB-4A8B-49F4-BA74-F25CBEED3F57}
894894
{D473D554-26F3-47EC-AE7D-A9754556C9D9} = {8BBF84BB-4A8B-49F4-BA74-F25CBEED3F57}
895895
{7EDCD56F-EF56-40DF-A25F-5896990D2407} = {93C94C82-873F-4D31-8A9C-0227047BD5A8}
896-
{4C32122A-90B9-4E49-AE3E-985FA5D4AC54} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
897896
{BD3B74DF-9EC2-4A5A-BCFE-1707C83756CC} = {93C94C82-873F-4D31-8A9C-0227047BD5A8}
898897
{CB5BC342-4952-4419-ABB9-0D240684A3DE} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
899898
{58CD8D72-1000-479A-B82A-D8C018345239} = {73AFB51B-B1A2-4144-AB4C-9CDE80CBCFBC}
@@ -934,6 +933,7 @@ Global
934933
{22358E04-0AE4-4ADA-9018-56C881E313F1} = {8DF13E64-63FC-44A9-A54C-ADEFC356CDE8}
935934
{5E02B439-B91F-4297-9AE4-7B92F2AA2AFF} = {8517D209-5BC1-47BD-A7C7-9CF9ADD9F5B6}
936935
{4402EF2E-CBA8-4EEF-B8A6-EC8364960306} = {74112169-6672-4907-A187-F055111940A9}
936+
{B2F922C0-F7C3-4C70-9BC5-5B5743BD8D7F} = {0A466330-6ED6-4861-9C94-31B1949CDDB9}
937937
EndGlobalSection
938938
GlobalSection(ExtensibilityGlobals) = postSolution
939939
SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243}

‎src/Moryx.Drivers.Mqtt/MqttDriver.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
22
// Licensed under the Apache License, Version 2.0
33

4+
using System.Buffers;
45
using System.Runtime.Serialization;
56
using Moryx.AbstractionLayer.Drivers;
67
using MQTTnet;
7-
using MQTTnet.Client;
88
using System.ComponentModel;
99
using System.Text.RegularExpressions;
1010
using Moryx.AbstractionLayer.Drivers.Message;
@@ -146,7 +146,7 @@ protected override void OnInitialize()
146146
{
147147
base.OnInitialize();
148148

149-
var factory = new MqttFactory();
149+
var factory = new MqttClientFactory();
150150
_mqttClient = factory.CreateMqttClient();
151151

152152
_mqttClient.ApplicationMessageReceivedAsync += OnReceived;
@@ -339,14 +339,17 @@ public async Task OnSend(MqttMessageTopic messageTopic, byte[] message, Cancella
339339
private Task OnReceived(MqttApplicationMessageReceivedEventArgs args)
340340
{
341341
// Experimental: Dispatch to new thread to prevent exceptions or deadlocks from causing inflight blockage
342-
ParallelOperations.ExecuteParallel(param => Receive(param.Topic, param.Payload), new { args.ApplicationMessage.Topic, args.ApplicationMessage.Payload });
342+
ParallelOperations.ExecuteParallel(param => Receive(param.Topic, param.Payload), new
343+
{
344+
args.ApplicationMessage.Topic,
345+
Payload = args.ApplicationMessage.Payload.ToArray()
346+
});
343347

344348
return Task.CompletedTask;
345349
}
346350

347351
internal void Receive(string topicName, byte[] message)
348352
{
349-
350353
var topic = topicName;
351354
if (Identifier != "")
352355
{

‎src/Moryx.Drivers.Mqtt/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
using System.Runtime.CompilerServices;
55

6-
[assembly: InternalsVisibleTo("Moryx.Resources.Mqtt.Tests")]
6+
[assembly: InternalsVisibleTo("Moryx.Drivers.Mqtt.Tests")]

‎src/Moryx.Drivers.OpcUa/OpcUaDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ internal List<NodeIdAlias> NodeIdAlias
195195

196196
//TODO: Internal property just for tests, use xml also in tests
197197
internal ApplicationConfigurationFactory ApplicationConfigurationFactory { get; set; } = new();
198-
198+
199199
/// <summary>
200200
/// Convert an OpcUaNode to an entity to be shown on the UI
201201
/// </summary>

‎src/Moryx.Model.Sqlite/Moryx.Model.Sqlite.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />
1716
<ProjectReference Include="..\Moryx\Moryx.csproj" />
1817
<ProjectReference Include="..\Moryx.Model\Moryx.Model.csproj" />
1918
</ItemGroup>

‎src/Moryx.Operators.Management/Moryx.Operators.Management.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ProjectReference Include="..\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj"/>
2020
<ProjectReference Include="..\Moryx.Model.Sqlite\Moryx.Model.Sqlite.csproj"/>
2121
<ProjectReference Include="..\Moryx.Operators\Moryx.Operators.csproj"/>
22+
<ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />
2223
<ProjectReference Include="..\Moryx.Users\Moryx.Users.csproj"/>
2324
</ItemGroup>
2425

‎src/Moryx.Shifts.Management/Moryx.Shifts.Management.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ItemGroup>
1515
<ProjectReference Include="..\Moryx.Model.PostgreSQL\Moryx.Model.PostgreSQL.csproj" />
1616
<ProjectReference Include="..\Moryx.Model.Sqlite\Moryx.Model.Sqlite.csproj" />
17+
<ProjectReference Include="..\Moryx.Runtime.Kernel\Moryx.Runtime.Kernel.csproj" />
1718
<ProjectReference Include="..\Moryx.Shifts\Moryx.Shifts.csproj" />
1819
</ItemGroup>
1920

src/Tests/Moryx.Recources.Mqtt.Tests/Moryx.Resources.Mqtt.Tests.csproj renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/Moryx.Drivers.Mqtt.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<OutputType>Library</OutputType>
45
<TargetFramework>net10.0</TargetFramework>
56
<DebugType>full</DebugType>
67
<IsTestProject>true</IsTestProject>
78
</PropertyGroup>
9+
810
<ItemGroup>
911
<PackageReference Include="Moq" />
1012
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1113
<PackageReference Include="NUnit" />
1214
<PackageReference Include="NUnit3TestAdapter" />
1315
<PackageReference Include="coverlet.collector" />
1416
</ItemGroup>
17+
1518
<ItemGroup>
1619
<ProjectReference Include="..\..\Moryx\Moryx.csproj" />
1720
<ProjectReference Include="..\..\Moryx.AbstractionLayer.TestTools\Moryx.AbstractionLayer.TestTools.csproj" />
1821
<ProjectReference Include="..\..\Moryx.Drivers.Mqtt\Moryx.Drivers.Mqtt.csproj" />
1922
<ProjectReference Include="..\..\Moryx.TestTools.UnitTest\Moryx.TestTools.UnitTest.csproj" />
2023
</ItemGroup>
21-
</Project>
24+
25+
</Project>

src/Tests/Moryx.Recources.Mqtt.Tests/TestDriverMqttChannelFunctions.cs renamed to src/Tests/Moryx.Drivers.Mqtt.Tests/TestDriverMqttChannelFunctions.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,20 @@
99
using Moq;
1010
using Moryx.AbstractionLayer.Products;
1111
using Moryx.AbstractionLayer.TestTools;
12-
using Moryx.Drivers.Mqtt;
1312
using Moryx.Drivers.Mqtt.MqttTopics;
13+
using Moryx.Drivers.Mqtt.Tests.TestMessages;
1414
using Moryx.Logging;
1515
using Moryx.Modules;
16-
using Moryx.Resources.Mqtt.Tests.TestMessages;
1716
using Moryx.TestTools.UnitTest;
1817
using Moryx.Tools;
1918
using MQTTnet;
20-
using MQTTnet.Client;
2119
using MQTTnet.Formatter;
2220
using MQTTnet.Packets;
2321
using MQTTnet.Protocol;
2422
using Newtonsoft.Json;
2523
using NUnit.Framework;
2624

27-
namespace Moryx.Resources.Mqtt.Tests
25+
namespace Moryx.Drivers.Mqtt.Tests
2826
{
2927
[TestFixture(MqttProtocolVersion.V310)]
3028
[TestFixture(MqttProtocolVersion.V311)]
@@ -50,7 +48,7 @@ public void Setup()
5048
_driver = CreateMqttDriver();
5149
_mockClient = SetupMqttClientMock();
5250

53-
//Initialize MqttDriver
51+
//Initialize MqttDriver
5452
_driver.InitializeForTest(_mockClient.Object);
5553
((IPlugin)_driver).Start();
5654
_driver.OnConnected(new MqttClientConnectedEventArgs(new MqttClientConnectResult())).Wait();
@@ -88,7 +86,8 @@ private MqttDriver CreateMqttDriver()
8886
Id = 4,
8987
Logger = new ModuleLogger("Dummy", new NullLoggerFactory()),
9088
Channels = new ReferenceCollectionMock<MqttTopic>(),
91-
MqttVersion = _version
89+
MqttVersion = _version,
90+
BrokerUrl = "mock"
9291
};
9392
}
9493

@@ -122,7 +121,7 @@ public void Channel_FindChannel_TChannel()
122121
Assert.That(c.Identifier.Equals(_topicBoolMqtt.Identifier));
123122
}
124123

125-
124+
126125
[Test(Description = "Return null, if identifier does not exist")]
127126
public void Channel_NotFindChannel_IdentifierDoesNotExist()
128127
{

0 commit comments

Comments
 (0)