Skip to content

Commit

Permalink
Fix binary export of surplus typedefinition (#1576)
Browse files Browse the repository at this point in the history 
- HasTypeDefinition and TypeDefinitionId should only exist for Object/Variable in .uanodes
- fix binary export for .uanodes
- #1574 missed the binary output case, only fixed xml export
- fixes #1532 
- fixes OPCFoundation/UA-ModelCompiler#94
- fix the default and sample models in this repo

note --> ModelCompiler needs to use the updated core lib to produce the same output
  • Loading branch information
@mregen
mregen committed Nov 4, 2021
1 parent 1e2b6e0 commit 7acddc0
Show file tree
Hide file tree
Showing 13 changed files with 3,406 additions and 5,542 deletions.
47 changes: 23 additions & 24 deletions Applications/Quickstarts.Servers/Boiler/Boiler.Classes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1390,20 +1390,20 @@ protected override void InitializeOptionalChildren(ISystemContext context)
"AAAAVHJhbnNpdGlvblRpbWUBARkEAC4ARBkEAAABACYB/////wEB/////wAAAAAVYIkKAgAAAAAACQAA" +
"AERlbGV0YWJsZQEBGwQALgBEGwQAAAAB/////wEB/////wAAAAAVYIkKAgAAAAAACgAAAEF1dG9EZWxl" +
"dGUBARwEAC4ARBwEAAAAAf////8BAf////8AAAAAFWCJCgIAAAAAAAwAAABSZWN5Y2xlQ291bnQBAR0E" +
"AC4ARB0EAAAABv////8BAf////8AAAAAJGGCCgQAAAABAAUAAABTdGFydAEBRwQDAAAAAEsAAABDYXVz" +
"AC4ARB0EAAAABv////8BAf////8AAAAAJGECCgQAAAABAAUAAABTdGFydAEBRwQDAAAAAEsAAABDYXVz" +
"ZXMgdGhlIFByb2dyYW0gdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBSZWFkeSBzdGF0ZSB0byB0aGUgUnVu" +
"bmluZyBzdGF0ZS4ALwEAeglHBAAAAQEBAAAAADUBAQE3BAAAAAAkYYIKBAAAAAEABwAAAFN1c3BlbmQB" +
"AUgEAwAAAABPAAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0aGUgUnVubmlu" +
"ZyBzdGF0ZSB0byB0aGUgU3VzcGVuZGVkIHN0YXRlLgAvAQB7CUgEAAABAQEAAAAANQEBAT0EAAAAACRh" +
"ggoEAAAAAQAGAAAAUmVzdW1lAQFJBAMAAAAATwAAAENhdXNlcyB0aGUgUHJvZ3JhbSB0byB0cmFuc2l0" +
"aW9uIGZyb20gdGhlIFN1c3BlbmRlZCBzdGF0ZSB0byB0aGUgUnVubmluZyBzdGF0ZS4ALwEAfAlJBAAA" +
"AQEBAAAAADUBAQE/BAAAAAAkYYIKBAAAAAEABAAAAEhhbHQBAUoEAwAAAABgAAAAQ2F1c2VzIHRoZSBQ" +
"cm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0aGUgUmVhZHksIFJ1bm5pbmcgb3IgU3VzcGVuZGVkIHN0" +
"YXRlIHRvIHRoZSBIYWx0ZWQgc3RhdGUuAC8BAH0JSgQAAAEBAwAAAAA1AQEBOQQANQEBAUEEADUBAQFF" +
"BAAAAAAkYYIKBAAAAAEABQAAAFJlc2V0AQFLBAMAAAAASgAAAENhdXNlcyB0aGUgUHJvZ3JhbSB0byB0" +
"cmFuc2l0aW9uIGZyb20gdGhlIEhhbHRlZCBzdGF0ZSB0byB0aGUgUmVhZHkgc3RhdGUuAC8BAH4JSwQA" +
"AAEBAQAAAAA1AQEBNQQAAAAANWCJCgIAAAABAAoAAABVcGRhdGVSYXRlAQFMBAMAAAAAJgAAAFRoZSBy" +
"YXRlIGF0IHdoaWNoIHRoZSBzaW11bGF0aW9uIHJ1bnMuAC4AREwEAAAAB/////8DA/////8AAAAA";
"bmluZyBzdGF0ZS4AL0cEAAABAQEAAAAANQEBATcEAAAAACRhAgoEAAAAAQAHAAAAU3VzcGVuZAEBSAQD" +
"AAAAAE8AAABDYXVzZXMgdGhlIFByb2dyYW0gdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBSdW5uaW5nIHN0" +
"YXRlIHRvIHRoZSBTdXNwZW5kZWQgc3RhdGUuAC9IBAAAAQEBAAAAADUBAQE9BAAAAAAkYQIKBAAAAAEA" +
"BgAAAFJlc3VtZQEBSQQDAAAAAE8AAABDYXVzZXMgdGhlIFByb2dyYW0gdG8gdHJhbnNpdGlvbiBmcm9t" +
"IHRoZSBTdXNwZW5kZWQgc3RhdGUgdG8gdGhlIFJ1bm5pbmcgc3RhdGUuAC9JBAAAAQEBAAAAADUBAQE/" +
"BAAAAAAkYQIKBAAAAAEABAAAAEhhbHQBAUoEAwAAAABgAAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRy" +
"YW5zaXRpb24gZnJvbSB0aGUgUmVhZHksIFJ1bm5pbmcgb3IgU3VzcGVuZGVkIHN0YXRlIHRvIHRoZSBI" +
"YWx0ZWQgc3RhdGUuAC9KBAAAAQEDAAAAADUBAQE5BAA1AQEBQQQANQEBAUUEAAAAACRhAgoEAAAAAQAF" +
"AAAAUmVzZXQBAUsEAwAAAABKAAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0" +
"aGUgSGFsdGVkIHN0YXRlIHRvIHRoZSBSZWFkeSBzdGF0ZS4AL0sEAAABAQEAAAAANQEBATUEAAAAADVg" +
"iQoCAAAAAQAKAAAAVXBkYXRlUmF0ZQEBTAQDAAAAACYAAABUaGUgcmF0ZSBhdCB3aGljaCB0aGUgc2lt" +
"dWxhdGlvbiBydW5zLgAuAERMBAAAAAf/////AwP/////AAAAAA==";
#endregion
#endif
#endregion
Expand Down Expand Up @@ -2357,18 +2357,17 @@ protected override void InitializeOptionalChildren(ISystemContext context)
"AEF1dG9EZWxldGUBAacEAC4ARKcEAAAAAf////8BAf////8AAAAAFWCJCgIAAAAAAAwAAABSZWN5Y2xl" +
"Q291bnQBAagEAC4ARKgEAAAABv////8BAf////8AAAAANWCJCgIAAAABAAoAAABVcGRhdGVSYXRlAQHX" +
"BAMAAAAAJgAAAFRoZSByYXRlIGF0IHdoaWNoIHRoZSBzaW11bGF0aW9uIHJ1bnMuAC4ARNcEAAAAB///" +
"//8DA/////8AAAAAJGGCCgQAAAABAAUAAABTdGFydAEBpToDAAAAAEsAAABDYXVzZXMgdGhlIFByb2dy" +
"//8DA/////8AAAAAJGECCgQAAAABAAUAAABTdGFydAEBpToDAAAAAEsAAABDYXVzZXMgdGhlIFByb2dy" +
"YW0gdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBSZWFkeSBzdGF0ZSB0byB0aGUgUnVubmluZyBzdGF0ZS4A" +
"LwEBRwSlOgAAAQH/////AAAAACRhggoEAAAAAQAHAAAAU3VzcGVuZAEBpjoDAAAAAE8AAABDYXVzZXMg" +
"dGhlIFByb2dyYW0gdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBSdW5uaW5nIHN0YXRlIHRvIHRoZSBTdXNw" +
"ZW5kZWQgc3RhdGUuAC8BAUgEpjoAAAEB/////wAAAAAkYYIKBAAAAAEABgAAAFJlc3VtZQEBpzoDAAAA" +
"AE8AAABDYXVzZXMgdGhlIFByb2dyYW0gdG8gdHJhbnNpdGlvbiBmcm9tIHRoZSBTdXNwZW5kZWQgc3Rh" +
"dGUgdG8gdGhlIFJ1bm5pbmcgc3RhdGUuAC8BAUkEpzoAAAEB/////wAAAAAkYYIKBAAAAAEABAAAAEhh" +
"bHQBAag6AwAAAABgAAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0aGUgUmVh" +
"ZHksIFJ1bm5pbmcgb3IgU3VzcGVuZGVkIHN0YXRlIHRvIHRoZSBIYWx0ZWQgc3RhdGUuAC8BAUoEqDoA" +
"AAEB/////wAAAAAkYYIKBAAAAAEABQAAAFJlc2V0AQGpOgMAAAAASgAAAENhdXNlcyB0aGUgUHJvZ3Jh" +
"bSB0byB0cmFuc2l0aW9uIGZyb20gdGhlIEhhbHRlZCBzdGF0ZSB0byB0aGUgUmVhZHkgc3RhdGUuAC8B" +
"AUsEqToAAAEB/////wAAAAA=";
"L6U6AAABAf////8AAAAAJGECCgQAAAABAAcAAABTdXNwZW5kAQGmOgMAAAAATwAAAENhdXNlcyB0aGUg" +
"UHJvZ3JhbSB0byB0cmFuc2l0aW9uIGZyb20gdGhlIFJ1bm5pbmcgc3RhdGUgdG8gdGhlIFN1c3BlbmRl" +
"ZCBzdGF0ZS4AL6Y6AAABAf////8AAAAAJGECCgQAAAABAAYAAABSZXN1bWUBAac6AwAAAABPAAAAQ2F1" +
"c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0aGUgU3VzcGVuZGVkIHN0YXRlIHRvIHRo" +
"ZSBSdW5uaW5nIHN0YXRlLgAvpzoAAAEB/////wAAAAAkYQIKBAAAAAEABAAAAEhhbHQBAag6AwAAAABg" +
"AAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24gZnJvbSB0aGUgUmVhZHksIFJ1bm5pbmcg" +
"b3IgU3VzcGVuZGVkIHN0YXRlIHRvIHRoZSBIYWx0ZWQgc3RhdGUuAC+oOgAAAQH/////AAAAACRhAgoE" +
"AAAAAQAFAAAAUmVzZXQBAak6AwAAAABKAAAAQ2F1c2VzIHRoZSBQcm9ncmFtIHRvIHRyYW5zaXRpb24g" +
"ZnJvbSB0aGUgSGFsdGVkIHN0YXRlIHRvIHRoZSBSZWFkeSBzdGF0ZS4AL6k6AAABAf////8AAAAA";
#endregion
#endif
#endregion
Expand Down
135 changes: 0 additions & 135 deletions Applications/Quickstarts.Servers/Boiler/Boiler.NodeSet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1492,15 +1492,6 @@
<Identifier>ns=1;i=1039</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>i=2426</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -1546,15 +1537,6 @@
<Identifier>ns=1;i=1039</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>i=2427</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -1600,15 +1582,6 @@
<Identifier>ns=1;i=1039</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>i=2428</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -1654,15 +1627,6 @@
<Identifier>ns=1;i=1039</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>i=2429</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -1708,15 +1672,6 @@
<Identifier>ns=1;i=1039</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>i=2430</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -8878,15 +8833,6 @@
<Identifier>ns=1;i=1178</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1095</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -8932,15 +8878,6 @@
<Identifier>ns=1;i=1178</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1096</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -8986,15 +8923,6 @@
<Identifier>ns=1;i=1178</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1097</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -9040,15 +8968,6 @@
<Identifier>ns=1;i=1178</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1098</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -9094,15 +9013,6 @@
<Identifier>ns=1;i=1178</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1099</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=37</Identifier>
Expand Down Expand Up @@ -9148,15 +9058,6 @@
<Identifier>ns=1;i=1287</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1095</Identifier>
</TargetId>
</ReferenceNode>
</References>
<Executable>true</Executable>
<UserExecutable>true</UserExecutable>
Expand Down Expand Up @@ -9193,15 +9094,6 @@
<Identifier>ns=1;i=1287</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1096</Identifier>
</TargetId>
</ReferenceNode>
</References>
<Executable>true</Executable>
<UserExecutable>true</UserExecutable>
Expand Down Expand Up @@ -9238,15 +9130,6 @@
<Identifier>ns=1;i=1287</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1097</Identifier>
</TargetId>
</ReferenceNode>
</References>
<Executable>true</Executable>
<UserExecutable>true</UserExecutable>
Expand Down Expand Up @@ -9283,15 +9166,6 @@
<Identifier>ns=1;i=1287</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1098</Identifier>
</TargetId>
</ReferenceNode>
</References>
<Executable>true</Executable>
<UserExecutable>true</UserExecutable>
Expand Down Expand Up @@ -9328,15 +9202,6 @@
<Identifier>ns=1;i=1287</Identifier>
</TargetId>
</ReferenceNode>
<ReferenceNode>
<ReferenceTypeId>
<Identifier>i=40</Identifier>
</ReferenceTypeId>
<IsInverse>false</IsInverse>
<TargetId>
<Identifier>ns=1;i=1099</Identifier>
</TargetId>
</ReferenceNode>
</References>
<Executable>true</Executable>
<UserExecutable>true</UserExecutable>
Expand Down
Binary file modified Applications/Quickstarts.Servers/Boiler/Boiler.PredefinedNodes.uanodes
View file
Binary file not shown.

0 comments on commit 7acddc0

Please sign in to comment.