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.

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

1.05.04 json encoder fixes #2376

Draft
wants to merge 105 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 101 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
1b50e73
latest nodeset without reference to servicemodel
mregen Jan 21, 2021
e73f66b
Merge remote-tracking branch 'origin/master' into noservicemod
mregen Jan 21, 2021
d78bd57
fix reference server
mregen Jan 22, 2021
525b85e
no async server stubs
mregen Jan 22, 2021
868b638
Merge remote-tracking branch 'source/prototyping_noservicemodel'
randy-armstrong Feb 6, 2021
07bc4d1
Update generated files.
randy-armstrong Feb 6, 2021
066ab73
Errata 1.04.10.
randy-armstrong Feb 13, 2021
d4642f1
Fix Typos.
randy-armstrong Feb 13, 2021
90d7cec
Update PubSub to use new autogenerated APIs.
randy-armstrong Feb 13, 2021
8f7cd8a
Fix build errors in tests.
randy-armstrong Feb 13, 2021
6ebd5d2
Remove undocumented fields from the NodeSet.
randy-armstrong Feb 26, 2021
928f5bb
Sync with Errata 1.04.9.
randy-armstrong Feb 26, 2021
17eb21d
Merge branch 'master' of https://github.com/OPCF-Members/UA-.NETStand…
randy-armstrong Feb 26, 2021
4ffd217
Back out changes to APIs caused by AllowSubtypes handling.
randy-armstrong Feb 26, 2021
1d37945
Merge remote-tracking branch 'source/master'
randy-armstrong Feb 26, 2021
6f5621a
Fix build errors.
randy-armstrong Feb 26, 2021
2bcbc1c
1.04.10 errata.
randy-armstrong Mar 2, 2021
c4d301c
Merge branch '1.04.10'
randy-armstrong Mar 2, 2021
928f93b
Updates for Errata 1.04.10.
randy-armstrong Mar 2, 2021
a374e31
Regenerate autogenerated filed.
randy-armstrong Mar 2, 2021
42e655e
Deprecate DataTypeDictionary.
randy-armstrong Mar 3, 2021
26b700e
Fix error in UANodeSet.xsd.
randy-armstrong Mar 3, 2021
5296fee
Merge remote-tracking branch 'source/master'
randy-armstrong Mar 11, 2021
bb03736
Merge remote-tracking branch 'source/master'
randy-armstrong Jul 3, 2021
df37f48
Update to 1.04.10.
randy-armstrong Jul 3, 2021
955eaa9
Add additional Aliases in default NodeSet.
randy-armstrong Aug 23, 2021
7266727
Upgrade NuGet packages.
randy-armstrong Aug 23, 2021
4209867
Updates for ModelCompiler https://github.com/OPCFoundation/UA-ModelCo…
randy-armstrong Aug 24, 2021
18e56b2
Merge remote-tracking branch 'source/master'
randy-armstrong Aug 25, 2021
f9381b8
Set release flag (#1527)
mrsuciu Sep 29, 2021
ab4d2ec
Merge remote-tracking branch 'source/release/1.4.367'
randy-armstrong Sep 30, 2021
88255c5
1.04.10 Release.
randy-armstrong Sep 30, 2021
b801a59
UA-1.04.10-2021-09-15
randy-armstrong Oct 1, 2021
4c5f833
Merge remote-tracking branch 'source/master'
randy-armstrong Oct 10, 2021
c13ca81
Fix https://github.com/OPCFoundation/UA-ModelCompiler/issues/94
randy-armstrong Nov 2, 2021
83ef0f5
Add sample node managers to ref server (#1535)
mregen Oct 15, 2021
35f7aa5
Remove unnecessary Nuget dependencies in Opc.Ua.Core (#1551)
bdovaz Oct 22, 2021
92fe57f
Bump Portable.BouncyCastle from 1.8.10 to 1.9.0 (#1556)
dependabot[bot] Oct 22, 2021
b8bc942
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0 (#1560)
dependabot[bot] Oct 28, 2021
9f61e64
IOP workshop 2021 fixes and build improvements (#1562)
mregen Oct 29, 2021
93aef64
Bump System.Io.Pipelines from 4.5.4 to 5.0.1 (#1570)
dependabot[bot] Nov 1, 2021
27a4933
Bump System.Text.Encodings.Web from 4.5.1 to 5.0.1 (#1569)
dependabot[bot] Nov 1, 2021
3980201
Remove PubSub MQTT startup repeat (#1547)
einarmo Nov 1, 2021
3d387b8
fix subcode mask (#1563)
mregen Nov 1, 2021
a2038ff
Fix VS2022 build (#1566)
mregen Nov 2, 2021
806f7cb
1.05.01 Release Preparation.
randy-armstrong Nov 16, 2021
fb28cba
Fixed MethodDeclarationId issue.
randy-armstrong Nov 21, 2021
5fc0cc3
Fix for MethodDefinitionId issue that should be backward compatible.
randy-armstrong Nov 22, 2021
ffdf57e
Update to fix for MethodDefinitionId issue that should be backward co…
randy-armstrong Nov 22, 2021
cc32093
Reapply MethodDeclarationId fix.
randy-armstrong Nov 24, 2021
b70e214
Update to 1.05.00 NodeSet.
randy-armstrong Nov 24, 2021
d91a84c
Add MethodDefinitionId fixes with 1.04.10 NodeSet.
randy-armstrong Nov 24, 2021
b4c197f
Revert MethodDeclarationId fix because it broke code, Update NodeSet.
randy-armstrong Nov 26, 2021
6433466
Replace NodeSet with 1.04.10.
randy-armstrong Dec 5, 2021
c6d881a
Merge remote-tracking branch 'source/master'
randy-armstrong Feb 27, 2022
d4beaa7
Add UA-1.05.01 NodeSet Files.
randy-armstrong Feb 27, 2022
5d31e6f
Re-generate Opc.Ua.DataTypes.cs.
randy-armstrong Feb 27, 2022
25ed111
update branch to 1.5 release candidate
mregen Feb 28, 2022
bc03c7c
Modelcompiler 1.05.01 2022 02 24 (#1722)
mregen Feb 28, 2022
c0cabbd
Merge remote-tracking branch 'source/release/1.5.368'
randy-armstrong Mar 1, 2022
5b40c2b
Merge branch 'master' of https://github.com/OPCF-Members/UA-.NETStand…
randy-armstrong Mar 1, 2022
19faed4
Merge pull request #1761 from OPCFoundation/master
mregen Apr 1, 2022
b0fa4c1
Merge remote-tracking branch 'source/master'
randy-armstrong Apr 4, 2022
9dd0867
merge release 368 branch
mregen May 13, 2022
8e989f4
Merge pull request #1819 from OPCFoundation/rel15368
mregen May 13, 2022
deaefe2
Tag as release
mregen Jun 10, 2022
fb231ea
Merge remote-tracking branch 'source/release/1.4.369'
randy-armstrong Jun 15, 2022
4f48564
Fixes Decoding ExtensionObjects when DataType NamespaceUris are not u…
randy-armstrong Jun 15, 2022
c29a41f
UA-1.04.11-2022-03-29
randy-armstrong Jun 15, 2022
b9255ff
Update to 1.05.02 NodeSets.
randy-armstrong Jun 30, 2022
3eed300
Merge remote-tracking branch 'source/release/1.5.368'
randy-armstrong Jun 30, 2022
82e94f6
Merge remote-tracking branch 'source/master'
randy-armstrong Oct 1, 2022
8be757f
Add support for Roles.
randy-armstrong Oct 1, 2022
6d950c7
1.05.02 preparations.
randy-armstrong Oct 1, 2022
746195c
Resync with baseline.
randy-armstrong Oct 14, 2022
73435df
Updates for 1.05.02.
randy-armstrong Oct 15, 2022
1455b26
Preview for 1.05.03 release;
randy-armstrong Jul 1, 2023
ece04e2
Merge remote-tracking branch 'public/master'
randy-armstrong Jul 1, 2023
8856f0f
Merge branch '1.05.03-release-preview'
randy-armstrong Jul 1, 2023
2eeba9b
Update autogenerated files to 1.05.03
randy-armstrong Jul 1, 2023
0e18098
Remove deleted types.
randy-armstrong Jul 1, 2023
fe39e6c
Fix AccessRestriction bug.
randy-armstrong Jul 1, 2023
9000be1
Add SyntaxReferenceId references.
randy-armstrong Jul 2, 2023
f8d0b81
Fix messed up GDS files.
randy-armstrong Jul 2, 2023
442e706
Backout Part 8 changes.
randy-armstrong Jul 2, 2023
9ac181e
fix tests
mregen Jul 2, 2023
bccecee
Back out Part 4 changes.
randy-armstrong Jul 2, 2023
690bcd8
Add SyntaxReferenceId references.
randy-armstrong Jul 2, 2023
dd82d1b
Fix messed up GDS files.
randy-armstrong Jul 2, 2023
ea0eb6b
Backout Part 8 changes.
randy-armstrong Jul 2, 2023
47244ac
Back out Part 4 changes.
randy-armstrong Jul 2, 2023
e89f05e
Merge remote-tracking branch 'origin/master' into 1.05.03-release-pre…
mregen Jul 4, 2023
9a981a4
Merge remote-tracking branch 'origin/master' into 1.05.03-release-pre…
mregen Jul 12, 2023
01971c6
Merge remote-tracking branch 'public/master'
randy-armstrong Jul 14, 2023
e1d814e
Merge branch 'master' of https://github.com/OPCF-Members/UA-.NETStand…
randy-armstrong Jul 14, 2023
b642f1b
1.05.03 RC
randy-armstrong Jul 14, 2023
17350cb
Merge remote-tracking branch 'prototypes/master' into 1.05.03-release…
randy-armstrong Jul 14, 2023
bd7e0f3
Rebuild 1.05.03 files.
randy-armstrong Aug 28, 2023
2b4e48c
Support string NodeIds, ExpandedNodeIds and QualifiedNames in JSON en…
randy-armstrong Nov 11, 2023
70f8845
Merge branch 'master' into 1.05.04-json-encoder-fixes
opcfoundation-org Nov 11, 2023
83fff8a
Fix merge issue.
randy-armstrong Nov 11, 2023
1639190
Merge branch 'master' into 1.05.04-json-encoder-fixes
mregen Jan 17, 2024
6c02c35
Updates for REST prototype.
randy-armstrong Jan 18, 2024
e141b38
Add JSON encoding.
randy-armstrong Feb 26, 2024
d91973a
Merge remote-tracking branch 'origin/master' into 1.05.04-json-encode…
randy-armstrong Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
534 changes: 368 additions & 166 deletions Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.Classes.cs

Large diffs are not rendered by default.

Binary file not shown.
3,945 changes: 3,625 additions & 320 deletions Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.PredefinedNodes.xml

Large diffs are not rendered by default.

Expand Up @@ -44,7 +44,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Formats.Asn1" Version="6.0.0" />
<PackageReference Include="System.Formats.Asn1" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
Expand Down
Expand Up @@ -1096,6 +1096,7 @@
historyServerCapabilitiesNode.InsertDataCapability.Value = false;
historyServerCapabilitiesNode.DeleteRawCapability.Value = false;
historyServerCapabilitiesNode.DeleteAtTimeCapability.Value = false;
historyServerCapabilitiesNode.ServerTimestampSupported.Value = false;

Check warning on line 1099 in Libraries/Opc.Ua.Server/Diagnostics/DiagnosticsNodeManager.cs

View check run for this annotation

Codecov / codecov/patch

Libraries/Opc.Ua.Server/Diagnostics/DiagnosticsNodeManager.cs#L1099

Added line #L1099 was not covered by tests

NodeState parent = FindPredefinedNode(ObjectIds.Server_ServerCapabilities, typeof(ServerCapabilitiesState));

Expand Down
2 changes: 1 addition & 1 deletion Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
Expand Up @@ -54,7 +54,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
6,078 changes: 6,072 additions & 6 deletions Stack/Opc.Ua.Core/Schema/NodeIds.csv

Large diffs are not rendered by default.

7,928 changes: 7,928 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.NodeSet2.xml

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.bsd
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
* Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
-->

<opc:TypeDictionary
xmlns:opc="http://opcfoundation.org/BinarySchema/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ua="http://opcfoundation.org/UA/"
xmlns:tns="http://opcfoundation.org/UA/GDS/"
DefaultByteOrder="LittleEndian"
TargetNamespace="http://opcfoundation.org/UA/GDS/"
>
<opc:Import Namespace="http://opcfoundation.org/UA/" Location="Opc.Ua.BinarySchema.bsd"/>

<opc:StructuredType Name="ApplicationRecordDataType" BaseType="ua:ExtensionObject">
<opc:Field Name="ApplicationId" TypeName="ua:NodeId" />
<opc:Field Name="ApplicationUri" TypeName="opc:String" />
<opc:Field Name="ApplicationType" TypeName="ua:ApplicationType" />
<opc:Field Name="NoOfApplicationNames" TypeName="opc:Int32" />
<opc:Field Name="ApplicationNames" TypeName="ua:LocalizedText" LengthField="NoOfApplicationNames" />
<opc:Field Name="ProductUri" TypeName="opc:String" />
<opc:Field Name="NoOfDiscoveryUrls" TypeName="opc:Int32" />
<opc:Field Name="DiscoveryUrls" TypeName="opc:String" LengthField="NoOfDiscoveryUrls" />
<opc:Field Name="NoOfServerCapabilities" TypeName="opc:Int32" />
<opc:Field Name="ServerCapabilities" TypeName="opc:String" LengthField="NoOfServerCapabilities" />
</opc:StructuredType>

</opc:TypeDictionary>
66 changes: 66 additions & 0 deletions Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.Types.xsd
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
* Copyright (c) 2005-2022 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
-->

<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:ua="http://opcfoundation.org/UA/2008/02/Types.xsd"
xmlns:tns="http://opcfoundation.org/UA/GDS/Types.xsd"
targetNamespace="http://opcfoundation.org/UA/GDS/Types.xsd"
elementFormDefault="qualified"
>
<xs:annotation>
<xs:appinfo>
<ua:Model ModelUri="http://opcfoundation.org/UA/GDS/" Version="1.05.02" PublicationDate="2023-07-15T00:00:00Z" />
</xs:appinfo>
</xs:annotation>

<xs:import namespace="http://opcfoundation.org/UA/2008/02/Types.xsd" />

<xs:complexType name="ApplicationRecordDataType">
<xs:sequence>
<xs:element name="ApplicationId" type="ua:NodeId" minOccurs="0" nillable="true" />
<xs:element name="ApplicationUri" type="xs:string" minOccurs="0" nillable="true" />
<xs:element name="ApplicationType" type="ua:ApplicationType" minOccurs="0" />
<xs:element name="ApplicationNames" type="ua:ListOfLocalizedText" minOccurs="0" nillable="true" />
<xs:element name="ProductUri" type="xs:string" minOccurs="0" nillable="true" />
<xs:element name="DiscoveryUrls" type="ua:ListOfString" minOccurs="0" nillable="true" />
<xs:element name="ServerCapabilities" type="ua:ListOfString" minOccurs="0" nillable="true" />
</xs:sequence>
</xs:complexType>
<xs:element name="ApplicationRecordDataType" type="tns:ApplicationRecordDataType" />

<xs:complexType name="ListOfApplicationRecordDataType">
<xs:sequence>
<xs:element name="ApplicationRecordDataType" type="tns:ApplicationRecordDataType" minOccurs="0" maxOccurs="unbounded" nillable="true" />
</xs:sequence>
</xs:complexType>
<xs:element name="ListOfApplicationRecordDataType" type="tns:ListOfApplicationRecordDataType" nillable="true"></xs:element>

</xs:schema>