Update dependencies (#2325)

Azure · Aug 26, 2024 · 543bfca · 543bfca
1 parent f40c013
commit 543bfca
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 33 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.66" />
+    <PackageReference Include="Furly.Extensions.Abstractions" Version="1.0.67" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 </Project>
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.66" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.Json" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.67" />
   </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.66" />
-    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.66" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.67" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.67" />
     <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.66" />
-    <PackageReference Include="Furly.Extensions.Mqtt" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions.Dapr" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.66" />
-    <PackageReference Include="Furly.Azure.EventHubs" Version="1.0.66" />
-    <PackageReference Include="Furly.Azure.IoT" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Mqtt" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Dapr" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.67" />
+    <PackageReference Include="Furly.Azure.EventHubs" Version="1.0.67" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.67" />
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="Azure.Core" Version="1.42.0" />
-    <PackageReference Include="Furly.Tunnel" Version="1.0.66" />
+    <PackageReference Include="Furly.Tunnel" Version="1.0.67" />
     <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/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.66" />
-    <PackageReference Include="Furly.Tunnel" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.67" />
+    <PackageReference Include="Furly.Tunnel" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.67" />
     <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.66" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.67" />
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="Azure.Core" Version="1.42.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.66" />
-    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.67" />
     <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.66" />
-    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.66" />
-    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.AspNetCore" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.MessagePack" Version="1.0.67" />
+    <PackageReference Include="Furly.Azure.KeyVault" Version="1.0.67" />
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="Azure.Core" Version="1.42.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.66" />
+    <PackageReference Include="Furly.Azure.IoT" Version="1.0.67" />
     <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.66" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.67" />
     <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/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.66" />
-    <PackageReference Include="Furly.Extensions.Json" Version="1.0.66" />
-    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.66" />
+    <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Json" Version="1.0.67" />
+    <PackageReference Include="Furly.Extensions.Autofac" Version="1.0.67" />
     <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.0" />

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.8.0" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="Furly.Azure.IoT.Edge" Version="1.0.66" />
+    <PackageReference Include="Furly.Azure.IoT.Edge" Version="1.0.67" />
     <PackageReference Include="Irony" Version="1.5.1" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.374.78" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.78" />

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.66" />
+    <PackageReference Include="Furly.Extensions" Version="1.0.67" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.78" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Azure.IIoT.OpcUa/src/Extensions/StringEx.cs b/src/Azure.IIoT.OpcUa/src/Extensions/StringEx.cs
@@ -23,17 +23,62 @@ public static string ToSha1Hash(this string str)
             return Encoding.UTF8.GetBytes(str).ToSha1Hash();
         }
 
+        /// <summary>
+        /// Hashes the string
+        /// </summary>
+        /// <param name="str">string to hash</param>
+        /// <returns></returns>
+        public static string ToSha2Hash(this string str)
+        {
+            return Encoding.UTF8.GetBytes(str).ToSha2Hash();
+        }
+
+        /// <summary>
+        /// Create guid from string using sha2
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static Guid ToGuid(this string? str)
+        {
+            if (string.IsNullOrWhiteSpace(str))
+            {
+                return Guid.Empty;
+            }
+            return new Guid(SHA256.HashData(Encoding.UTF8.GetBytes(str)).AsSpan().Slice(0, 16));
+        }
+
+        /// <summary>
+        /// Create Uuid from string using sha2
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static Opc.Ua.Uuid ToUuid(this string? str)
+        {
+            return (Opc.Ua.Uuid)ToGuid(str);
+        }
+
         /// <summary>
         /// Hashes the string
         /// </summary>
         /// <param name="bytestr">string to hash</param>
         /// <returns></returns>
         [Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA5350:Do Not Use Weak Cryptographic Algorithms",
-            Justification = "SHA1 not used for crypto operation.")]
+        Justification = "SHA1 not used for crypto operation.")]
         public static string ToSha1Hash(this byte[] bytestr)
         {
             var hash = SHA1.HashData(bytestr);
             return hash.ToBase16String(false);
         }
+
+        /// <summary>
+        /// Hashes the string
+        /// </summary>
+        /// <param name="bytestr">string to hash</param>
+        /// <returns></returns>
+        public static string ToSha2Hash(this byte[] bytestr)
+        {
+            var hash = SHA256.HashData(bytestr);
+            return hash.ToBase16String(false);
+        }
     }
 }
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.66" />
+	  <PackageReference Include="Furly.Extensions.Newtonsoft" Version="1.0.67" />
     <PackageReference Include="JsonSchema.Net" Version="7.2.2" />
     <PackageReference Include="Microsoft.Json.Schema" Version="2.3.0" />
   </ItemGroup>