From 4ac3c86149465e69ef2648ef57b06ab67bae155e Mon Sep 17 00:00:00 2001 From: Marc Schier Date: Sun, 6 Oct 2024 17:09:40 +0200 Subject: [PATCH] Deps --- .../src/Azure.IIoT.OpcUa.Publisher.Models.csproj | 2 +- .../Azure.IIoT.OpcUa.Publisher.Models.Tests.csproj | 6 +++--- .../Azure.IIoT.OpcUa.Publisher.Module.Cli.csproj | 4 ++-- .../src/Azure.IIoT.OpcUa.Publisher.Module.csproj | 14 +++++++------- .../AdvancedPubSubIntegrationTests.cs | 4 ++-- .../src/Azure.IIoT.OpcUa.Publisher.Sdk.csproj | 6 +++--- .../Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj | 2 +- .../Azure.IIoT.OpcUa.Publisher.Service.Sdk.csproj | 8 ++++---- ...zure.IIoT.OpcUa.Publisher.Service.WebApi.csproj | 6 +++--- .../src/Azure.IIoT.OpcUa.Publisher.Service.csproj | 2 +- ...ure.IIoT.OpcUa.Publisher.Testing.Servers.csproj | 2 +- .../src/ServerConsoleHost.cs | 2 +- .../Azure.IIoT.OpcUa.Publisher.Testing.csproj | 6 +++--- .../tests/Fixtures/BaseServerFixture.cs | 2 ++ .../src/Azure.IIoT.OpcUa.Publisher.csproj | 2 +- .../src/Models/MessagingProfile.cs | 2 +- .../Services/OpcUaMonitoredItem.DataChange.cs | 3 ++- .../src/Stack/Services/OpcUaMonitoredItem.cs | 1 - .../src/Stack/Services/OpcUaSubscription.cs | 4 ++-- .../src/Storage/PublishedNodesConverter.cs | 4 ++-- src/Azure.IIoT.OpcUa/src/Azure.IIoT.OpcUa.csproj | 2 +- .../tests/Azure.IIoT.OpcUa.Tests.csproj | 2 +- 22 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/Azure.IIoT.OpcUa.Publisher.Models/src/Azure.IIoT.OpcUa.Publisher.Models.csproj b/src/Azure.IIoT.OpcUa.Publisher.Models/src/Azure.IIoT.OpcUa.Publisher.Models.csproj index 06f3f1cf24..84ba60e44e 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Models/src/Azure.IIoT.OpcUa.Publisher.Models.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Models/src/Azure.IIoT.OpcUa.Publisher.Models.csproj @@ -8,7 +8,7 @@ enable - + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Models/tests/Azure.IIoT.OpcUa.Publisher.Models.Tests.csproj b/src/Azure.IIoT.OpcUa.Publisher.Models/tests/Azure.IIoT.OpcUa.Publisher.Models.Tests.csproj index da9faf7a0d..108f33c683 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Models/tests/Azure.IIoT.OpcUa.Publisher.Models.Tests.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Models/tests/Azure.IIoT.OpcUa.Publisher.Models.Tests.csproj @@ -17,9 +17,9 @@ all runtime; build; native; contentfiles; analyzers - - - + + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Module/cli/Azure.IIoT.OpcUa.Publisher.Module.Cli.csproj b/src/Azure.IIoT.OpcUa.Publisher.Module/cli/Azure.IIoT.OpcUa.Publisher.Module.Cli.csproj index cf1fff200e..9ca82b5fea 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Module/cli/Azure.IIoT.OpcUa.Publisher.Module.Cli.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Module/cli/Azure.IIoT.OpcUa.Publisher.Module.Cli.csproj @@ -7,8 +7,8 @@ true - - + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Module/src/Azure.IIoT.OpcUa.Publisher.Module.csproj b/src/Azure.IIoT.OpcUa.Publisher.Module/src/Azure.IIoT.OpcUa.Publisher.Module.csproj index 38cb38b937..b9693163bf 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Module/src/Azure.IIoT.OpcUa.Publisher.Module.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Module/src/Azure.IIoT.OpcUa.Publisher.Module.csproj @@ -33,15 +33,15 @@ - - - - - - + + + + + + - + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/AdvancedPubSubIntegrationTests.cs b/src/Azure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/AdvancedPubSubIntegrationTests.cs index 0cc4f9b747..a0af3647e0 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/AdvancedPubSubIntegrationTests.cs +++ b/src/Azure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/AdvancedPubSubIntegrationTests.cs @@ -32,7 +32,7 @@ public async Task RestartServerTest() var server = new ReferenceServer(); EndpointUrl = server.EndpointUrl; const string name = nameof(RestartServerTest); - StartPublisher(name, "./Resources/Fixedvalue.json", + StartPublisher(name, "./Resources/Fixedvalue.json", arguments: new string[] { "--mm=PubSub", "--dm=false" }, keepAliveInterval: 1); try { @@ -69,7 +69,7 @@ public async Task RestartServerWithHeartbeatTest() var server = new ReferenceServer(); EndpointUrl = server.EndpointUrl; const string name = nameof(RestartServerWithHeartbeatTest); - StartPublisher(name, "./Resources/Heartbeat2.json", + StartPublisher(name, "./Resources/Heartbeat2.json", arguments: new string[] { "--mm=PubSub", "--dm=false", "--bs=1" }, keepAliveInterval: 1); try { diff --git a/src/Azure.IIoT.OpcUa.Publisher.Sdk/src/Azure.IIoT.OpcUa.Publisher.Sdk.csproj b/src/Azure.IIoT.OpcUa.Publisher.Sdk/src/Azure.IIoT.OpcUa.Publisher.Sdk.csproj index 5f83417bd0..6e29316792 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Sdk/src/Azure.IIoT.OpcUa.Publisher.Sdk.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Sdk/src/Azure.IIoT.OpcUa.Publisher.Sdk.csproj @@ -8,9 +8,9 @@ enable - - - + + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj b/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj index ddedab1fb9..f70cf1e976 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk.csproj b/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk.csproj index d437e29f5d..8e5d9a23ce 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj b/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj index 6e9d440c64..3cc1f06ca4 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Service/src/Azure.IIoT.OpcUa.Publisher.Service.csproj b/src/Azure.IIoT.OpcUa.Publisher.Service/src/Azure.IIoT.OpcUa.Publisher.Service.csproj index 018f9e2562..1032f3d979 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Service/src/Azure.IIoT.OpcUa.Publisher.Service.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Service/src/Azure.IIoT.OpcUa.Publisher.Service.csproj @@ -6,7 +6,7 @@ enable - + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Testing/src/Azure.IIoT.OpcUa.Publisher.Testing.Servers.csproj b/src/Azure.IIoT.OpcUa.Publisher.Testing/src/Azure.IIoT.OpcUa.Publisher.Testing.Servers.csproj index 00fd51f89e..a3d1337a89 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Testing/src/Azure.IIoT.OpcUa.Publisher.Testing.Servers.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Testing/src/Azure.IIoT.OpcUa.Publisher.Testing.Servers.csproj @@ -58,7 +58,7 @@ - + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Testing/src/ServerConsoleHost.cs b/src/Azure.IIoT.OpcUa.Publisher.Testing/src/ServerConsoleHost.cs index a07d9a175a..e64efaaf7d 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Testing/src/ServerConsoleHost.cs +++ b/src/Azure.IIoT.OpcUa.Publisher.Testing/src/ServerConsoleHost.cs @@ -180,7 +180,7 @@ public async Task RestartAsync(Func predicate) _logger.LogInformation("Restarting server {Instance}...", this); Debug.Assert(_ports != null); - await StartServerInternalAsync(_ports, + await StartServerInternalAsync(_ports, PkiRootPath).ConfigureAwait(false); } } diff --git a/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Azure.IIoT.OpcUa.Publisher.Testing.csproj b/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Azure.IIoT.OpcUa.Publisher.Testing.csproj index 5f2fe259bc..d928520749 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Azure.IIoT.OpcUa.Publisher.Testing.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Azure.IIoT.OpcUa.Publisher.Testing.csproj @@ -5,9 +5,9 @@ enable - - - + + + diff --git a/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Fixtures/BaseServerFixture.cs b/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Fixtures/BaseServerFixture.cs index a4914a3719..99a2a3330f 100644 --- a/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Fixtures/BaseServerFixture.cs +++ b/src/Azure.IIoT.OpcUa.Publisher.Testing/tests/Fixtures/BaseServerFixture.cs @@ -251,6 +251,8 @@ public void Dispose() /// /// Restart server /// + /// + /// public Task RestartAsync(Func predicate) { return _serverHost.RestartAsync(predicate); diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Azure.IIoT.OpcUa.Publisher.csproj b/src/Azure.IIoT.OpcUa.Publisher/src/Azure.IIoT.OpcUa.Publisher.csproj index befa13c473..e09e76cdd9 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Azure.IIoT.OpcUa.Publisher.csproj +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Azure.IIoT.OpcUa.Publisher.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Models/MessagingProfile.cs b/src/Azure.IIoT.OpcUa.Publisher/src/Models/MessagingProfile.cs index afd7fc18f2..666bf0671a 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Models/MessagingProfile.cs +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Models/MessagingProfile.cs @@ -441,7 +441,7 @@ private static DataSetFieldContentFlags BuildDataSetFieldContentMask( (DataSetFieldContentFlags.NodeId | DataSetFieldContentFlags.DisplayName | DataSetFieldContentFlags.EndpointUrl) : - DataSetFieldContentFlags.ServerTimestamp ) + DataSetFieldContentFlags.ServerTimestamp) ; } diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.DataChange.cs b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.DataChange.cs index f35a4fc439..9de95929c5 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.DataChange.cs +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.DataChange.cs @@ -47,7 +47,8 @@ public override (string NodeId, UpdateNodeId Update)? Register NodeId = v.AsString(context, Template.NamespaceFormat) ?? string.Empty; // We only want to register the node once for reading inside a session _registeredForReading = true; - }) : null; + } + ) : null; /// public override (string NodeId, UpdateString Update)? GetDisplayName diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.cs b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.cs index 13b6146539..348c0399bc 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.cs +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaMonitoredItem.cs @@ -42,7 +42,6 @@ public delegate void UpdateNodeId(NodeId nodeId, public delegate void UpdateRelativePath(RelativePath path, IServiceMessageContext messageContext); - /// /// /// Monitored item /// diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaSubscription.cs b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaSubscription.cs index 73c6bc381d..4b2538139c 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaSubscription.cs +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Stack/Services/OpcUaSubscription.cs @@ -825,7 +825,7 @@ private async Task FinalizeSyncAsync(CancellationToken ct) var shouldEnable = MonitoredItems .OfType() - .Any(m => m.AttachedToSubscription + .Any(m => m.AttachedToSubscription && m.MonitoringMode != Opc.Ua.MonitoringMode.Disabled); if (PublishingEnabled ^ shouldEnable) { @@ -1315,7 +1315,7 @@ private async ValueTask SynchronizeMonitoredItemsAsync( } } - Debug.Assert(remove.All(m => !m.AttachedToSubscription), + Debug.Assert(remove.All(m => !m.AttachedToSubscription), "All removed items should be detached now"); var set = desiredMonitoredItems.Where(m => m.Valid).ToList(); _logger.LogDebug( diff --git a/src/Azure.IIoT.OpcUa.Publisher/src/Storage/PublishedNodesConverter.cs b/src/Azure.IIoT.OpcUa.Publisher/src/Storage/PublishedNodesConverter.cs index fd44d7d32b..ba3db97002 100644 --- a/src/Azure.IIoT.OpcUa.Publisher/src/Storage/PublishedNodesConverter.cs +++ b/src/Azure.IIoT.OpcUa.Publisher/src/Storage/PublishedNodesConverter.cs @@ -532,8 +532,8 @@ IEnumerable GetNodeModels(PublishedNodesEntryModel item, int scale IndexRange = node.IndexRange, RegisterNode = node.RegisterNode, UseCyclicRead = node.UseCyclicRead, - CyclicReadMaxAgeTimespan = node.GetNormalizedCyclicReadMaxAge(), - SkipFirst = node.SkipFirst, + CyclicReadMaxAgeTimespan = node.GetNormalizedCyclicReadMaxAge(), + SkipFirst = node.SkipFirst, DataChangeTrigger = node.DataChangeTrigger, DeadbandType = node.DeadbandType, DeadbandValue = node.DeadbandValue, diff --git a/src/Azure.IIoT.OpcUa/src/Azure.IIoT.OpcUa.csproj b/src/Azure.IIoT.OpcUa/src/Azure.IIoT.OpcUa.csproj index 2e2750fc60..333f9ee957 100644 --- a/src/Azure.IIoT.OpcUa/src/Azure.IIoT.OpcUa.csproj +++ b/src/Azure.IIoT.OpcUa/src/Azure.IIoT.OpcUa.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Azure.IIoT.OpcUa/tests/Azure.IIoT.OpcUa.Tests.csproj b/src/Azure.IIoT.OpcUa/tests/Azure.IIoT.OpcUa.Tests.csproj index 998463c692..b15fa5a395 100644 --- a/src/Azure.IIoT.OpcUa/tests/Azure.IIoT.OpcUa.Tests.csproj +++ b/src/Azure.IIoT.OpcUa/tests/Azure.IIoT.OpcUa.Tests.csproj @@ -14,7 +14,7 @@ all runtime; build; native; contentfiles; analyzers - +