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

Nuget 1.5.374 & GDS Updates #597

Merged
merged 6 commits into from
Mar 15, 2024
Merged

Nuget 1.5.374 & GDS Updates #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0757fe6
support TrustListMasks
romanett Feb 28, 2024
8b63a14
fix dropdown width
romanett Feb 28, 2024
0016903
switch to preview
romanett Mar 6, 2024
8e16038
fix users with Well Known Roles saved in sql server mapping code
romanett Mar 8, 2024
26af3ad
update readme with new users
romanett Mar 8, 2024
e55b5e7
update nuget to release
romanett Mar 15, 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
2 changes: 1 addition & 1 deletion Samples/ClientControls.Net4/Configuration/CertificateListCtrl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ protected override void UpdateItem(ListViewItem listItem, object item)
}

// look up domains.
IList<string> domains = X509Utils.GetDomainsFromCertficate(certificate);
IList<string> domains = X509Utils.GetDomainsFromCertificate(certificate);

StringBuilder buffer = new StringBuilder();

Expand Down
2 changes: 1 addition & 1 deletion Samples/ClientControls.Net4/Configuration/CertificateListFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public bool Match(X509Certificate2 certificate)

if (!String.IsNullOrEmpty(m_domain))
{
IList<string> domains = X509Utils.GetDomainsFromCertficate(certificate);
IList<string> domains = X509Utils.GetDomainsFromCertificate(certificate);

bool found = false;

Expand Down
2 changes: 1 addition & 1 deletion Samples/ClientControls.Net4/Configuration/Common (OLD)/GuiUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public static bool HandleDomainCheckError(string caption, ServiceResult serviceR
buffer.AppendFormat("Valid From: {0}\r\n", certificate.NotBefore);
buffer.AppendFormat("Valid To: {0}\r\n", certificate.NotAfter);
buffer.AppendFormat("Thumbprint: {0}\r\n\r\n", certificate.Thumbprint);
var domains = X509Utils.GetDomainsFromCertficate(certificate);
var domains = X509Utils.GetDomainsFromCertificate(certificate);
if (domains.Count > 0)
{
bool comma = false;
Expand Down
2 changes: 1 addition & 1 deletion Samples/ClientControls.Net4/Configuration/ViewCertificateDlg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificate)
// fill in domains.
buffer = new StringBuilder();

foreach (string domain in X509Utils.GetDomainsFromCertficate(data))
foreach (string domain in X509Utils.GetDomainsFromCertificate(data))
{
if (buffer.Length > 0)
{
Expand Down
10 changes: 5 additions & 5 deletions Samples/ClientControls.Net4/UA Client Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -1015,16 +1015,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
109 changes: 79 additions & 30 deletions Samples/GDS/Client/Controls/ApplicationTrustListControl.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion Samples/GDS/Client/Controls/ApplicationTrustListControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public partial class ApplicationTrustListControl : UserControl
public ApplicationTrustListControl()
{
InitializeComponent();
TrustListMasksComboBox.DataSource = Enum.GetValues(typeof(TrustListMasks));
TrustListMasksComboBox.SelectedItem = TrustListMasks.All;
}

private GlobalDiscoveryServerClient m_gds;
Expand Down Expand Up @@ -77,7 +79,11 @@ private void ReloadTrustListButton_Click(object sender, EventArgs e)
{
if (m_application.RegistrationType == RegistrationType.ServerPush)
{
var trustList = m_server.ReadTrustList();
TrustListMasks masks;

if (!Enum.TryParse(TrustListMasksComboBox.SelectedItem.ToString(), out masks))
masks = TrustListMasks.All;
var trustList = m_server.ReadTrustList(masks);
var rejectedList = m_server.GetRejectedList();
CertificateStoreControl.Initialize(trustList, rejectedList, true);
}
Expand Down
3 changes: 3 additions & 0 deletions Samples/GDS/Client/Controls/ApplicationTrustListControl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,7 @@
<metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
2 changes: 1 addition & 1 deletion Samples/GDS/Client/Controls/RegisterApplicationControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ private void SetCertificatePublicKey(string path)

if (String.IsNullOrWhiteSpace(DiscoveryUrlsTextBox.Text) && RegistrationTypeComboBox.SelectedIndex != ClientPullManagement)
{
var domains = X509Utils.GetDomainsFromCertficate(certificate);
var domains = X509Utils.GetDomainsFromCertificate(certificate);

if (domains != null)
{
Expand Down
6 changes: 3 additions & 3 deletions Samples/GDS/Client/GlobalDiscoveryClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -139,10 +139,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
<Version>1.5.373.121</Version>
<Version>1.5.374.27</Version>
</PackageReference>
<PackageReference Include="System.Net.Http">
<Version>4.3.4</Version>
Expand Down
Loading
Loading