Merge pull request #121 from technosoftware/master

Updated to newest version
technosoftware-gmbh · Jun 24, 2023 · 938dd25 · 938dd25
2 parents ff31cd6 + 259eb38
commit 938dd25
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 -------------------------------------------------------------------------------------------------------------
-## OPC UA Solution .NET Core - 3.1.1
+## OPC UA Solution .NET - 3.1.3
+
+# Changes
+- Removed unused System.Security.Cryptography.Pkcs
+
+-------------------------------------------------------------------------------------------------------------
+## OPC UA Solution .NET - 3.1.1
 
 # Changes
 - Includes all changes and fixes from the [OPC UA 1.04 Maintenance Update 1.4.371.91](https://github.com/OPCFoundation/UA-.NETStandard/releases/tag/1.4.371.91).

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@
 #---------------------------------#
 
 # version format
-version: 3.1.1.{build}-{branch}
+version: 3.1.3.{build}-{branch}
 
 
 # branches to build

diff --git a/examples/Base/SampleClient/SampleCompany.SampleClient.csproj b/examples/Base/SampleClient/SampleCompany.SampleClient.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Base/SampleServer/SampleCompany.SampleServer.csproj b/examples/Base/SampleServer/SampleCompany.SampleServer.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/BaseModel/SampleServer/SampleCompany.SampleServer.csproj b/examples/BaseModel/SampleServer/SampleCompany.SampleServer.csproj
@@ -32,12 +32,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/DataTypes/SampleServer/SampleCompany.SampleServer.csproj b/examples/DataTypes/SampleServer/SampleCompany.SampleServer.csproj
@@ -32,12 +32,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Empty/EmptyClient/EmptyCompany.EmptyClient.csproj b/examples/Empty/EmptyClient/EmptyCompany.EmptyClient.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Empty/EmptyServer/EmptyCompany.EmptyServer.csproj b/examples/Empty/EmptyServer/EmptyCompany.EmptyServer.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/HistoricalAccess/SampleServer/SampleCompany.SampleServer.csproj b/examples/HistoricalAccess/SampleServer/SampleCompany.SampleServer.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/ReverseConnect/SampleServer/SampleCompany.SampleServer.csproj b/examples/ReverseConnect/SampleServer/SampleCompany.SampleServer.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SampleCompany/SamplePublisher/SampleCompany.SamplePublisher.csproj b/examples/SampleCompany/SamplePublisher/SampleCompany.SamplePublisher.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.3" />
     <PackageReference Include="Technosoftware.UaSolution.UaPubSub" Version="0.5.0" />
   </ItemGroup>
 

diff --git a/examples/SampleCompany/SampleSubscriber/SampleCompany.SampleSubscriber.csproj b/examples/SampleCompany/SampleSubscriber/SampleCompany.SampleSubscriber.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.3" />
     <PackageReference Include="Technosoftware.UaSolution.UaPubSub" Version="0.5.0" />
   </ItemGroup>
 

diff --git a/examples/SamplePublisher/SampleCompany.SamplePublisher.csproj b/examples/SamplePublisher/SampleCompany.SamplePublisher.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SampleSubscriber/SampleCompany.SampleSubscriber.csproj b/examples/SampleSubscriber/SampleCompany.SampleSubscriber.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SimpleEvents/SampleServer/SampleCompany.SampleServer.csproj b/examples/SimpleEvents/SampleServer/SampleCompany.SampleServer.csproj
@@ -32,12 +32,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Simulation/SampleClient/SampleCompany.SampleClient.csproj b/examples/Simulation/SampleClient/SampleCompany.SampleClient.csproj
@@ -21,11 +21,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaClient" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Simulation/SampleServer/SampleCompany.SampleServer.csproj b/examples/Simulation/SampleServer/SampleCompany.SampleServer.csproj
@@ -32,13 +32,13 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaCore" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/UserAuthentication/SampleServer/SampleCompany.SampleServer.csproj b/examples/UserAuthentication/SampleServer/SampleCompany.SampleServer.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
-    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBindings.Https" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.1" />
-    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.1" />
+    <PackageReference Include="Technosoftware.UaSolution.UaConfiguration" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaServer" Version="3.1.3" />
+    <PackageReference Include="Technosoftware.UaSolution.UaBaseServer" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/targets.props b/targets.props
@@ -14,7 +14,7 @@
         <AppTargetFrameworks>net48;net6.0;net7.0</AppTargetFrameworks>
         <AppTargetFramework>net6.0</AppTargetFramework>
         <TestsTargetFrameworks>net48;net6.0;net7.0</TestsTargetFrameworks>
-        <LibTargetFrameworks>net48;netstandard2.1;net6.0;net7.0</LibTargetFrameworks>
+        <LibTargetFrameworks>net48;net6.0;net7.0</LibTargetFrameworks>
         <HttpsTargetFrameworks>net48;net6.0;net7.0</HttpsTargetFrameworks>
       </PropertyGroup>
     </When>
@@ -24,7 +24,7 @@
         <AppTargetFrameworks>net48</AppTargetFrameworks>
         <AppTargetFramework>net48</AppTargetFramework>
         <TestsTargetFrameworks>net48</TestsTargetFrameworks>
-        <LibTargetFrameworks>net48;netstandard2.1</LibTargetFrameworks>
+        <LibTargetFrameworks>net48</LibTargetFrameworks>
         <HttpsTargetFrameworks>net48</HttpsTargetFrameworks>
       </PropertyGroup>
     </When>