Merge pull request #38 from technosoftware-gmbh/master

Updated to 1.2.5
technosoftware-gmbh · Mar 5, 2022 · ec2b132 · ec2b132
2 parents a146663 + 2703507
commit ec2b132
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 24 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: windows-latest
+    runs-on: windows-2019
     permissions:
       actions: read
       contents: read

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------------------------------------------------
+## OPC DA/AE/HDA Solution .NET - 1.2.5
+
+###	Fixed Issues
+- Support of .NET 6.0 
+
 -------------------------------------------------------------------------------------------------------------
 ## OPC DA/AE/HDA Solution .NET - 1.2.4
 

diff --git a/doc/visio/OPC DAAEHDA Client Solution NET.vsd b/doc/visio/OPC DAAEHDA Client Solution NET.vsd
diff --git a/examples/Workshop/AeConsole/AeConsole.csproj b/examples/Workshop/AeConsole/AeConsole.csproj
@@ -7,9 +7,9 @@
     <OutputType>Exe</OutputType>
     <PackageId>Technosoftware.AeClientConsole</PackageId>
     <Company>Technosoftware GmbH</Company>
-    <Product>OPC DA/AE/HDA Client Solution .NET</Product>
+    <Product>OPC DA/AE/HDA Solution .NET</Product>
     <Description>Technosoftware AE Client Console</Description>
-    <Copyright>Copyright © 2011 - 2021 Technosoftware GmbH</Copyright>
+    <Copyright>Copyright © 2011 - 2022 Technosoftware GmbH</Copyright>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/Workshop/AeConsole/OpcSample.cs b/examples/Workshop/AeConsole/OpcSample.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/examples/Workshop/AeConsole/Program.cs b/examples/Workshop/AeConsole/Program.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/examples/Workshop/DaConsole/DaConsole.csproj b/examples/Workshop/DaConsole/DaConsole.csproj
@@ -7,9 +7,9 @@
     <OutputType>Exe</OutputType>
     <PackageId>Technosoftware.DaClientConsole</PackageId>
     <Company>Technosoftware GmbH</Company>
-    <Product>OPC DA/AE/HDA Client Solution .NET</Product>
+    <Product>OPC DA/AE/HDA Solution .NET</Product>
     <Description>Technosoftware DA Client Console</Description>
-    <Copyright>Copyright © 2011 - 2021 Technosoftware GmbH</Copyright>
+    <Copyright>Copyright © 2011 - 2022 Technosoftware GmbH</Copyright>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/Workshop/DaConsole/OpcSample.cs b/examples/Workshop/DaConsole/OpcSample.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/examples/Workshop/DaConsole/Program.cs b/examples/Workshop/DaConsole/Program.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/examples/Workshop/HdaConsole/HdaConsole.csproj b/examples/Workshop/HdaConsole/HdaConsole.csproj
@@ -7,9 +7,9 @@
     <OutputType>Exe</OutputType>
     <PackageId>Technosoftware.HdaClientConsole</PackageId>
     <Company>Technosoftware GmbH</Company>
-    <Product>OPC DA/AE/HDA Client Solution .NET</Product>
+    <Product>OPC DA/AE/HDA Solution .NET</Product>
     <Description>Technosoftware HDA Client Console</Description>
-    <Copyright>Copyright © 2011 - 2021 Technosoftware GmbH</Copyright>
+    <Copyright>Copyright © 2011 - 2022 Technosoftware GmbH</Copyright>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/Workshop/HdaConsole/OpcSample.cs b/examples/Workshop/HdaConsole/OpcSample.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/examples/Workshop/HdaConsole/Program.cs b/examples/Workshop/HdaConsole/Program.cs
@@ -1,6 +1,6 @@
 #region Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 //-----------------------------------------------------------------------------
-// Copyright (c) 2021 Technosoftware GmbH. All rights reserved
+// Copyright (c) 2011-2022 Technosoftware GmbH. All rights reserved
 // Web: https://technosoftware.com 
 // 
 // License: 

diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
@@ -0,0 +1,11 @@
+# SOFTWARE LICENSE AGREEMENT
+
+TECHNOSOFTWARE (THE "LICENSOR") IS WILLING TO LICENSE THE ACCOMPANYING SOFTWARE AND ASSOCIATED DOCUMENTATION INCLUDING AUTHORIZED COPIES OF EACH (THE "SOFTWARE") TO YOU ("LICENSEE") ONLY ON THE CONDITION THAT LICENSEE ACCEPTS ALL OF THE TERMS IN THIS AGREEMENT.
+
+The licensed Software is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The licensed Software is licensed, not sold. Technosoftware shall own all right, title and interest including the intellectual property rights in and to the information on bug fixes or error corrections relating to the licensed Software that are submitted by Licensee to Technosoftware as well as any intellectual property rights to the correction of any errors, if any.
+
+PLEASE READ THE TERMS CAREFULLY BEFORE INSTALLING THE SOFTWARE. BY INSTALLING THE SOFTWARE, LICENSEE ACKNOWLEDGES THAT LICENSEE HAS READ AND UNDERSTANDS THIS AGREEMENT AND AGREES TO BE BOUND BY ITS TERMS AND CONDITIONS. THE EFFECTIVE DATE OF THIS AGREEMENT SHALL BE THE DATE UPON THE SOFTWARE WAS FIRST DELIVERED TO YOU OR FIRST DOWNLOADED BY YOU.
+
+IF LICENSEE DOES NOT ACCEPT THESE LICENSE TERMS, THEN TECHNOSOFTWARE DOES NOT GRANT ANY LICENSE TO THE SOFTWARE, AND LICENSEE MUST NOT DOWNLOAD OR INSTALL THE SOFTWARE.
+
+The detailed license agreement is available at https://technosoftware.com/documents/Technosoftware_SLA.pdf.
diff --git a/nuget/Technosoftware.DaAeHdaSolution.DaAeHdaClient.nuspec b/nuget/Technosoftware.DaAeHdaSolution.DaAeHdaClient.nuspec
@@ -2,18 +2,18 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Technosoftware.DaAeHdaSolution.DaAeHdaClient</id>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <title>OPC DA/AE/HDA Solution .NET Client Library</title>
     <description>OPC DA/AE/HDA .NET Client Library</description>
     <readme>README.md</readme>
     <authors>Technosoftware GmbH</authors>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="file">LICENSE.md</license>
+    <license type="file">licenses/LICENSE.txt</license>
     <projectUrl>https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-samples</projectUrl>
     <icon>images/TechnosoftwareGmbH.png</icon>
     <releaseNotes>https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-samples/releases</releaseNotes>
     <copyright>Copyright © 2011 - 2022 Technosoftware GmbH</copyright>
-    <tags>Technosoftware OPC DA/AE/HDA .NET 5.0 dotnet windows netcore</tags>
+    <tags>Technosoftware OPC DA/AE/HDA .NET 6.0 .NET 5.0 dotnet windows netcore</tags>
     <repository type="git" url="https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-samples" />
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
@@ -31,6 +31,10 @@
         <dependency id="Portable.BouncyCastle" version="1.9.0" />
         <dependency id="System.Runtime.InteropServices" version="4.3.0" />
       </group>
+      <group targetFramework="net6.0-windows7.0">
+        <dependency id="Microsoft.Win32.Registry" version="5.0.0" />
+        <dependency id="System.Runtime.InteropServices" version="4.3.0" />
+      </group>
       <group targetFramework="net5.0-windows7.0">
         <dependency id="Microsoft.Win32.Registry" version="5.0.0" />
         <dependency id="System.Runtime.InteropServices" version="4.3.0" />
@@ -49,11 +53,13 @@
   <files>
     <file src="../README.md" target="/" />
     <file src="../CHANGELOG.md" target="/" />
-    <file src="../LICENSE.md" target="/" />
     <file src="../nuget/TechnosoftwareGmbH.png" target="images/" />
+    <file src="../licenses/LICENSE.txt" target="licenses/LICENSE.txt"/>
     <file src="../licenses/Technosoftware_SLA.pdf" target="licenses/Technosoftware_SLA.pdf"/>
     <file src="../lib/netstandard2.1/Technosoftware.DaAeHdaClient.dll" target="lib/netstandard2.1/" />
     <file src="../lib/netstandard2.1/Technosoftware.DaAeHdaClient.xml" target="lib/netstandard2.1/" />
+    <file src="../lib/net5.0-windows/Technosoftware.DaAeHdaClient.dll" target="lib/net6.0-windows7.0/" />
+    <file src="../lib/net5.0-windows/Technosoftware.DaAeHdaClient.xml" target="lib/net6.0-windows7.0/" />
     <file src="../lib/net5.0-windows/Technosoftware.DaAeHdaClient.dll" target="lib/net5.0-windows7.0/" />
     <file src="../lib/net5.0-windows/Technosoftware.DaAeHdaClient.xml" target="lib/net5.0-windows7.0/" />
     <file src="../lib/net48/Technosoftware.DaAeHdaClient.dll" target="lib/net48/" />

diff --git a/src/Technosoftware/DaAeHdaClient/LicenseHandler.cs b/src/Technosoftware/DaAeHdaClient/LicenseHandler.cs
@@ -40,12 +40,12 @@ public enum ProductLicense : uint
             None = 0,
 
             /// <summary>
-            /// OPC UA Client .NET
+            /// OPC DA/AE/HDA Client .NET
             /// </summary>
             Client = 1,
 
             /// <summary>
-            /// OPC UA Server .NET
+            /// OPC DA/AE Server .NET
             /// </summary>
             Server = 2,
 
@@ -209,19 +209,19 @@ public static string Product
                     if (((LicensedProduct & ProductLicense.Client) == ProductLicense.Client) &&
                         ((LicensedProduct & ProductLicense.Server) == ProductLicense.Server))
                     {
-                        product = "Expired OPC UA Bundle .NET license";
+                        product = "Expired OPC DA/AE/HDA Bundle .NET license";
                     }
                     else if ((LicensedProduct & ProductLicense.Client) == ProductLicense.Client)
                     {
-                        product = "Expired OPC UA Client .NET license";
+                        product = "Expired OPC DA/AE/HDA Client .NET license";
                     }
                     else if ((LicensedProduct & ProductLicense.Server) == ProductLicense.Server)
                     {
-                        product = "Expired OPC UA Server .NET license";
+                        product = "Expired OPC DA/HDA Server .NET license";
                     }
                     else if ((LicensedProduct & ProductLicense.Evaluation) == ProductLicense.Evaluation)
                     {
-                        product = "Expired OPC UA Bundle .NET Evaluation";
+                        product = "Expired OPC DA/AE/HDA Bundle .NET Evaluation";
                     }
                     return product;
                 }

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "versionHeightOffset": 0,
   "nugetPackageVersion": {
     "semVer": 2