Update Nuget Packages for 375 Release (#657)

* fix build * Update GDS * Upgrade Aggregation * Update Quickstart samples * Update samples
OPCFoundation · Feb 17, 2025 · 54f0dc8 · 54f0dc8
1 parent b9e0ad2
commit 54f0dc8
Show file tree

Hide file tree

Showing 71 changed files with 111 additions and 104 deletions.
diff --git a/Samples/Client.Net4/Program.cs b/Samples/Client.Net4/Program.cs
@@ -56,7 +56,7 @@ static void Main()
                 application.LoadApplicationConfiguration(false).Wait();
 
                 // check the application certificate.
-                bool certOK = application.CheckApplicationInstanceCertificate(false, 0).Result;
+                bool certOK = application.CheckApplicationInstanceCertificates(false).Result;
                 if (!certOK)
                 {
                     throw new Exception("Application instance certificate invalid!");

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.2</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</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.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</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.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/GDS/Client/Program.cs b/Samples/GDS/Client/Program.cs
@@ -1,4 +1,4 @@
-/* ========================================================================
+/* ========================================================================
  * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
@@ -57,7 +57,7 @@ static void Main()
                 ApplicationConfiguration config = application.LoadApplicationConfiguration(false).Result;
 
                 // check the application certificate.
-                application.CheckApplicationInstanceCertificate(false, 0).Wait();
+                application.CheckApplicationInstanceCertificates(false).Wait();
 
                 // run the application interactively.
                 Application.Run(new MainForm(application));

diff --git a/Samples/GDS/ClientControls/Controls/SelectGdsDialog.cs b/Samples/GDS/ClientControls/Controls/SelectGdsDialog.cs
@@ -1,4 +1,4 @@
-/* ========================================================================
+/* ========================================================================
  * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
@@ -92,11 +92,11 @@ private void OkButton_Click(object sender, EventArgs e)
                 {
                     Cursor = Cursors.WaitCursor;
 
-                    var endpoint = CoreClientUtils.SelectEndpoint(url, true, 5000);
+                    var endpoint = CoreClientUtils.SelectEndpoint(m_gds.Configuration, url, true, 5000);
 
                     if (UserNameCredentialsRB.Checked)
                     {
-                        if (endpoint.FindUserTokenPolicy(UserTokenType.UserName, (string)null) == null)
+                        if (endpoint.FindUserTokenPolicy(UserTokenType.UserName, (string)null, null) == null)
                         {
                             throw new ArgumentException("Server does not support username/password user identity tokens.");
                         }

diff --git a/Samples/GDS/ClientControls/Controls/SelectPushServerDialog.cs b/Samples/GDS/ClientControls/Controls/SelectPushServerDialog.cs
@@ -1,4 +1,4 @@
-/* ========================================================================
+/* ========================================================================
  * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
@@ -92,11 +92,11 @@ private void OkButton_Click(object sender, EventArgs e)
                 {
                     Cursor = Cursors.WaitCursor;
 
-                    var endpoint = CoreClientUtils.SelectEndpoint(url, false, 5000);
+                    var endpoint = CoreClientUtils.SelectEndpoint(m_pushServer.Configuration, url, false, 5000);
 
                     if (UserNameCredentialsRB.Checked)
                     {
-                        if (endpoint.FindUserTokenPolicy(UserTokenType.UserName, (string)null) == null)
+                        if (endpoint.FindUserTokenPolicy(UserTokenType.UserName, (string)null, null) == null)
                         {
                             throw new ArgumentException("Server does not support username/password user identity tokens.");
                         }

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.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</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.21.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.1" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.374.126" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.126" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.375.443" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.375.443" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/GDS/ConsoleServer/Program.cs b/Samples/GDS/ConsoleServer/Program.cs
@@ -227,7 +227,7 @@ private async Task ConsoleGlobalDiscoveryServer()
             ApplicationConfiguration config = await application.LoadApplicationConfiguration(false).ConfigureAwait(false);
 
             // check the application certificate.
-            bool haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, 0).ConfigureAwait(false);
+            bool haveAppCertificate = await application.CheckApplicationInstanceCertificates(false).ConfigureAwait(false);
             if (!haveAppCertificate)
             {
                 throw new Exception("Application instance certificate invalid!");

diff --git a/Samples/GDS/Server/GlobalDiscoveryServer.csproj b/Samples/GDS/Server/GlobalDiscoveryServer.csproj
@@ -235,10 +235,10 @@
       <Version>6.5.1</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/Samples/GDS/Server/Program.cs b/Samples/GDS/Server/Program.cs
@@ -64,7 +64,7 @@ static void Main()
                 var config = application.LoadApplicationConfiguration(false).Result;
 
                 // check the application certificate.
-                bool haveAppCertificate = application.CheckApplicationInstanceCertificate(false, 0).Result;
+                bool haveAppCertificate = application.CheckApplicationInstanceCertificates(false).Result;
                 if (!haveAppCertificate)
                 {
                     throw new Exception("Application instance certificate invalid!");

diff --git a/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs b/Samples/Opc.Ua.Sample/Base/DataChangeMonitoredItem.cs
@@ -668,6 +668,15 @@ public DataChangeFilter DataChangeFilter
             get { return m_filter; }
         }
 
+        public IUserIdentity EffectiveIdentity
+        {
+            get
+            {
+                ISubscription subscription = m_subscription;
+                return subscription?.EffectiveIdentity;
+            }
+        }
+
         /// <summary>
         /// Increments the sample time to the next interval.
         /// </summary>

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.118" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.374.118" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.375.443" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.375.443" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs b/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs
@@ -52,8 +52,8 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration
                     if (configuration.SecurityConfiguration.TrustedUserCertificates != null &&
                         configuration.SecurityConfiguration.UserIssuerCertificates != null)
                     {
-                        CertificateValidator certificateValidator = new CertificateValidator();
-                        certificateValidator.Update(configuration.SecurityConfiguration).Wait();
+                        var certificateValidator = new CertificateValidator();
+                        certificateValidator.UpdateAsync(configuration.SecurityConfiguration, configuration.ApplicationUri).Wait();
                         certificateValidator.Update(configuration.SecurityConfiguration.UserIssuerCertificates,
                             configuration.SecurityConfiguration.TrustedUserCertificates,
                             configuration.SecurityConfiguration.RejectedCertificateStore);

diff --git a/Samples/ReferenceClient/Program.cs b/Samples/ReferenceClient/Program.cs
@@ -60,7 +60,7 @@ static void Main()
                 application.LoadApplicationConfiguration(false).Wait();
 
                 // check the application certificate.
-                var certOK = application.CheckApplicationInstanceCertificate(false, 0).Result;
+                var certOK = application.CheckApplicationInstanceCertificates(false).Result;
                 if (!certOK)
                 {
                     throw new Exception("Application instance certificate invalid!");

diff --git a/Samples/ReferenceClient/Reference Client.csproj b/Samples/ReferenceClient/Reference Client.csproj
@@ -127,16 +127,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/Samples/ReferenceServer/Program.cs b/Samples/ReferenceServer/Program.cs
@@ -66,7 +66,7 @@ static void Main()
                 SerilogTraceLogger.Create(loggerConfiguration, config);
 
                 // check the application certificate.
-                bool certOk = application.CheckApplicationInstanceCertificate(false, 0).Result;
+                bool certOk = application.CheckApplicationInstanceCertificates(false).Result;
                 if (!certOk)
                 {
                     throw new Exception("Application instance certificate invalid!");

diff --git a/Samples/ReferenceServer/Reference Server.csproj b/Samples/ReferenceServer/Reference Server.csproj
@@ -139,16 +139,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.374.118</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.118</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Quickstarts.Servers">
       <Version>1.5.374.118</Version>
     </PackageReference>
     <PackageReference Include="Serilog">
-      <Version>4.0.0</Version>
+      <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Debug">
       <Version>3.0.0</Version>

diff --git a/Samples/Server.Net4/Program.cs b/Samples/Server.Net4/Program.cs
@@ -57,7 +57,7 @@ static void Main()
                 application.LoadApplicationConfiguration(false).Wait();
 
                 // check the application certificate.
-                bool certOK = application.CheckApplicationInstanceCertificate(false, 0).Result;
+                bool certOK = application.CheckApplicationInstanceCertificates(false).Result;
                 if (!certOK)
                 {
                     throw new Exception("Application instance certificate invalid!");

diff --git a/Samples/Server.Net4/UA Sample Server.csproj b/Samples/Server.Net4/UA Sample Server.csproj
@@ -146,7 +146,7 @@
       <Version>8.0.2</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/Samples/ServerControls.Net4/UA Server Controls.csproj b/Samples/ServerControls.Net4/UA Server Controls.csproj
@@ -148,13 +148,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Workshop/Aggregation/Client/Aggregation Client.csproj b/Workshop/Aggregation/Client/Aggregation Client.csproj
@@ -134,7 +134,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
@@ -48,15 +48,15 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration.Debug" Version="1.5.374.118" />
-        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.Debug" Version="1.5.374.118" />
-        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server.Debug" Version="1.5.374.118" />
+        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration.Debug" Version="1.5.375.443" />
+        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.Debug" Version="1.5.375.443" />
+        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server.Debug" Version="1.5.375.443" />
       </ItemGroup>
     </Otherwise>
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Workshop/Aggregation/ConsoleAggregationServer/Program.cs b/Workshop/Aggregation/ConsoleAggregationServer/Program.cs
@@ -150,7 +150,7 @@ private async Task ConsoleAggregationServer()
             ApplicationConfiguration config = await application.LoadApplicationConfiguration(false).ConfigureAwait(false);
 
             // check the application certificate.
-            bool haveAppCertificate = await application.CheckApplicationInstanceCertificate(false, CertificateFactory.DefaultKeySize).ConfigureAwait(false);
+            bool haveAppCertificate = await application.CheckApplicationInstanceCertificates(false).ConfigureAwait(false);
             if (!haveAppCertificate)
             {
                 throw new Exception("Application instance certificate invalid!");

diff --git a/Workshop/Aggregation/Server/Aggregation Server.csproj b/Workshop/Aggregation/Server/Aggregation Server.csproj
@@ -129,16 +129,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Workshop/Aggregation/Server/Program.cs b/Workshop/Aggregation/Server/Program.cs
@@ -63,7 +63,7 @@ static async Task MyMain()
                 await application.LoadApplicationConfiguration(false);
 
                 // check the application certificate.
-                await application.CheckApplicationInstanceCertificate(false, 0);
+                await application.CheckApplicationInstanceCertificates(false);
 
                 // start the server.
                 await application.Start(new AggregationServer());

diff --git a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj
@@ -215,7 +215,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
-      <Version>1.5.374.126</Version>
+      <Version>1.5.375.443</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Workshop/AlarmCondition/Client/Program.cs b/Workshop/AlarmCondition/Client/Program.cs
@@ -66,7 +66,7 @@ static void Main()
                 application.LoadApplicationConfiguration(false).Wait();
 
                 // check the application certificate.
-                application.CheckApplicationInstanceCertificate(false, 0).Wait();
+                application.CheckApplicationInstanceCertificates(false).Wait();
 
                 // run the application interactively.
                 Application.Run(new MainForm(application.ApplicationConfiguration));