Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump the opcfoundation group 1.5.374.117-preview #633

Merged
merged 7 commits into from
Sep 13, 2024
Merged

Bump the opcfoundation group 1.5.374.117-preview #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f9f99d
Bump the opcfoundation group with 11 updates
dependabot[bot] Sep 9, 2024
e33d002
bump to .117
mregen Sep 12, 2024
d53804d
fix GDS build & db creation
romanett Sep 12, 2024
360be7c
add onDelete cascade option to EF model, fix missed CertificateStore.…
romanett Sep 12, 2024
4ecedf2
fix ComDaClientNodeManager by removing reference to MonitoredItem Pro…
romanett Sep 12, 2024
52db49e
fix some store usage
mregen Sep 13, 2024
270409b
merge some more fixes
mregen Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ComIOP/Common/Client/Da/ComDaClientNodeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,6 @@ protected override ServiceResult CreateMonitoredItem(ServerSystemContext context
monitoredItem = datachangeItem;

// save the monitored item.
MonitoredItems.Add(monitoredItemId, datachangeItem);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove the line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MonitoredItems collection of the CustomNodeManager does not exist any with the new nuget Version

monitoredNode.Add(datachangeItem);

// report change.
Expand Down
6 changes: 3 additions & 3 deletions ComIOP/Common/UA COM Interop Library.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Client.Net4/UA Sample Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="System.Net.Http">
<Version>4.3.4</Version>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Client/Opc.Ua.SampleClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.373.121</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="System.Xml.XmlDocument">
<Version>4.3.0</Version>
Expand Down
8 changes: 4 additions & 4 deletions Samples/ClientControls.Net4/UA Client Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,16 +1015,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
<Version>1.5.374.78</Version>
<Version>1.5.374.114</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.374.78</Version>
<Version>1.5.374.114</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
<Version>1.5.374.78</Version>
<Version>1.5.374.114</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.374.78</Version>
<Version>1.5.374.114</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/ClientControls/Opc.Ua.Client.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.373.121</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="System.Xml.XmlDocument">
<Version>4.3.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Controls.Net4/UA Sample Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>1.5.374.78</Version>
<Version>1.5.374.114</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Controls/Opc.Ua.Sample.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<Version>6.2.14</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
<Version>1.5.373.121</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="System.Xml.XmlDocument">
<Version>4.3.0</Version>
Expand Down
6 changes: 4 additions & 2 deletions Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
};

// update store
using (ICertificateStore store = CertificateStoreIdentifier.OpenStore(m_application.CertificateStorePath, false))
var certificateStoreIdentifier = new CertificateStoreIdentifier(m_application.CertificateStorePath, false);
using (ICertificateStore store = certificateStoreIdentifier.OpenStore())
{
// 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
Expand Down Expand Up @@ -436,7 +437,8 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
// update trust list.
if (!String.IsNullOrEmpty(m_application.TrustListStorePath))
{
using (ICertificateStore store = CertificateStoreIdentifier.OpenStore(m_application.TrustListStorePath))
var certificateStoreIdentifier = new CertificateStoreIdentifier(m_application.TrustListStorePath);
using (ICertificateStore store = certificateStoreIdentifier.OpenStore())
{
foreach (byte[] issuerCertificate in issuerCertificates)
{
Expand Down
23 changes: 13 additions & 10 deletions Samples/GDS/Client/Controls/ApplicationTrustListControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ private void ReloadTrustListButton_Click(object sender, EventArgs e)
}
else
{
CertificateStoreControl.Initialize(m_trustListStorePath, m_issuerListStorePath, null);
}
CertificateStoreControl.Initialize(m_trustListStorePath, m_issuerListStorePath, null);
}
}
else
{
Expand Down Expand Up @@ -120,16 +120,12 @@ private async Task DeleteExistingFromStore(string storePath)
return;
}

using (DirectoryCertificateStore store = (DirectoryCertificateStore) CertificateStoreIdentifier.OpenStore(storePath))
var certificateStoreIdentifier = new CertificateStoreIdentifier(storePath);
using (var store = certificateStoreIdentifier.OpenStore())
{
X509Certificate2Collection certificates = await store.Enumerate();
foreach (var certificate in certificates)
{
if (store.GetPrivateKeyFilePath(certificate.Thumbprint) != null)
mregen marked this conversation as resolved.
Show resolved Hide resolved
{
continue;
}

List<string> fields = X509Utils.ParseDistinguishedName(certificate.Subject);

if (fields.Contains("CN=UA Local Discovery Server"))
Expand All @@ -140,6 +136,11 @@ private async Task DeleteExistingFromStore(string storePath)

if (store is DirectoryCertificateStore ds)
{
if (ds.GetPrivateKeyFilePath(certificate.Thumbprint) != null)
{
continue;
}

string path = Utils.GetAbsoluteFilePath(m_application.CertificatePublicKeyPath, true, false, false);

if (path != null)
Expand Down Expand Up @@ -205,7 +206,8 @@ private void PullFromGds(bool deleteBeforeAdd)

if (!String.IsNullOrEmpty(m_trustListStorePath))
{
using (ICertificateStore store = CertificateStoreIdentifier.OpenStore(m_trustListStorePath))
var certificateStoreIdentifier = new CertificateStoreIdentifier(m_trustListStorePath);
using (ICertificateStore store = certificateStoreIdentifier.OpenStore())
{
if ((trustList.SpecifiedLists & (uint)Opc.Ua.TrustListMasks.TrustedCertificates) != 0)
{
Expand Down Expand Up @@ -233,7 +235,8 @@ private void PullFromGds(bool deleteBeforeAdd)

if (!String.IsNullOrEmpty(m_application.IssuerListStorePath))
{
using (ICertificateStore store = CertificateStoreIdentifier.OpenStore(m_application.IssuerListStorePath))
var certificateStoreIdentifier = new CertificateStoreIdentifier(m_application.IssuerListStorePath);
using (ICertificateStore store = certificateStoreIdentifier.OpenStore())
{
if ((trustList.SpecifiedLists & (uint)Opc.Ua.TrustListMasks.IssuerCertificates) != 0)
{
Expand Down
7 changes: 2 additions & 5 deletions Samples/GDS/Client/GlobalDiscoveryClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
<Version>1.5.374.78</Version>
</PackageReference>
<PackageReference Include="System.Net.Http">
<Version>4.3.4</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/GDS/ClientControls/Controls/TrustListControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ private enum Status

private ICertificateStore CreateStore(string storePath)
{
ICertificateStore store = CertificateStoreIdentifier.CreateStore(CertificateStoreIdentifier.DetermineStoreType(storePath));
store.Open(storePath);
CertificateStoreIdentifier certificateStoreIdentifier = new CertificateStoreIdentifier(storePath);
ICertificateStore store = certificateStoreIdentifier.OpenStore();
return store;
}

Expand Down
4 changes: 2 additions & 2 deletions Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<ItemGroup>
<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.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.374.117-preview" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.117-preview" />
</ItemGroup>

</Project>
34 changes: 18 additions & 16 deletions Samples/GDS/ConsoleServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,22 @@ public void Run()
return;
}

ManualResetEvent quitEvent = new ManualResetEvent(false);
try
{
Console.CancelKeyPress += (sender, eArgs) => {
quitEvent.Set();
eArgs.Cancel = true;
};
}
catch
using (ManualResetEvent quitEvent = new ManualResetEvent(false))
{
}
try
{
Console.CancelKeyPress += (sender, eArgs) => {
quitEvent.Set();
eArgs.Cancel = true;
};
}
catch
{
}

// wait for timeout or Ctrl-C
quitEvent.WaitOne();
// wait for timeout or Ctrl-C
quitEvent.WaitOne();
}

if (server != null)
{
Expand Down Expand Up @@ -318,18 +320,18 @@ void PrintSessionStatus(Session session, string reason, bool lastContact = false
{
lock (session.DiagnosticsLock)
{
string item = String.Format("{0,9}:{1,20}:", reason, session.SessionDiagnostics.SessionName);
string item = Utils.Format("{0,9}:{1,20}:", reason, session.SessionDiagnostics.SessionName);
if (lastContact)
{
item += String.Format("Last Event:{0:HH:mm:ss}", session.SessionDiagnostics.ClientLastContactTime.ToLocalTime());
item += Utils.Format("Last Event:{0:HH:mm:ss}", session.SessionDiagnostics.ClientLastContactTime.ToLocalTime());
}
else
{
if (session.Identity != null)
{
item += String.Format(":{0,20}", session.Identity.DisplayName);
item += Utils.Format(":{0,20}", session.Identity.DisplayName);
}
item += String.Format(":{0}", session.Id);
item += Utils.Format(":{0}", session.Id);
}
Console.WriteLine(item);
}
Expand Down
8 changes: 6 additions & 2 deletions Samples/GDS/Server/DB/gdsdb.edmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@
</Association>
<Association Name="CertificateStoreApplication">
<End Role="CertificateStore" Type="gdsdbModel.Store.CertificateStores" Multiplicity="*" />
<End Role="Application" Type="gdsdbModel.Store.Applications" Multiplicity="1" />
<End Role="Application" Type="gdsdbModel.Store.Applications" Multiplicity="1">
<OnDelete Action="Cascade" />
</End>
<ReferentialConstraint>
<Principal Role="Application">
<PropertyRef Name="ID" />
Expand Down Expand Up @@ -276,7 +278,9 @@
</Association>
<Association Name="CertificateStoreApplication">
<End Type="gdsdbModel.CertificateStore" Role="CertificateStore" Multiplicity="*" />
<End Type="gdsdbModel.Application" Role="Application" Multiplicity="1" />
<End Type="gdsdbModel.Application" Role="Application" Multiplicity="1" >
<OnDelete Action="Cascade" />
</End>
mregen marked this conversation as resolved.
Show resolved Hide resolved
</Association>
</Schema>
</edmx:ConceptualModels>
Expand Down
5 changes: 4 additions & 1 deletion Samples/GDS/Server/DB/gdsdb.edmx.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ GO
IF OBJECT_ID(N'[dbo].[FK_CertificateRequests_Applications]', 'F') IS NOT NULL
ALTER TABLE [dbo].[CertificateRequests] DROP CONSTRAINT [FK_CertificateRequests_Applications];
GO
IF OBJECT_ID(N'[dbo].[CertificateStoreApplication]', 'F') IS NOT NULL
ALTER TABLE [dbo].[CertificateStores] DROP CONSTRAINT [CertificateStoreApplication]
GO

-- --------------------------------------------------
-- Dropping existing tables
Expand Down Expand Up @@ -204,7 +207,7 @@ ADD CONSTRAINT [FK_CertificateStoreApplication]
FOREIGN KEY ([Application_ID])
REFERENCES [dbo].[Applications]
([ID])
ON DELETE NO ACTION ON UPDATE NO ACTION;
ON DELETE CASCADE ON UPDATE NO ACTION;
GO

-- Creating non-clustered index for FOREIGN KEY 'FK_CertificateStoreApplication'
Expand Down
4 changes: 2 additions & 2 deletions Samples/GDS/Server/GlobalDiscoveryServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,10 @@
<Version>6.5.1</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/GDS/Server/Opc.Ua.GlobalDiscoveryServer.Config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<CertificateGroupConfiguration>
<Id>Default</Id>
<CertificateType>RsaSha256ApplicationCertificateType</CertificateType>
<SubjectName>CN=IOP-2017 CA, O=OPC Foundation</SubjectName>
<SubjectName>CN=IOP-2024 CA, O=OPC Foundation</SubjectName>
<BaseStorePath>%CommonApplicationData%/OPC Foundation/GDS/PKI/CA/default</BaseStorePath>
<DefaultCertificateLifetime>12</DefaultCertificateLifetime>
<DefaultCertificateKeySize>2048</DefaultCertificateKeySize>
Expand Down
4 changes: 2 additions & 2 deletions Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.374.78" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.117-preview" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.374.117-preview" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions Samples/ReferenceClient/Reference Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
<Version>1.5.374.78</Version>
<Version>1.5.374.117-preview</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup>
Expand Down
Loading
Loading