diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj index 9f1f3167..db5d7bf5 100644 --- a/ComIOP/Common/UA COM Interop Library.csproj +++ b/ComIOP/Common/UA COM Interop Library.csproj @@ -1,4 +1,4 @@ - + Debug @@ -265,13 +265,13 @@ - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 diff --git a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj index 76b7230c..59b40f47 100644 --- a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj +++ b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj @@ -1,4 +1,4 @@ - + Debug @@ -140,7 +140,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Samples/Client.Net4/UA Sample Client.csproj b/Samples/Client.Net4/UA Sample Client.csproj index 8a20efd7..c84f2a99 100644 --- a/Samples/Client.Net4/UA Sample Client.csproj +++ b/Samples/Client.Net4/UA Sample Client.csproj @@ -1,4 +1,4 @@ - + Debug @@ -138,7 +138,7 @@ 8.0.0 - 1.5.373.121 + 1.5.374.36 4.3.4 diff --git a/Samples/Client/Opc.Ua.SampleClient.csproj b/Samples/Client/Opc.Ua.SampleClient.csproj index 45dfbcb4..1e19c268 100644 --- a/Samples/Client/Opc.Ua.SampleClient.csproj +++ b/Samples/Client/Opc.Ua.SampleClient.csproj @@ -1,4 +1,4 @@ - + @@ -189,4 +189,4 @@ --> - + \ No newline at end of file diff --git a/Samples/ClientControls.Net4/UA Client Controls.csproj b/Samples/ClientControls.Net4/UA Client Controls.csproj index cac2b3a8..73f4df1a 100644 --- a/Samples/ClientControls.Net4/UA Client Controls.csproj +++ b/Samples/ClientControls.Net4/UA Client Controls.csproj @@ -1015,16 +1015,16 @@ - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 diff --git a/Samples/ClientControls/Opc.Ua.Client.Controls.csproj b/Samples/ClientControls/Opc.Ua.Client.Controls.csproj index a0a898f6..34a89be1 100644 --- a/Samples/ClientControls/Opc.Ua.Client.Controls.csproj +++ b/Samples/ClientControls/Opc.Ua.Client.Controls.csproj @@ -1,4 +1,4 @@ - + @@ -290,4 +290,4 @@ --> - + \ No newline at end of file diff --git a/Samples/Controls.Net4/UA Sample Controls.csproj b/Samples/Controls.Net4/UA Sample Controls.csproj index b16d10d2..007384b0 100644 --- a/Samples/Controls.Net4/UA Sample Controls.csproj +++ b/Samples/Controls.Net4/UA Sample Controls.csproj @@ -1,4 +1,4 @@ - + Debug @@ -708,7 +708,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs b/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs index c2095a8b..0dec9284 100644 --- a/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs +++ b/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs @@ -93,8 +93,7 @@ public ApplicationCertificateControl() } else if (!String.IsNullOrEmpty(application.CertificateStorePath)) { - CertificateIdentifier id = new CertificateIdentifier - { + CertificateIdentifier id = new CertificateIdentifier { StorePath = application.CertificateStorePath }; id.StoreType = CertificateStoreIdentifier.DetermineStoreType(id.StorePath); @@ -125,8 +124,7 @@ public ApplicationCertificateControl() { Uri url = new Uri(disoveryUrl); - CertificateIdentifier id = new CertificateIdentifier() - { + CertificateIdentifier id = new CertificateIdentifier() { StoreType = CertificateStoreType.X509Store, StorePath = "CurrentUser\\UA_MachineDefault", SubjectName = "CN=" + url.DnsSafeHost @@ -216,11 +214,10 @@ private async Task RequestNewCertificatePullMode(object sender, EventArgs e) NodeId requestId = null; if (!string.IsNullOrEmpty(m_application.CertificateStorePath)) { - CertificateIdentifier id = new CertificateIdentifier - { + CertificateIdentifier id = new CertificateIdentifier { StoreType = CertificateStoreIdentifier.DetermineStoreType(m_application.CertificateStorePath), StorePath = m_application.CertificateStorePath, - SubjectName = m_application.CertificateSubjectName.Replace("localhost", Utils.GetHostName()) + SubjectName = Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName) }; m_certificate = await id.Find(true); if (m_certificate != null && @@ -245,7 +242,7 @@ private async Task RequestNewCertificatePullMode(object sender, EventArgs e) m_application.ApplicationId, NodeId.Null, NodeId.Null, - m_application.CertificateSubjectName.Replace("localhost", Utils.GetHostName()), + Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName), domainNames, "PFX", m_certificatePassword); @@ -316,15 +313,14 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e) if (!String.IsNullOrEmpty(m_application.CertificateStorePath) && !String.IsNullOrEmpty(m_application.CertificateSubjectName)) { - CertificateIdentifier cid = new CertificateIdentifier() - { + CertificateIdentifier cid = new CertificateIdentifier() { StorePath = m_application.CertificateStorePath, StoreType = CertificateStoreIdentifier.DetermineStoreType(m_application.CertificateStorePath), - SubjectName = m_application.CertificateSubjectName.Replace("localhost", Utils.GetHostName()) + SubjectName = Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName) }; // update store - using (var store = CertificateStoreIdentifier.OpenStore(m_application.CertificateStorePath)) + using (ICertificateStore store = CertificateStoreIdentifier.OpenStore(m_application.CertificateStorePath, false)) { // if we used a CSR, we already have a private key and therefore didn't request one from the GDS // in this case, privateKey is null @@ -347,8 +343,6 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e) newCert = new X509Certificate2(privateKeyPFX, string.Empty, X509KeyStorageFlags.Exportable); newCert = CertificateFactory.Load(newCert, true); } - - // bugbug: private key is not saved to store await store.Add(newCert); } } diff --git a/Samples/GDS/Client/GlobalDiscoveryClient.csproj b/Samples/GDS/Client/GlobalDiscoveryClient.csproj index 69d9fd6f..2c71181a 100644 --- a/Samples/GDS/Client/GlobalDiscoveryClient.csproj +++ b/Samples/GDS/Client/GlobalDiscoveryClient.csproj @@ -139,10 +139,10 @@ - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 4.3.4 diff --git a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj index 53746236..d05c67bd 100644 --- a/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj +++ b/Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj @@ -217,10 +217,10 @@ - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 diff --git a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj index f11952c5..a50e13b1 100644 --- a/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj +++ b/Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Samples/GDS/Server/GlobalDiscoveryServer.csproj b/Samples/GDS/Server/GlobalDiscoveryServer.csproj index b0f7e35b..78b4231f 100644 --- a/Samples/GDS/Server/GlobalDiscoveryServer.csproj +++ b/Samples/GDS/Server/GlobalDiscoveryServer.csproj @@ -235,10 +235,10 @@ 6.4.4 - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 diff --git a/Samples/GDS/Server/SqlApplicationsDatabase.cs b/Samples/GDS/Server/SqlApplicationsDatabase.cs index 61afb128..050ddedf 100644 --- a/Samples/GDS/Server/SqlApplicationsDatabase.cs +++ b/Samples/GDS/Server/SqlApplicationsDatabase.cs @@ -169,6 +169,11 @@ public override void UnregisterApplication(NodeId applicationId) entities.CertificateRequests.Remove(entry); } + foreach (var entry in new List(result.CertificateStores)) + { + entities.CertificateStores.Remove(entry); + } + foreach (var entry in new List(result.ApplicationNames)) { entities.ApplicationNames.Remove(entry); diff --git a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj index be22a936..b7fb0ea0 100644 --- a/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj +++ b/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj @@ -23,7 +23,7 @@ - + diff --git a/Samples/Server.Net4/UA Sample Server.csproj b/Samples/Server.Net4/UA Sample Server.csproj index 492f3f76..d1be2edb 100644 --- a/Samples/Server.Net4/UA Sample Server.csproj +++ b/Samples/Server.Net4/UA Sample Server.csproj @@ -1,4 +1,4 @@ - + Debug @@ -146,7 +146,7 @@ 8.0.0 - 1.5.373.121 + 1.5.374.36 diff --git a/Samples/Server/Opc.Ua.SampleServer.csproj b/Samples/Server/Opc.Ua.SampleServer.csproj index 634314f0..e9bb5d22 100644 --- a/Samples/Server/Opc.Ua.SampleServer.csproj +++ b/Samples/Server/Opc.Ua.SampleServer.csproj @@ -1,4 +1,4 @@ - + @@ -185,4 +185,4 @@ --> - + \ No newline at end of file diff --git a/Samples/ServerControls.Net4/UA Server Controls.csproj b/Samples/ServerControls.Net4/UA Server Controls.csproj index 61ac3a5a..6d87aed8 100644 --- a/Samples/ServerControls.Net4/UA Server Controls.csproj +++ b/Samples/ServerControls.Net4/UA Server Controls.csproj @@ -148,13 +148,13 @@ - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 - 1.5.374.27 + 1.5.374.36 diff --git a/Workshop/Aggregation/Client/Aggregation Client.csproj b/Workshop/Aggregation/Client/Aggregation Client.csproj index fe8e41f4..57958bb0 100644 --- a/Workshop/Aggregation/Client/Aggregation Client.csproj +++ b/Workshop/Aggregation/Client/Aggregation Client.csproj @@ -1,4 +1,4 @@ - + Debug @@ -134,7 +134,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj index 0eb83ca6..7668ce78 100644 --- a/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj +++ b/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj @@ -48,9 +48,9 @@ - - - + + + diff --git a/Workshop/Aggregation/Server/Aggregation Server.csproj b/Workshop/Aggregation/Server/Aggregation Server.csproj index 67a11e85..b6899202 100644 --- a/Workshop/Aggregation/Server/Aggregation Server.csproj +++ b/Workshop/Aggregation/Server/Aggregation Server.csproj @@ -1,4 +1,4 @@ - + Debug @@ -129,16 +129,16 @@ - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj index afe73fca..c743a318 100644 --- a/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj +++ b/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj @@ -215,7 +215,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj index 61994705..9c6c8164 100644 --- a/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj +++ b/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj @@ -178,7 +178,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Boiler/Client/Boiler Client.csproj b/Workshop/Boiler/Client/Boiler Client.csproj index 97cf8207..e5ab7355 100644 --- a/Workshop/Boiler/Client/Boiler Client.csproj +++ b/Workshop/Boiler/Client/Boiler Client.csproj @@ -141,7 +141,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Boiler/Server/Boiler Server.csproj b/Workshop/Boiler/Server/Boiler Server.csproj index e762a6ed..da534d17 100644 --- a/Workshop/Boiler/Server/Boiler Server.csproj +++ b/Workshop/Boiler/Server/Boiler Server.csproj @@ -139,7 +139,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Common/Quickstart Library.csproj b/Workshop/Common/Quickstart Library.csproj index bc83c59a..c4027f04 100644 --- a/Workshop/Common/Quickstart Library.csproj +++ b/Workshop/Common/Quickstart Library.csproj @@ -131,7 +131,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/DataAccess/Client/DataAccess Client.csproj b/Workshop/DataAccess/Client/DataAccess Client.csproj index f737dc17..9e00f5cc 100644 --- a/Workshop/DataAccess/Client/DataAccess Client.csproj +++ b/Workshop/DataAccess/Client/DataAccess Client.csproj @@ -183,7 +183,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/DataAccess/Server/DataAccess Server.csproj b/Workshop/DataAccess/Server/DataAccess Server.csproj index 9886fc55..b81bb6a5 100644 --- a/Workshop/DataAccess/Server/DataAccess Server.csproj +++ b/Workshop/DataAccess/Server/DataAccess Server.csproj @@ -166,7 +166,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/DataTypes/Client/DataTypes Client.csproj b/Workshop/DataTypes/Client/DataTypes Client.csproj index fc4fcc7e..ce0fa291 100644 --- a/Workshop/DataTypes/Client/DataTypes Client.csproj +++ b/Workshop/DataTypes/Client/DataTypes Client.csproj @@ -123,7 +123,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/DataTypes/Common/DataTypes Library.csproj b/Workshop/DataTypes/Common/DataTypes Library.csproj index 7444f115..ca209152 100644 --- a/Workshop/DataTypes/Common/DataTypes Library.csproj +++ b/Workshop/DataTypes/Common/DataTypes Library.csproj @@ -102,7 +102,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/DataTypes/Server/DataTypes Server.csproj b/Workshop/DataTypes/Server/DataTypes Server.csproj index b7c74cb6..40b17d07 100644 --- a/Workshop/DataTypes/Server/DataTypes Server.csproj +++ b/Workshop/DataTypes/Server/DataTypes Server.csproj @@ -143,7 +143,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Empty/Client/Empty Client.csproj b/Workshop/Empty/Client/Empty Client.csproj index 46f49ce3..5bb7be97 100644 --- a/Workshop/Empty/Client/Empty Client.csproj +++ b/Workshop/Empty/Client/Empty Client.csproj @@ -132,7 +132,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Empty/Server/Empty Server.csproj b/Workshop/Empty/Server/Empty Server.csproj index 05fc09b0..fc1616cc 100644 --- a/Workshop/Empty/Server/Empty Server.csproj +++ b/Workshop/Empty/Server/Empty Server.csproj @@ -129,7 +129,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj index 73a1ecc7..98dbb86c 100644 --- a/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj +++ b/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj @@ -178,7 +178,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj index a62d65a3..16b668ef 100644 --- a/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj +++ b/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj @@ -192,7 +192,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj index d6e52c51..0ed94ad9 100644 --- a/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj +++ b/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj @@ -142,10 +142,10 @@ - 1.5.373.121 + 1.5.374.36 - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj index 1247f30c..c004cf5f 100644 --- a/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj +++ b/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj @@ -187,7 +187,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj index b9c9f92f..fd73a105 100644 --- a/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj +++ b/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj @@ -142,7 +142,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Methods/Client/Methods Client.csproj b/Workshop/Methods/Client/Methods Client.csproj index 7c3dcd99..701eab17 100644 --- a/Workshop/Methods/Client/Methods Client.csproj +++ b/Workshop/Methods/Client/Methods Client.csproj @@ -132,7 +132,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Methods/Server/Methods Server.csproj b/Workshop/Methods/Server/Methods Server.csproj index d5e9d0fb..40b64339 100644 --- a/Workshop/Methods/Server/Methods Server.csproj +++ b/Workshop/Methods/Server/Methods Server.csproj @@ -131,7 +131,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/PerfTest/Client/PerfTest Client.csproj b/Workshop/PerfTest/Client/PerfTest Client.csproj index 92dc6b38..71a75d0d 100644 --- a/Workshop/PerfTest/Client/PerfTest Client.csproj +++ b/Workshop/PerfTest/Client/PerfTest Client.csproj @@ -130,7 +130,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/PerfTest/Server/PerfTest Server.csproj b/Workshop/PerfTest/Server/PerfTest Server.csproj index 72c45944..0a25405a 100644 --- a/Workshop/PerfTest/Server/PerfTest Server.csproj +++ b/Workshop/PerfTest/Server/PerfTest Server.csproj @@ -133,7 +133,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj index ebbed733..2775f3bb 100644 --- a/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj +++ b/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj @@ -119,7 +119,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj index 25fb832e..9f582745 100644 --- a/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj +++ b/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj @@ -137,7 +137,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj index de760359..4b737d6c 100644 --- a/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj +++ b/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj @@ -125,7 +125,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj index ba7df40f..298e5e45 100644 --- a/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj +++ b/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj @@ -154,7 +154,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Views/Client/Views Client.csproj b/Workshop/Views/Client/Views Client.csproj index 2801285f..1e4de72e 100644 --- a/Workshop/Views/Client/Views Client.csproj +++ b/Workshop/Views/Client/Views Client.csproj @@ -131,7 +131,7 @@ - 1.5.373.121 + 1.5.374.36 diff --git a/Workshop/Views/Server/Views Server.csproj b/Workshop/Views/Server/Views Server.csproj index 9c44cb0e..e34a1f1d 100644 --- a/Workshop/Views/Server/Views Server.csproj +++ b/Workshop/Views/Server/Views Server.csproj @@ -145,7 +145,7 @@ - 1.5.373.121 + 1.5.374.36