feat(release): v2.1.3

dathlin · Feb 19, 2021 · 93cb332 · 93cb332
1 parent 9278e56
commit 93cb332
Show file tree

Hide file tree

Showing 11 changed files with 739 additions and 514 deletions.
diff --git a/OpcUaHelper.Demo/App.config b/OpcUaHelper.Demo/App.config
@@ -19,16 +19,40 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Opc.Ua.Client" publicKeyToken="bfa7a73c5cf4b6e8" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.359.0" newVersion="1.4.359.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.365.0" newVersion="1.4.365.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Opc.Ua.Core" publicKeyToken="bfa7a73c5cf4b6e8" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.359.0" newVersion="1.4.359.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.365.0" newVersion="1.4.365.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Opc.Ua.Configuration" publicKeyToken="bfa7a73c5cf4b6e8" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.359.0" newVersion="1.4.359.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/OpcUaHelper.Demo/OpcUaHelper.Demo.csproj b/OpcUaHelper.Demo/OpcUaHelper.Demo.csproj
diff --git a/OpcUaHelper.Demo/packages.config b/OpcUaHelper.Demo/packages.config
@@ -1,87 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Libuv" version="1.9.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Extensions" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Features" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.WebUtilities" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Physical" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileSystemGlobbing" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" targetFramework="net461" />
-  <package id="Microsoft.Extensions.ObjectPool" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="1.1.2" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.ObjectPool" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.PlatformAbstractions" version="1.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="1.1.1" targetFramework="net461" />
-  <package id="Microsoft.Net.Http.Headers" version="1.1.2" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="OPCFoundation.NetStandard.Opc.Ua" version="1.4.359.31" targetFramework="net461" />
-  <package id="Portable.BouncyCastle" version="1.8.4" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Client" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Configuration" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Core" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.4.365.23" targetFramework="net461" />
+  <package id="OPCFoundation.NetStandard.Opc.Ua.Server" version="1.4.365.23" targetFramework="net461" />
+  <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
-  <package id="System.Buffers" version="4.3.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.3.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
   <package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
   <package id="System.Console" version="4.3.0" targetFramework="net461" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.Contracts" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.3.1" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
+  <package id="System.Formats.Asn1" version="5.0.0" targetFramework="net461" />
   <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
   <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
   <package id="System.IO" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
   <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.Pipelines" version="4.5.2" targetFramework="net461" />
   <package id="System.Linq" version="4.3.0" targetFramework="net461" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
+  <package id="System.Net.NameResolution" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
-  <package id="System.Numerics.Vectors" version="4.3.0" targetFramework="net461" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Metadata" version="1.4.1" targetFramework="net461" />
+  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
   <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+  <package id="System.ServiceModel.Primitives" version="4.8.0" targetFramework="net461" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.Encodings.Web" version="4.3.1" targetFramework="net461" />
+  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
   <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
 </packages>
diff --git a/OpcUaHelper.NetCoreDemo/Program.cs b/OpcUaHelper.NetCoreDemo/Program.cs
@@ -33,9 +33,12 @@ static void Main(string[] args)
             float value = opcUaClient.ReadNode<float>( "ns=2;s=Machines/Machine B/TestValueFloat" );
             Console.WriteLine( "ns=2;s=Machines/Machine B/TestValueFloat" + "   value: " + value );
 
+            string name = opcUaClient.ReadNode<string>( "ns=2;s=Machines/Machine A/Name" );
+            Console.WriteLine( "ns=2;s=Machines/Machine A/Name" + "   value: " + name );
+
             Console.WriteLine("Please enter any key to quit!");
-            Console.ReadLine( );
             opcUaClient.Disconnect( );
+            Console.ReadLine( );
         }
     }
 }
diff --git a/OpcUaHelper.Standard/OpcUaHelper.Standard.csproj b/OpcUaHelper.Standard/OpcUaHelper.Standard.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>OpcUaHelper</AssemblyName>
     <RootNamespace>OpcUaHelper</RootNamespace>
-    <Version>2.1.2</Version>
+    <Version>2.1.3</Version>
     <Authors>Copyright © Richard.Hu 2018 - 2019</Authors>
     <Product>Richard.Hu</Product>
     <Company>Richard.Hu</Company>
@@ -23,13 +23,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.359.31" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.365.23" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.365.23" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.5.3" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.0" />
   </ItemGroup>
 
 </Project>
diff --git a/OpcUaHelper.Tool/Program.cs b/OpcUaHelper.Tool/Program.cs
@@ -18,5 +18,5 @@ static void Main( )
             Application.SetCompatibleTextRenderingDefault( false );
             Application.Run( new OpcUaHelper.Forms.FormBrowseServer( ) );
         }
-    }
+	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,5 +18,5 @@ static void Main( ) @@
                 Application.SetCompatibleTextRenderingDefault( false );
                 Application.Run( new OpcUaHelper.Forms.FormBrowseServer( ) );
             }
-        }
+    	}
     }