Deps

Azure · Oct 6, 2024 · 4ac3c86 · 4ac3c86
1 parent dcacfb8
commit 4ac3c86
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 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
@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Extensions.Abstractions" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.Abstractions" Version="1.0.69" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup>

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
@@ -17,9 +17,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Furly.Extensions.Json" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.Json" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.69" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.IIoT.OpcUa.Publisher.Models.csproj" />

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
@@ -7,8 +7,8 @@
     <TieredPGO>true</TieredPGO>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Azure.IoT" Version="1.0.68" />
-    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.68" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.69" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.69" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
   </ItemGroup>

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
@@ -33,15 +33,15 @@
     <None Remove="pki\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Mqtt" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Dapr" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.68" />
-    <PackageReference Include="Furly.Azure.EventHubs" Version="1.0.68" />
-    <PackageReference Include="Furly.Azure.IoT" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Mqtt" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Dapr" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.69" />
+    <PackageReference Include="Furly.Azure.EventHubs" Version="1.0.69" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.69" />
     <PackageReference Include="Azure.Identity" Version="1.12.1" />
     <PackageReference Include="Azure.Core" Version="1.44.0" />
-    <PackageReference Include="Furly.Tunnel" Version="1.0.68" />
+    <PackageReference Include="Furly.Tunnel" Version="1.0.69" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />

diff --git a/...e.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/AdvancedPubSubIntegrationTests.cs b/...e.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
@@ -8,9 +8,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.68" />
-    <PackageReference Include="Furly.Tunnel" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.69" />
+    <PackageReference Include="Furly.Tunnel" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.69" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />

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
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.68" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.69" />
     <PackageReference Include="Azure.Identity" Version="1.12.1" />
     <PackageReference Include="Azure.Core" Version="1.44.0" />
   </ItemGroup>

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
@@ -12,10 +12,10 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.69" />
     <PackageReference Include="Nito.Disposables" Version="2.5.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/....IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj b/....IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj
@@ -28,9 +28,9 @@
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
-    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.68" />
-    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.69" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.69" />
     <PackageReference Include="Azure.Identity" Version="1.12.1" />
     <PackageReference Include="Azure.Core" Version="1.44.0" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />

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
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Azure.IoT" Version="1.0.68" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.69" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

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
@@ -58,7 +58,7 @@
     <EmbeddedResource Include="Generated\Boiler\Design\Boiler.PredefinedNodes.uanodes" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Extensions" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.69" />
     <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />

diff --git 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<Task> 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
@@ -5,9 +5,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Json" Version="1.0.68" />
-    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Json" Version="1.0.69" />
+    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.69" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.12.1" />

diff --git 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()
         /// <summary>
         /// Restart server
         /// </summary>
+        /// <param name="predicate"></param>
+        /// <returns></returns>
         public Task RestartAsync(Func<Task> 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
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.ResourceMonitoring" Version="8.9.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="Furly.Azure.IoT.Edge" Version="1.0.68" />
+    <PackageReference Include="Furly.Azure.IoT.Edge" Version="1.0.69" />
     <PackageReference Include="Irony" Version="1.5.3" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.374.124" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.124" />

diff --git 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
@@ -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;
 
             /// <inheritdoc/>
             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
@@ -42,7 +42,6 @@ public delegate void UpdateNodeId(NodeId nodeId,
     public delegate void UpdateRelativePath(RelativePath path,
         IServiceMessageContext messageContext);
 
-    /// <summary>
     /// <summary>
     /// Monitored item
     /// </summary>

diff --git 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<OpcUaMonitoredItem>()
-                .Any(m => m.AttachedToSubscription 
+                .Any(m => m.AttachedToSubscription
                     && m.MonitoringMode != Opc.Ua.MonitoringMode.Disabled);
             if (PublishingEnabled ^ shouldEnable)
             {
@@ -1315,7 +1315,7 @@ private async ValueTask<TimeSpan> 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
@@ -532,8 +532,8 @@ IEnumerable<OpcNodeModel> 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
@@ -9,7 +9,7 @@
     <PackageReference Include="Apache.Avro" Version="1.12.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageReference Include="Furly.Extensions" Version="1.0.68" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.69" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.124" />
   </ItemGroup>
   <ItemGroup>

diff --git 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 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-	  <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.68" />
+	  <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.69" />
     <PackageReference Include="JsonSchema.Net" Version="7.2.3" />
     <PackageReference Include="Microsoft.Json.Schema" Version="2.3.0" />
   </ItemGroup>