more fixes

romanett · romanett · commit 5ae448eba41a · 2025-08-24T17:57:22.000+02:00
diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj
@@ -135,7 +135,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>9.0.6</Version>
+      <Version>9.0.8</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
       <Version>1.5.377.5-preview</Version>
diff --git a/Samples/ClientControls.Net4/Common/Client/ConnectServerCtrl.cs b/Samples/ClientControls.Net4/Common/Client/ConnectServerCtrl.cs
@@ -332,7 +332,7 @@ private async Task<Session> Connect(
             {
                 UpdateStatus(false, DateTime.Now, "Connected, loading complex type system.");
                 var typeSystemLoader = new ComplexTypeSystem(m_session);
-                await typeSystemLoader.Load();
+                await typeSystemLoader.LoadAsync();
             }
             catch (Exception e)
             {
@@ -400,7 +400,7 @@ private async Task<Session> Connect(
             {
                 UpdateStatus(false, DateTime.Now, "Connected, loading complex type system.");
                 var typeSystemLoader = new ComplexTypeSystem(m_session);
-                await typeSystemLoader.Load();
+                await typeSystemLoader.LoadAsync();
             }
             catch (Exception e)
             {
diff --git a/Samples/ClientControls.Net4/Configuration/CertificateDlg.cs b/Samples/ClientControls.Net4/Configuration/CertificateDlg.cs
@@ -65,12 +65,12 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificateIdentifier)
 
             if (certificateIdentifier != null)
             {
-                X509Certificate2 certificate = await certificateIdentifier.Find();
+                X509Certificate2 certificate = await certificateIdentifier.FindAsync();
 
                 CertificateStoreCTRL.StoreType = certificateIdentifier.StoreType;
                 CertificateStoreCTRL.StorePath = certificateIdentifier.StorePath;
 
-                if (certificate != null && certificateIdentifier.Find(true) != null)
+                if (certificate != null && await certificateIdentifier.FindAsync(true) != null)
                 {
                     PrivateKeyCB.SelectedIndex = 1;
                 }
diff --git a/Samples/ClientControls.Net4/Configuration/CertificateListCtrl.cs b/Samples/ClientControls.Net4/Configuration/CertificateListCtrl.cs
@@ -228,7 +228,7 @@ internal async Task Initialize(CertificateStoreIdentifier id, IList<string> thum
 
                         foreach (string thumbprint in thumbprints)
                         {
-                            X509Certificate2Collection certificates = await store.FindByThumbprint(thumbprint);
+                            X509Certificate2Collection certificates = await store.FindByThumbprintAsync(thumbprint);
 
                             if (certificates.Count > 0)
                             {
@@ -242,7 +242,7 @@ internal async Task Initialize(CertificateStoreIdentifier id, IList<string> thum
                     {
                         Instructions = "No certificates are in the store.";
 
-                        X509Certificate2Collection certificates = await store.Enumerate();
+                        X509Certificate2Collection certificates = await store.EnumerateAsync();
                         foreach (X509Certificate2 certificate in certificates)
                         {
                             AddItem(certificate);
@@ -457,7 +457,7 @@ private async void DeleteMI_Click(object sender, EventArgs e)
                         X509Certificate2 certificate = ItemsLV.SelectedItems[ii].Tag as X509Certificate2;
 
                         // check for private key.
-                        X509Certificate2Collection certificate2 = await store.FindByThumbprint(certificate.Thumbprint);
+                        X509Certificate2Collection certificate2 = await store.FindByThumbprintAsync(certificate.Thumbprint);
 
                         if (!yesToAll && (certificate2.Count > 0) && certificate2[0].HasPrivateKey)
                         {
@@ -482,7 +482,7 @@ private async void DeleteMI_Click(object sender, EventArgs e)
 
                         if (certificate != null)
                         {
-                            await store.Delete(certificate.Thumbprint);
+                            await store.DeleteAsync(certificate.Thumbprint);
                             itemsToDelete.Add(ItemsLV.SelectedItems[ii]);
                         }
                     }
@@ -559,7 +559,7 @@ private void PasteMI_Click(object sender, EventArgs e)
                 {
                     using (ICertificateStore store = m_storeId.OpenStore())
                     {
-                        store.Add(id.Certificate);
+                        store.AddAsync(id.Certificate);
                     }
 
                     AddItem(id.Certificate);
diff --git a/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs b/Samples/ClientControls.Net4/Configuration/CertificateStoreTreeCtrl.cs
@@ -313,7 +313,7 @@ protected override void NodesTV_DragDrop(object sender, DragEventArgs e)
 
                             if (certificate != null)
                             {
-                                store.Add(certificate);
+                                store.AddAsync(certificate);
                             }
                         }
                     }
@@ -479,7 +479,7 @@ private void PasteMI_Click(object sender, EventArgs e)
 
                         using (ICertificateStore store = storeId.OpenStore())
                         {
-                            store.Add(id.Certificate);
+                            store.AddAsync(id.Certificate);
                         }
                     }
 
diff --git a/Samples/ClientControls.Net4/Configuration/ViewCertificateDlg.cs b/Samples/ClientControls.Net4/Configuration/ViewCertificateDlg.cs
@@ -86,7 +86,7 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificate)
                 SubjectNameTB.Text = certificate.SubjectName;
                 ThumbprintTB.Text = certificate.Thumbprint;
 
-                X509Certificate2 data = await certificate.Find();
+                X509Certificate2 data = await certificate.FindAsync();
 
                 if (data != null)
                 {
@@ -219,7 +219,7 @@ private async void ExportBTN_Click(object sender, EventArgs e)
                     m_currentDirectory = Environment.CurrentDirectory;
                 }
 
-                X509Certificate2 certificate = await m_certificate.Find();
+                X509Certificate2 certificate = await m_certificate.FindAsync();
 
                 if (certificate == null)
                 {
diff --git a/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs b/Samples/Opc.Ua.Sample/SampleServer.UserAuthentication.cs
@@ -68,7 +68,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration
         /// <summary>
         /// Called when a client tries to change its user identity.
         /// </summary>
-        private void SessionManager_ImpersonateUser(Session session, ImpersonateEventArgs args)
+        private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventArgs args)
         {
             // check for a WSS token.
             IssuedIdentityToken wssToken = args.NewIdentity as IssuedIdentityToken;
diff --git a/Samples/Server.Net4/UA Sample Server.csproj b/Samples/Server.Net4/UA Sample Server.csproj
@@ -143,7 +143,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>9.0.6</Version>
+      <Version>9.0.8</Version>
     </PackageReference>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
       <Version>1.5.377.5-preview</Version>

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ private async Task<Session> Connect(`
`332`	`332`	`{`
`333`	`333`	`UpdateStatus(false, DateTime.Now, "Connected, loading complex type system.");`
`334`	`334`	`var typeSystemLoader = new ComplexTypeSystem(m_session);`
`335`		`- await typeSystemLoader.Load();`
	`335`	`+ await typeSystemLoader.LoadAsync();`
`336`	`336`	`}`
`337`	`337`	`catch (Exception e)`
`338`	`338`	`{`
`@@ -400,7 +400,7 @@ private async Task<Session> Connect(`
`400`	`400`	`{`
`401`	`401`	`UpdateStatus(false, DateTime.Now, "Connected, loading complex type system.");`
`402`	`402`	`var typeSystemLoader = new ComplexTypeSystem(m_session);`
`403`		`- await typeSystemLoader.Load();`
	`403`	`+ await typeSystemLoader.LoadAsync();`
`404`	`404`	`}`
`405`	`405`	`catch (Exception e)`
`406`	`406`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificateIdentifier)`
`65`	`65`
`66`	`66`	`if (certificateIdentifier != null)`
`67`	`67`	`{`
`68`		`- X509Certificate2 certificate = await certificateIdentifier.Find();`
	`68`	`+ X509Certificate2 certificate = await certificateIdentifier.FindAsync();`
`69`	`69`
`70`	`70`	`CertificateStoreCTRL.StoreType = certificateIdentifier.StoreType;`
`71`	`71`	`CertificateStoreCTRL.StorePath = certificateIdentifier.StorePath;`
`72`	`72`
`73`		`- if (certificate != null && certificateIdentifier.Find(true) != null)`
	`73`	`+ if (certificate != null && await certificateIdentifier.FindAsync(true) != null)`
`74`	`74`	`{`
`75`	`75`	`PrivateKeyCB.SelectedIndex = 1;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ internal async Task Initialize(CertificateStoreIdentifier id, IList<string> thum`
`228`	`228`
`229`	`229`	`foreach (string thumbprint in thumbprints)`
`230`	`230`	`{`
`231`		`- X509Certificate2Collection certificates = await store.FindByThumbprint(thumbprint);`
	`231`	`+ X509Certificate2Collection certificates = await store.FindByThumbprintAsync(thumbprint);`
`232`	`232`
`233`	`233`	`if (certificates.Count > 0)`
`234`	`234`	`{`
`@@ -242,7 +242,7 @@ internal async Task Initialize(CertificateStoreIdentifier id, IList<string> thum`
`242`	`242`	`{`
`243`	`243`	`Instructions = "No certificates are in the store.";`
`244`	`244`
`245`		`- X509Certificate2Collection certificates = await store.Enumerate();`
	`245`	`+ X509Certificate2Collection certificates = await store.EnumerateAsync();`
`246`	`246`	`foreach (X509Certificate2 certificate in certificates)`
`247`	`247`	`{`
`248`	`248`	`AddItem(certificate);`
`@@ -457,7 +457,7 @@ private async void DeleteMI_Click(object sender, EventArgs e)`
`457`	`457`	`X509Certificate2 certificate = ItemsLV.SelectedItems[ii].Tag as X509Certificate2;`
`458`	`458`
`459`	`459`	`// check for private key.`
`460`		`- X509Certificate2Collection certificate2 = await store.FindByThumbprint(certificate.Thumbprint);`
	`460`	`+ X509Certificate2Collection certificate2 = await store.FindByThumbprintAsync(certificate.Thumbprint);`
`461`	`461`
`462`	`462`	`if (!yesToAll && (certificate2.Count > 0) && certificate2[0].HasPrivateKey)`
`463`	`463`	`{`
`@@ -482,7 +482,7 @@ private async void DeleteMI_Click(object sender, EventArgs e)`
`482`	`482`
`483`	`483`	`if (certificate != null)`
`484`	`484`	`{`
`485`		`- await store.Delete(certificate.Thumbprint);`
	`485`	`+ await store.DeleteAsync(certificate.Thumbprint);`
`486`	`486`	`itemsToDelete.Add(ItemsLV.SelectedItems[ii]);`
`487`	`487`	`}`
`488`	`488`	`}`
`@@ -559,7 +559,7 @@ private void PasteMI_Click(object sender, EventArgs e)`
`559`	`559`	`{`
`560`	`560`	`using (ICertificateStore store = m_storeId.OpenStore())`
`561`	`561`	`{`
`562`		`- store.Add(id.Certificate);`
	`562`	`+ store.AddAsync(id.Certificate);`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`AddItem(id.Certificate);`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected override void NodesTV_DragDrop(object sender, DragEventArgs e)`
`313`	`313`
`314`	`314`	`if (certificate != null)`
`315`	`315`	`{`
`316`		`- store.Add(certificate);`
	`316`	`+ store.AddAsync(certificate);`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`	`}`
`@@ -479,7 +479,7 @@ private void PasteMI_Click(object sender, EventArgs e)`
`479`	`479`
`480`	`480`	`using (ICertificateStore store = storeId.OpenStore())`
`481`	`481`	`{`
`482`		`- store.Add(id.Certificate);`
	`482`	`+ store.AddAsync(id.Certificate);`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificate)`
`86`	`86`	`SubjectNameTB.Text = certificate.SubjectName;`
`87`	`87`	`ThumbprintTB.Text = certificate.Thumbprint;`
`88`	`88`
`89`		`- X509Certificate2 data = await certificate.Find();`
	`89`	`+ X509Certificate2 data = await certificate.FindAsync();`
`90`	`90`
`91`	`91`	`if (data != null)`
`92`	`92`	`{`
`@@ -219,7 +219,7 @@ private async void ExportBTN_Click(object sender, EventArgs e)`
`219`	`219`	`m_currentDirectory = Environment.CurrentDirectory;`
`220`	`220`	`}`
`221`	`221`
`222`		`- X509Certificate2 certificate = await m_certificate.Find();`
	`222`	`+ X509Certificate2 certificate = await m_certificate.FindAsync();`
`223`	`223`
`224`	`224`	`if (certificate == null)`
`225`	`225`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration`
`68`	`68`	`/// <summary>`
`69`	`69`	`/// Called when a client tries to change its user identity.`
`70`	`70`	`/// </summary>`
`71`		`- private void SessionManager_ImpersonateUser(Session session, ImpersonateEventArgs args)`
	`71`	`+ private void SessionManager_ImpersonateUser(ISession session, ImpersonateEventArgs args)`
`72`	`72`	`{`
`73`	`73`	`// check for a WSS token.`
`74`	`74`	`IssuedIdentityToken wssToken = args.NewIdentity as IssuedIdentityToken;`