Merge branch 'master' into fixRequestWhenPrivateKeyIsNotExportable

OPCFoundation · Jul 21, 2024 · e64cfc5 · e64cfc5
2 parents 14d3dee + adf5ad6
commit e64cfc5
Show file tree

Hide file tree

Showing 93 changed files with 10,354 additions and 4,276 deletions.
diff --git a/.azurepipelines/get-matrix.ps1 b/.azurepipelines/get-matrix.ps1
@@ -45,7 +45,7 @@ if ($AgentTable -eq $null -or $AgentTable.Count -eq 0)
     $agents = @{
         windows = "windows-2022"
         linux = "ubuntu-22.04"
-        mac = "macOS-11"
+        mac = "macOS-13"
     }
 }
 else {

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,7 +11,6 @@ updates:
       interval: "daily"
     registries: "*"
     open-pull-requests-limit: 25
-    target-branch: "preview"
     labels: 
       - "nuget"
     groups:
@@ -26,5 +25,3 @@ updates:
     directory: "./"
     schedule:
       interval: "weekly"
-    # Raise pull requests in worker branch preview
-    target-branch: "preview"
diff --git a/ComIOP/Common/Client/ComWrapperServer.cs b/ComIOP/Common/Client/ComWrapperServer.cs
@@ -45,7 +45,7 @@ namespace Opc.Ua.Com.Client
     /// This sub-class specifies non-configurable metadata such as Product Name and initializes
     /// the DataAccessServerNodeManager which provides access to the data exposed by the Server.
     /// </remarks>
-    public partial class ComWrapperServer : StandardServer
+    public partial class ComWrapperServer : ReverseConnectServer
     {
         #region Public Interface
         /// <summary>
@@ -272,6 +272,7 @@ protected override void OnApplicationCertificateError(byte[] clientCertificate,
         /// <param name="server">The server.</param>
         protected override void OnServerStarted(IServerInternal server)
         {
+            base.OnServerStarted(server);
             // verify session
             this.ServerInstance.SessionManager.ImpersonateUser += SessionManager_ImpersonateUser;
         }

diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj
@@ -265,13 +265,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml b/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml
@@ -139,6 +139,21 @@
     <MaxPublishRequestCount>20</MaxPublishRequestCount>
     <MaxSubscriptionCount>100</MaxSubscriptionCount>
     <MaxEventQueueSize>10000</MaxEventQueueSize>
+
+    <!-- Reverse Connect config 
+    <ReverseConnect>
+      <Clients>
+        <ReverseConnectClient>
+          <EndpointUrl>opc.tcp://localhost:65300</EndpointUrl>
+          <Timeout>30000</Timeout>
+        </ReverseConnectClient>
+      </Clients>
+      <ConnectInterval>2000</ConnectInterval>
+      <ConnectTimeout>10000</ConnectTimeout>
+      <RejectTimeout>10000</RejectTimeout>
+    </ReverseConnect>
+    -->
+
   </ServerConfiguration>
 
   <Extensions>

diff --git a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj
@@ -140,7 +140,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj
@@ -138,7 +138,7 @@
       <Version>8.0.0</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.4</Version>

diff --git a/Samples/ClientControls.Net4/UA Client Controls.csproj b/Samples/ClientControls.Net4/UA Client Controls.csproj
@@ -1015,16 +1015,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Samples/Controls.Net4/UA Sample Controls.csproj b/Samples/Controls.Net4/UA Sample Controls.csproj
@@ -708,7 +708,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs b/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
@@ -180,6 +180,10 @@ private void RequestNewCertificatePushMode(object sender, EventArgs e)
         {
             try
             {
+                NodeId trustListId = m_gds.GetTrustList(m_application.ApplicationId, NodeId.Null);
+                var trustList = m_gds.ReadTrustList(trustListId);
+                bool applyChanges = m_server.UpdateTrustList(trustList);
+
                 byte[] unusedNonce = new byte[0];
                 byte[] certificateRequest = m_server.CreateSigningRequest(
                     NodeId.Null,
@@ -194,6 +198,18 @@ private void RequestNewCertificatePushMode(object sender, EventArgs e)
                     NodeId.Null,
                     certificateRequest);
 
+                if (applyChanges)
+                {
+                    MessageBox.Show(
+                        Parent,
+                        "The updated Trust List was loaded however, the apply changes command must be sent before the server will update its Trust List.",
+                        Parent.Text,
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Information);
+
+                    ApplyChangesButton.Enabled = true;
+                }
+
                 m_application.CertificateRequestId = requestId.ToString();
                 CertificateRequestTimer.Enabled = true;
                 RequestProgressLabel.Visible = true;

diff --git a/Samples/GDS/Client/GlobalDiscoveryClient.csproj b/Samples/GDS/Client/GlobalDiscoveryClient.csproj
@@ -139,10 +139,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.4</Version>

diff --git a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj
@@ -217,10 +217,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj
@@ -12,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.374.36" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.36" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.374.78" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.78" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/GDS/Server/GlobalDiscoveryServer.csproj b/Samples/GDS/Server/GlobalDiscoveryServer.csproj
@@ -232,13 +232,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EntityFramework">
-      <Version>6.4.4</Version>
+      <Version>6.5.1</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common">
-      <Version>1.5.374.36</Version>
+      <Version>1.5.374.78</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.36" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.373.121" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.78" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.374.78" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/ReferenceClient/App.config b/Samples/ReferenceClient/App.config
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<configSections>
+		<section name="Quickstarts.ReferenceClient" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core"/>
+	</configSections>
+	<system.serviceModel>
+		<!--
+      Uncommenting this <diagnostics> block will turn on message logging. The contents and the location of the
+      log file are specified in the  <system.diagnostics> block.
+    -->
+		<!--
+    <diagnostics>
+      <messageLogging logEntireMessage="true" maxMessagesToLog="3000" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
+    </diagnostics>
+    -->
+	</system.serviceModel>
+	<!--
+  <system.diagnostics>
+		<sources>
+			<source name="System.ServiceModel" switchValue="Verbose, ActivityTracing">
+				<listeners>
+					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
+					<add name="ServiceModel Listener"/>
+				</listeners>
+			</source>
+			<source name="System.ServiceModel.MessageLogging">
+				<listeners>
+					<add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
+					<add name="ServiceModel Listener"/>
+				</listeners>
+			</source>
+		</sources>
+		<sharedListeners>
+			<add initializeData="Quickstarts.ReferenceClient.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModel Listener" traceOutputOptions="LogicalOperationStack, DateTime, Timestamp, ProcessId, ThreadId, Callstack"/>
+    </sharedListeners> 
+  </system.diagnostics>
+  -->
+	<Quickstarts.ReferenceClient>
+		<ConfigurationLocation xmlns="http://opcfoundation.org/UA/SDK/Configuration.xsd">
+			<FilePath>Quickstarts.ReferenceClient.Config.xml</FilePath>
+		</ConfigurationLocation>
+	</Quickstarts.ReferenceClient>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
+  <runtime>
+  </runtime>
+</configuration>
diff --git a/Samples/ReferenceClient/App.ico b/Samples/ReferenceClient/App.ico