From 94d29167455e5bf5cb9785c76d5be0426e3aa2c6 Mon Sep 17 00:00:00 2001 From: PTKu <61538034+PTKu@users.noreply.github.com> Date: Thu, 28 Nov 2024 07:59:24 +0100 Subject: [PATCH] Refactor: Remove properties, add collection methods Updated `TestCollectionOrderer` attribute namespace in `DisplayNameOrderer.cs`. Removed various `Onliner` type properties and `Parent` and `Interpreter` properties across multiple classes and namespaces. Added methods `GetChildren`, `GetKids`, and `GetValueTags` to return collections of children, elements, and value tags. Updated `units.csproj` to target `net9.0` and updated package references. --- .../DisplayNameOrderer.cs | 2 +- .../.g/Onliners/abstract_members.g.cs | 6 +- .../.g/Onliners/array_declaration.g.cs | 11 +-- .../.g/Onliners/class_all_primitives.g.cs | 26 +------ .../class_extended_by_known_type.g.cs | 6 +- .../expected/.g/Onliners/class_extends.g.cs | 5 +- .../class_extends_and_implements.g.cs | 5 +- .../.g/Onliners/class_generic_extension.g.cs | 11 +-- .../.g/Onliners/class_implements.g.cs | 5 +- .../Onliners/class_implements_multiple.g.cs | 5 +- .../expected/.g/Onliners/class_internal.g.cs | 5 +- .../.g/Onliners/class_no_access_modifier.g.cs | 5 +- .../Onliners/class_with_complex_members.g.cs | 10 +-- .../class_with_non_public_members.g.cs | 10 +-- .../.g/Onliners/class_with_pragmas.g.cs | 10 +-- .../class_with_primitive_members.g.cs | 31 +------- .../Onliners/class_with_using_directives.g.cs | 5 +- .../.g/Onliners/compileromitsattribute.g.cs | 51 ++++++------- .../expected/.g/Onliners/configuration.g.cs | 71 +++---------------- .../.g/Onliners/file_with_usings.g.cs | 20 +++--- .../units/expected/.g/Onliners/generics.g.cs | 11 +-- .../expected/.g/Onliners/makereadonce.g.cs | 13 ++-- .../expected/.g/Onliners/makereadonly.g.cs | 13 ++-- .../units/expected/.g/Onliners/misc.g.cs | 39 +++++----- .../expected/.g/Onliners/mixed_access.g.cs | 38 +++++----- .../expected/.g/Onliners/ref_to_simple.g.cs | 10 +-- .../.g/Onliners/simple_empty_class.g.cs | 5 +- .../simple_empty_class_within_namespace.g.cs | 5 +- .../expected/.g/Onliners/struct_simple.g.cs | 11 +-- .../.g/Onliners/type_named_values.g.cs | 5 +- .../Onliners/type_named_values_literals.g.cs | 5 +- .../expected/.g/Onliners/type_with_enum.g.cs | 5 +- .../Onliners/types_with_name_attributes.g.cs | 16 +++-- .../types_with_property_attributes.g.cs | 5 +- .../expected/.g/POCO/abstract_members.g.cs | 1 - .../.g/POCO/class_all_primitives.g.cs | 15 ---- .../.g/POCO/class_extended_by_known_type.g.cs | 1 - .../.g/POCO/class_with_primitive_members.g.cs | 17 ----- .../.g/POCO/compileromitsattribute.g.cs | 1 - .../units/expected/.g/POCO/configuration.g.cs | 39 ++-------- .../units/expected/.g/POCO/generics.g.cs | 1 - .../units/expected/.g/POCO/makereadonce.g.cs | 1 + .../units/expected/.g/POCO/makereadonly.g.cs | 1 + .../samples/units/expected/.g/POCO/misc.g.cs | 1 - .../units/expected/.g/POCO/mixed_access.g.cs | 3 - .../expected/.g/POCO/type_with_enum.g.cs | 1 - .../samples/units/expected/units.csproj | 7 +- .../AXSharp.ixc.Tests/DisplayNameOrderer.cs | 2 +- .../app/ix/.g/Onliners/configuration.g.cs | 2 - .../DisplayNameOrderer.cs | 2 +- .../ix/.g/Onliners/configuration.g.cs | 10 --- .../ix/.g/POCO/all_primitives.g.cs | 15 ---- .../ix/.g/POCO/configuration.g.cs | 5 ++ .../ix/.g/POCO/example.g.cs | 10 +++ .../ix/.g/POCO/geolocation.g.cs | 1 + .../ix/.g/POCO/ixcomponent.g.cs | 3 + .../ix/.g/POCO/measurement.g.cs | 3 + .../ix/.g/POCO/monster.g.cs | 3 - .../ix/.g/POCO/test/border.g.cs | 4 ++ .../ix/.g/POCO/test/groupbox.g.cs | 4 ++ .../ix/.g/POCO/test/test_primitive.g.cs | 4 ++ .../ix/.g/POCO/weather.g.cs | 3 - .../ix/.g/POCO/weatherBase.g.cs | 9 ++- .../.g/Onliners/configuration.g.cs | 43 ++--------- .../Onliners/dataswapping/all_primitives.g.cs | 26 +------ .../.g/Onliners/dataswapping/moster.g.cs | 16 ++--- .../.g/Onliners/dataswapping/realmonster.g.cs | 46 ++++-------- .../.g/POCO/dataswapping/all_primitives.g.cs | 15 ---- .../.g/POCO/dataswapping/moster.g.cs | 6 +- .../.g/POCO/dataswapping/realmonster.g.cs | 16 ----- 70 files changed, 292 insertions(+), 526 deletions(-) diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/DisplayNameOrderer.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/DisplayNameOrderer.cs index 59018b41..5537d262 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/DisplayNameOrderer.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/DisplayNameOrderer.cs @@ -7,7 +7,7 @@ using Xunit.Abstractions; -[assembly: TestCollectionOrderer("AXSharp.CompilerTests.DisplayNameOrderer", "AXSharp.CompilerTests")] +[assembly: TestCollectionOrderer("AXSharp.Compiler.CsTests.DisplayNameOrderer", "AXSharp.Compiler.CsTests")] [assembly: CollectionBehavior(DisableTestParallelization = true)] namespace AXSharp.Compiler.CsTests; diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/abstract_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/abstract_members.g.cs index e1ccc115..2736ecbe 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/abstract_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/abstract_members.g.cs @@ -8,7 +8,6 @@ public partial class AbstractMotor : AXSharp.Connector.ITwinObject { public OnlinerBool Run { get; } - public OnlinerBool ReverseDirection { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -158,18 +157,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -226,8 +228,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs index 3ce8b6cf..bbe1e56b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs @@ -10,7 +10,6 @@ namespace ArrayDeclarationSimpleNamespace public partial class array_declaration_class : AXSharp.Connector.ITwinObject { public OnlinerInt[] primitive { get; } - public ArrayDeclarationSimpleNamespace.some_complex_type[] complex { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -182,18 +181,21 @@ public ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class CreateEmpty } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -250,9 +252,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -375,18 +375,21 @@ public ArrayDeclarationSimpleNamespace.Pocos.some_complex_type CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -443,9 +446,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs index 79d2f0de..a6bd7f84 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs @@ -8,47 +8,26 @@ public partial class class_all_primitives : AXSharp.Connector.ITwinObject { public OnlinerBool myBOOL { get; } - public OnlinerByte myBYTE { get; } - public OnlinerWord myWORD { get; } - public OnlinerDWord myDWORD { get; } - public OnlinerLWord myLWORD { get; } - public OnlinerSInt mySINT { get; } - public OnlinerInt myINT { get; } - public OnlinerDInt myDINT { get; } - public OnlinerLInt myLINT { get; } - public OnlinerUSInt myUSINT { get; } - public OnlinerUInt myUINT { get; } - public OnlinerUDInt myUDINT { get; } - public OnlinerULInt myULINT { get; } - public OnlinerReal myREAL { get; } - public OnlinerLReal myLREAL { get; } - public OnlinerTime myTIME { get; } - public OnlinerLTime myLTIME { get; } - public OnlinerDate myDATE { get; } - public OnlinerTimeOfDay myTIME_OF_DAY { get; } - public OnlinerDateTime myDATE_AND_TIME { get; } - public OnlinerString mySTRING { get; } - public OnlinerWString myWSTRING { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -498,18 +477,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -566,8 +548,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs index ecd6df55..17b37b6e 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs @@ -142,7 +142,6 @@ namespace Simatic.Ax.StateFramework public partial class AbstractState : AXSharp.Connector.ITwinObject, IState, IStateMuteable { public OnlinerInt StateID { get; } - public OnlinerString StateName { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -292,18 +291,21 @@ public Simatic.Ax.StateFramework.Pocos.AbstractState CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -360,9 +362,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs index 10609c48..b2d2560a 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs @@ -253,18 +253,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -321,8 +324,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends_and_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends_and_implements.g.cs index eba927fc..9dfb7fa6 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends_and_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends_and_implements.g.cs @@ -253,18 +253,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -321,9 +324,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs index cbf84388..f8030c33 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs @@ -126,18 +126,21 @@ public Generics.Pocos.Extender CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -194,16 +197,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Extendee : Generics.Extender { public Generics.SomeType SomeType { get; } - public Generics.SomeType SomeTypeAsPoco { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -646,18 +646,21 @@ public Generics.Pocos.SomeType CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -714,9 +717,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements.g.cs index 819e8c96..ae113700 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements.g.cs @@ -124,18 +124,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -192,9 +195,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements_multiple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements_multiple.g.cs index c22a9258..56327b2b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements_multiple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements_multiple.g.cs @@ -124,18 +124,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -192,9 +195,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_internal.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_internal.g.cs index c34bc584..1e0adb5e 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_internal.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_internal.g.cs @@ -124,18 +124,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -192,8 +195,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_no_access_modifier.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_no_access_modifier.g.cs index c49db02f..89643731 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_no_access_modifier.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_no_access_modifier.g.cs @@ -124,18 +124,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -192,8 +195,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_complex_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_complex_members.g.cs index 5a045203..310d09c5 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_complex_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_complex_members.g.cs @@ -149,18 +149,21 @@ public ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes CreateEmptyPoc } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -217,9 +220,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -342,18 +343,21 @@ public ClassWithComplexTypesNamespace.Pocos.ComplexType1 CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -410,9 +414,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_non_public_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_non_public_members.g.cs index 61fc3129..9daed2f6 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_non_public_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_non_public_members.g.cs @@ -149,18 +149,21 @@ public ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMem } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -217,9 +220,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -342,18 +343,21 @@ public ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 CreateEmptyPo } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -410,9 +414,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_pragmas.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_pragmas.g.cs index caf55be4..cdae8e1a 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_pragmas.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_pragmas.g.cs @@ -151,18 +151,21 @@ public ClassWithPragmasNamespace.Pocos.ClassWithPragmas CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -219,9 +222,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -344,18 +345,21 @@ public ClassWithPragmasNamespace.Pocos.ComplexType1 CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -412,9 +416,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_primitive_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_primitive_members.g.cs index c8b99c4e..1aaf817d 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_primitive_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_primitive_members.g.cs @@ -10,57 +10,31 @@ namespace ClassWithPrimitiveTypesNamespace public partial class ClassWithPrimitiveTypes : AXSharp.Connector.ITwinObject { public OnlinerBool myBOOL { get; } - public OnlinerByte myBYTE { get; } - public OnlinerWord myWORD { get; } - public OnlinerDWord myDWORD { get; } - public OnlinerLWord myLWORD { get; } - public OnlinerSInt mySINT { get; } - public OnlinerInt myINT { get; } - public OnlinerDInt myDINT { get; } - public OnlinerLInt myLINT { get; } - public OnlinerUSInt myUSINT { get; } - public OnlinerUInt myUINT { get; } - public OnlinerUDInt myUDINT { get; } - public OnlinerULInt myULINT { get; } - public OnlinerReal myREAL { get; } - public OnlinerLReal myLREAL { get; } - public OnlinerTime myTIME { get; } - public OnlinerLTime myLTIME { get; } - public OnlinerDate myDATE { get; } - public OnlinerDate myLDATE { get; } - public OnlinerTimeOfDay myTIME_OF_DAY { get; } - public OnlinerLTimeOfDay myLTIME_OF_DAY { get; } - public OnlinerDateTime myDATE_AND_TIME { get; } - public OnlinerLDateTime myLDATE_AND_TIME { get; } - public OnlinerChar myCHAR { get; } - public OnlinerWChar myWCHAR { get; } - public OnlinerString mySTRING { get; } - public OnlinerWString myWSTRING { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -585,18 +559,21 @@ public ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes CreateEmpt } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -653,9 +630,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_using_directives.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_using_directives.g.cs index 4b938c1d..960522b1 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_using_directives.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_using_directives.g.cs @@ -127,18 +127,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -195,9 +198,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs index 64e99853..41d34dd2 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs @@ -11,7 +11,6 @@ public partial class ClassWithArrays : AXSharp.Connector.ITwinObject { [CompilerOmitsAttribute("POCO")] public CompilerOmmits.Complex _must_be_omitted_in_poco { get; } - public OnlinerByte[] _primitive { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -155,18 +154,21 @@ public CompilerOmmits.Pocos.ClassWithArrays CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -223,16 +225,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Complex : AXSharp.Connector.ITwinObject { public OnlinerString HelloString { get; } - public OnlinerULInt Id { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -382,18 +381,21 @@ public CompilerOmmits.Pocos.Complex CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -450,9 +452,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -614,18 +614,21 @@ public Enums.Pocos.ClassWithEnums CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -682,9 +685,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -708,7 +709,6 @@ namespace misc public partial class VariousMembers : AXSharp.Connector.ITwinObject { public misc.SomeClass _SomeClass { get; } - public misc.Motor _Motor { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -870,18 +870,21 @@ public misc.Pocos.VariousMembers CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -938,9 +941,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -1080,18 +1081,21 @@ public misc.Pocos.SomeClass CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1148,9 +1152,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -1288,18 +1290,21 @@ public misc.Pocos.Motor CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1356,16 +1361,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Vehicle : AXSharp.Connector.ITwinObject { public misc.Motor m { get; } - public OnlinerInt displacement { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1519,18 +1521,21 @@ public misc.Pocos.Vehicle CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1587,9 +1592,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -1599,7 +1602,6 @@ namespace UnknownArraysShouldNotBeTraspiled public partial class ClassWithArrays : AXSharp.Connector.ITwinObject { public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; } - public OnlinerByte[] _primitive { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1771,18 +1773,21 @@ public UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1839,16 +1844,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Complex : AXSharp.Connector.ITwinObject { public OnlinerString HelloString { get; } - public OnlinerULInt Id { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1998,18 +2000,21 @@ public UnknownArraysShouldNotBeTraspiled.Pocos.Complex CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -2066,9 +2071,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs index a25fa15b..026a0b2e 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs @@ -8,61 +8,33 @@ public partial class unitsTwinController : ITwinController { public AXSharp.Connector.Connector Connector { get; } - public ComplexForConfig Complex { get; } - public OnlinerBool myBOOL { get; } - public OnlinerByte myBYTE { get; } - public OnlinerWord myWORD { get; } - public OnlinerDWord myDWORD { get; } - public OnlinerLWord myLWORD { get; } - public OnlinerSInt mySINT { get; } - public OnlinerInt myINT { get; } - public OnlinerDInt myDINT { get; } - public OnlinerLInt myLINT { get; } - public OnlinerUSInt myUSINT { get; } - public OnlinerUInt myUINT { get; } - public OnlinerUDInt myUDINT { get; } - public OnlinerULInt myULINT { get; } - public OnlinerReal myREAL { get; } - public OnlinerLReal myLREAL { get; } - public OnlinerTime myTIME { get; } - public OnlinerLTime myLTIME { get; } - public OnlinerDate myDATE { get; } - public OnlinerDate myLDATE { get; } - public OnlinerTimeOfDay myTIME_OF_DAY { get; } - public OnlinerLTimeOfDay myLTIME_OF_DAY { get; } - public OnlinerDateTime myDATE_AND_TIME { get; } - public OnlinerLDateTime myLDATE_AND_TIME { get; } - public OnlinerChar myCHAR { get; } - public OnlinerWChar myWCHAR { get; } - public OnlinerString mySTRING { get; } - public OnlinerWString myWSTRING { get; } [ReadOnce()] @@ -178,59 +150,32 @@ public unitsTwinController(AXSharp.Connector.ConnectorAdapter adapter) public partial class ComplexForConfig : AXSharp.Connector.ITwinObject { public OnlinerBool myBOOL { get; } - public OnlinerByte myBYTE { get; } - public OnlinerWord myWORD { get; } - public OnlinerDWord myDWORD { get; } - public OnlinerLWord myLWORD { get; } - public OnlinerSInt mySINT { get; } - public OnlinerInt myINT { get; } - public OnlinerDInt myDINT { get; } - public OnlinerLInt myLINT { get; } - public OnlinerUSInt myUSINT { get; } - public OnlinerUInt myUINT { get; } - public OnlinerUDInt myUDINT { get; } - public OnlinerULInt myULINT { get; } - public OnlinerReal myREAL { get; } - public OnlinerLReal myLREAL { get; } - public OnlinerTime myTIME { get; } - public OnlinerLTime myLTIME { get; } - public OnlinerDate myDATE { get; } - public OnlinerDate myLDATE { get; } - public OnlinerTimeOfDay myTIME_OF_DAY { get; } - public OnlinerLTimeOfDay myLTIME_OF_DAY { get; } - public OnlinerDateTime myDATE_AND_TIME { get; } - public OnlinerLDateTime myLDATE_AND_TIME { get; } - public OnlinerChar myCHAR { get; } - public OnlinerWChar myWCHAR { get; } - public OnlinerString mySTRING { get; } - public OnlinerWString myWSTRING { get; } - public Motor myMotor { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -776,18 +721,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -844,9 +792,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -998,18 +944,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1066,16 +1015,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Vehicle : AXSharp.Connector.ITwinObject { public Motor m { get; } - public OnlinerInt displacement { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1229,18 +1175,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1297,8 +1246,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs index af5b33ea..4df192a2 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs @@ -129,18 +129,21 @@ public FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -197,9 +200,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -325,18 +326,21 @@ public FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello CreateEmptyP } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -393,9 +397,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -523,18 +525,21 @@ public FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello Creat } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -591,9 +596,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -720,18 +723,21 @@ public ExampleNamespace.Pocos.Hello CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -788,9 +794,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs index faa58442..b80829bf 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs @@ -126,18 +126,21 @@ public GenericsTests.Pocos.Extender CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -194,16 +197,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class SomeTypeToBeGeneric : AXSharp.Connector.ITwinObject { public OnlinerBool Boolean { get; } - public OnlinerInt Cele { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -353,18 +353,21 @@ public GenericsTests.Pocos.SomeTypeToBeGeneric CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -421,9 +424,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonce.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonce.g.cs index 06e8ae86..2ac189cd 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonce.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonce.g.cs @@ -11,12 +11,10 @@ public partial class MembersWithMakeReadOnce : AXSharp.Connector.ITwinObject { [ReadOnce()] public OnlinerString makeReadOnceMember { get; } - public OnlinerString someOtherMember { get; } [ReadOnce()] public makereadonce.ComplexMember makeReadComplexMember { get; } - public makereadonce.ComplexMember someotherComplexMember { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -210,18 +208,21 @@ public makereadonce.Pocos.MembersWithMakeReadOnce CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -278,16 +279,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class ComplexMember : AXSharp.Connector.ITwinObject { public OnlinerString someMember { get; } - public OnlinerString someOtherMember { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -437,18 +435,21 @@ public makereadonce.Pocos.ComplexMember CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -505,9 +506,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonly.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonly.g.cs index f7f5f4c6..7bb29172 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonly.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/makereadonly.g.cs @@ -11,12 +11,10 @@ public partial class MembersWithMakeReadOnly : AXSharp.Connector.ITwinObject { [ReadOnly()] public OnlinerString makeReadOnceMember { get; } - public OnlinerString someOtherMember { get; } [ReadOnly()] public makereadonly.ComplexMember makeReadComplexMember { get; } - public makereadonly.ComplexMember someotherComplexMember { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -210,18 +208,21 @@ public makereadonly.Pocos.MembersWithMakeReadOnly CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -278,16 +279,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class ComplexMember : AXSharp.Connector.ITwinObject { public OnlinerString someMember { get; } - public OnlinerString someOtherMember { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -437,18 +435,21 @@ public makereadonly.Pocos.ComplexMember CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -505,9 +506,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs index b9d615f6..460f0f17 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs @@ -162,18 +162,21 @@ public Enums.Pocos.ClassWithEnums CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -230,9 +233,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -256,7 +257,6 @@ namespace misc public partial class VariousMembers : AXSharp.Connector.ITwinObject { public misc.SomeClass _SomeClass { get; } - public misc.Motor _Motor { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -418,18 +418,21 @@ public misc.Pocos.VariousMembers CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -486,9 +489,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -628,18 +629,21 @@ public misc.Pocos.SomeClass CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -696,9 +700,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -836,18 +838,21 @@ public misc.Pocos.Motor CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -904,16 +909,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Vehicle : AXSharp.Connector.ITwinObject { public misc.Motor m { get; } - public OnlinerInt displacement { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1067,18 +1069,21 @@ public misc.Pocos.Vehicle CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1135,9 +1140,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } @@ -1147,7 +1150,6 @@ namespace UnknownArraysShouldNotBeTraspiled public partial class ClassWithArrays : AXSharp.Connector.ITwinObject { public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; } - public OnlinerByte[] _primitive { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1319,18 +1321,21 @@ public UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1387,16 +1392,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Complex : AXSharp.Connector.ITwinObject { public OnlinerString HelloString { get; } - public OnlinerULInt Id { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1546,18 +1548,21 @@ public UnknownArraysShouldNotBeTraspiled.Pocos.Complex CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1614,9 +1619,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs index 3a8aa65e..8646778c 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs @@ -8,19 +8,12 @@ public partial class unitsTwinController : ITwinController { public AXSharp.Connector.Connector Connector { get; } - public OnlinerBool MotorOn { get; } - public OnlinerInt MotorState { get; } - public Motor Motor1 { get; } - public Motor Motor2 { get; } - public struct1 s1 { get; } - public struct4 s4 { get; } - public SpecificMotorA mot1 { get; } public unitsTwinController(AXSharp.Connector.ConnectorAdapter adapter, object[] parameters) @@ -184,18 +177,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -252,9 +248,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -398,18 +392,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -466,9 +463,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -612,18 +607,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -680,9 +678,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -826,18 +822,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -894,9 +893,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -1034,18 +1031,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1102,16 +1102,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class AbstractMotor : AXSharp.Connector.ITwinObject { public OnlinerBool Run { get; } - public OnlinerBool ReverseDirection { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1261,18 +1258,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1329,9 +1329,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/ref_to_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/ref_to_simple.g.cs index 7005dfee..aa8c3295 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/ref_to_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/ref_to_simple.g.cs @@ -126,18 +126,21 @@ public RefToSimple.Pocos.ref_to_simple CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -194,9 +197,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -336,18 +337,21 @@ public RefToSimple.Pocos.referenced CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -404,9 +408,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class.g.cs index 18dfe3e6..b0e4d2fa 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class.g.cs @@ -124,18 +124,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -192,8 +195,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class_within_namespace.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class_within_namespace.g.cs index 88451921..44c3f9b4 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class_within_namespace.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/simple_empty_class_within_namespace.g.cs @@ -126,18 +126,21 @@ public sampleNamespace.Pocos.simple_empty_class_within_namespace CreateEmptyPoco } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -194,9 +197,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs index ad1c173a..58204ec8 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs @@ -139,18 +139,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -207,16 +210,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Vehicle : AXSharp.Connector.ITwinObject { public Motor m { get; } - public OnlinerInt displacement { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -370,18 +370,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -438,8 +441,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values.g.cs index b6567855..8f91b8ea 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values.g.cs @@ -151,18 +151,21 @@ public NamedValuesNamespace.Pocos.using_type_named_values CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -219,9 +222,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values_literals.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values_literals.g.cs index 93979e8f..6d62a378 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values_literals.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_named_values_literals.g.cs @@ -153,18 +153,21 @@ public Simatic.Ax.StateFramework.Pocos.using_type_named_values CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -221,9 +224,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_with_enum.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_with_enum.g.cs index 9866d829..ec7388c8 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_with_enum.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/type_with_enum.g.cs @@ -178,18 +178,21 @@ public Simatic.Ax.StateFramework.Pocos.CompareGuardLint CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -246,9 +249,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs index d4f3caf7..56fc275f 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs @@ -142,18 +142,21 @@ public TypeWithNameAttributes.Pocos.Motor CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -210,16 +213,13 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } public partial class Vehicle : AXSharp.Connector.ITwinObject { public TypeWithNameAttributes.Motor m { get; } - public OnlinerInt displacement { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -373,18 +373,21 @@ public TypeWithNameAttributes.Pocos.Vehicle CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -441,9 +444,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } @@ -591,18 +592,21 @@ public TypeWithNameAttributes.Pocos.NoAccessModifierClass CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -659,9 +663,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs index e284b293..fba421dc 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_property_attributes.g.cs @@ -153,18 +153,21 @@ public TypesWithPropertyAttributes.Pocos.SomeAddedProperties CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -221,9 +224,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::units.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/abstract_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/abstract_members.g.cs index 89ec4046..5400b2ac 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/abstract_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/abstract_members.g.cs @@ -11,7 +11,6 @@ public AbstractMotor() } public Boolean Run { get; set; } - public Boolean ReverseDirection { get; set; } } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_all_primitives.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_all_primitives.g.cs index d6d0b616..3e365e2a 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_all_primitives.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_all_primitives.g.cs @@ -11,35 +11,20 @@ public class_all_primitives() } public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs index f7a062ff..cbd2bd15 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs @@ -26,7 +26,6 @@ public AbstractState() } public Int16 StateID { get; set; } - public string StateName { get; set; } = string.Empty; } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs index 1561b30a..41e42dcd 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs @@ -13,35 +13,20 @@ public ClassWithPrimitiveTypes() } public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); @@ -51,9 +36,7 @@ public ClassWithPrimitiveTypes() public DateTime myDATE_AND_TIME { get; set; } = default(DateTime); public DateTime myLDATE_AND_TIME { get; set; } = default(DateTime); public Char myCHAR { get; set; } - public Char myWCHAR { get; set; } - public string mySTRING { get; set; } = string.Empty; public string myWSTRING { get; set; } = string.Empty; } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs index 94812616..338ccb41 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs @@ -43,7 +43,6 @@ public ClassWithEnums() } public global::Enums.Colors colors { get; set; } - public String NamedValuesColors { get; set; } } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs index 7461c6b0..63db4027 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs @@ -8,35 +8,20 @@ public partial class unitsTwinController { public global::Pocos.ComplexForConfig Complex { get; set; } = new global::Pocos.ComplexForConfig(); public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); @@ -46,21 +31,22 @@ public partial class unitsTwinController public DateTime myDATE_AND_TIME { get; set; } = default(DateTime); public DateTime myLDATE_AND_TIME { get; set; } = default(DateTime); public Char myCHAR { get; set; } - public Char myWCHAR { get; set; } - public string mySTRING { get; set; } = string.Empty; public string myWSTRING { get; set; } = string.Empty; + [ReadOnce()] public string myWSTRING_readOnce { get; set; } = string.Empty; + [ReadOnly()] public string myWSTRING_readOnly { get; set; } = string.Empty; + [ReadOnce()] public global::Pocos.ComplexForConfig cReadOnce { get; set; } = new global::Pocos.ComplexForConfig(); + [ReadOnly()] public global::Pocos.ComplexForConfig cReadOnly { get; set; } = new global::Pocos.ComplexForConfig(); public global::Colorss Colorss { get; set; } - public UInt64 Colorsss { get; set; } [CompilerOmitsAttribute("Onliner")] @@ -77,35 +63,20 @@ public ComplexForConfig() } public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); @@ -115,9 +86,7 @@ public ComplexForConfig() public DateTime myDATE_AND_TIME { get; set; } = default(DateTime); public DateTime myLDATE_AND_TIME { get; set; } = default(DateTime); public Char myCHAR { get; set; } - public Char myWCHAR { get; set; } - public string mySTRING { get; set; } = string.Empty; public string myWSTRING { get; set; } = string.Empty; public global::Pocos.Motor myMotor { get; set; } = new global::Pocos.Motor(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs index 5968af1c..9e56f317 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs @@ -23,7 +23,6 @@ public SomeTypeToBeGeneric() } public Boolean Boolean { get; set; } - public Int16 Cele { get; set; } } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs index b4e2ca40..0b7fa1cd 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs @@ -15,6 +15,7 @@ public MembersWithMakeReadOnce() [ReadOnce()] public string makeReadOnceMember { get; set; } = string.Empty; public string someOtherMember { get; set; } = string.Empty; + [ReadOnce()] public makereadonce.Pocos.ComplexMember makeReadComplexMember { get; set; } = new makereadonce.Pocos.ComplexMember(); public makereadonce.Pocos.ComplexMember someotherComplexMember { get; set; } = new makereadonce.Pocos.ComplexMember(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs index 98aa3925..accfa07d 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs @@ -15,6 +15,7 @@ public MembersWithMakeReadOnly() [ReadOnly()] public string makeReadOnceMember { get; set; } = string.Empty; public string someOtherMember { get; set; } = string.Empty; + [ReadOnly()] public makereadonly.Pocos.ComplexMember makeReadComplexMember { get; set; } = new makereadonly.Pocos.ComplexMember(); public makereadonly.Pocos.ComplexMember someotherComplexMember { get; set; } = new makereadonly.Pocos.ComplexMember(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs index 8cad4ca5..5a02e1b1 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs @@ -13,7 +13,6 @@ public ClassWithEnums() } public global::Enums.Colors colors { get; set; } - public String NamedValuesColors { get; set; } } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs index 7e0e003a..8a60e263 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs @@ -7,9 +7,7 @@ namespace Pocos public partial class unitsTwinController { public Boolean MotorOn { get; set; } - public Int16 MotorState { get; set; } - public global::Pocos.Motor Motor1 { get; set; } = new global::Pocos.Motor(); public global::Pocos.Motor Motor2 { get; set; } = new global::Pocos.Motor(); public global::Pocos.struct1 s1 { get; set; } = new global::Pocos.struct1(); @@ -87,7 +85,6 @@ public AbstractMotor() } public Boolean Run { get; set; } - public Boolean ReverseDirection { get; set; } } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs index 55112b51..5ba94fd3 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs @@ -20,7 +20,6 @@ public CompareGuardLint() } public Int64 CompareToValue { get; set; } - public global::Simatic.Ax.StateFramework.Condition Condition { get; set; } } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj index 2cec5bec..480959d2 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj @@ -1,12 +1,13 @@ - + + net9.0 enable enable - - + + diff --git a/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/DisplayNameOrderer.cs b/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/DisplayNameOrderer.cs index ed091457..ab6f7fc7 100644 --- a/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/DisplayNameOrderer.cs +++ b/src/AXSharp.compiler/tests/AXSharp.ixc.Tests/DisplayNameOrderer.cs @@ -7,7 +7,7 @@ using Xunit.Abstractions; -[assembly: TestCollectionOrderer("AXSharp.ixcTests.DisplayNameOrderer", "AXSharp.ixcTests")] +[assembly: TestCollectionOrderer("AXSharp.ixcTests.DisplayNameOrderer", "AXSharp.ixc.Tests")] [assembly: CollectionBehavior(DisableTestParallelization = true)] namespace AXSharp.ixcTests; diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/Onliners/configuration.g.cs b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/Onliners/configuration.g.cs index ce3ecb3f..47f02510 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/Onliners/configuration.g.cs +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/Onliners/configuration.g.cs @@ -8,9 +8,7 @@ public partial class appTwinController : ITwinController { public AXSharp.Connector.Connector Connector { get; } - public lib1.MyClass lib1_MyClass { get; } - public lib2.MyClass lib2_MyClass { get; } public appTwinController(AXSharp.Connector.ConnectorAdapter adapter, object[] parameters) diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/DisplayNameOrderer.cs b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/DisplayNameOrderer.cs index c43d6521..9a524899 100644 --- a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/DisplayNameOrderer.cs +++ b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/DisplayNameOrderer.cs @@ -11,7 +11,7 @@ using Xunit.Abstractions; -[assembly: TestCollectionOrderer("AXSharp.Connector.Sax.WebAPITests.DisplayNameOrderer", "AXSharp.Connector.Sax.WebAPITests")] +[assembly: TestCollectionOrderer("AXSharp.Connector.Sax.WebAPITests.DisplayNameOrderer", "AXSharp.Connector.S71500.WebAPITests")] [assembly: CollectionBehavior(DisableTestParallelization = true)] namespace AXSharp.Connector.Sax.WebAPITests; diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/Onliners/configuration.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/Onliners/configuration.g.cs index 9ed91b72..9e380b6b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/Onliners/configuration.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/Onliners/configuration.g.cs @@ -9,17 +9,11 @@ public partial class ix_integration_plcTwinController : ITwinController { public AXSharp.Connector.Connector Connector { get; } - public all_primitives all_primitives { get; } - public weather weather { get; } - public weathers weathers { get; } - public Layouts.Stacked.weather weather_stacked { get; } - public Layouts.Wrapped.weather weather_wrapped { get; } - public Layouts.Tabbed.weather weather_tabbed { get; } [ReadOnce()] @@ -27,13 +21,9 @@ public partial class ix_integration_plcTwinController : ITwinController [ReadOnly()] public Layouts.Stacked.weather weather_readOnly { get; } - public example test_example { get; } - public MeasurementExample.Measurements measurements { get; } - public ixcomponent ixcomponent { get; } - public MonsterData.Monster monster { get; } public ix_integration_plcTwinController(AXSharp.Connector.ConnectorAdapter adapter, object[] parameters) diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/all_primitives.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/all_primitives.g.cs index 582540d7..57f353bb 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/all_primitives.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/all_primitives.g.cs @@ -11,35 +11,20 @@ public all_primitives() } public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs index 3dda8661..7fd2149b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs @@ -10,15 +10,20 @@ public partial class ix_integration_plcTwinController public global::Pocos.all_primitives all_primitives { get; set; } = new global::Pocos.all_primitives(); public global::Pocos.weather weather { get; set; } = new global::Pocos.weather(); public global::Pocos.weathers weathers { get; set; } = new global::Pocos.weathers(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a stack pannel and grouped in group box")] public Layouts.Stacked.Pocos.weather weather_stacked { get; set; } = new Layouts.Stacked.Pocos.weather(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a wrap pannel and grouped in group box")] public Layouts.Wrapped.Pocos.weather weather_wrapped { get; set; } = new Layouts.Wrapped.Pocos.weather(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a tabs and grouped in group box")] public Layouts.Tabbed.Pocos.weather weather_tabbed { get; set; } = new Layouts.Tabbed.Pocos.weather(); + [ReadOnce()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read once")] public Layouts.Stacked.Pocos.weather weather_readOnce { get; set; } = new Layouts.Stacked.Pocos.weather(); + [ReadOnly()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read only")] public Layouts.Stacked.Pocos.weather weather_readOnly { get; set; } = new Layouts.Stacked.Pocos.weather(); diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs index 12d1eaa1..46178f89 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs @@ -12,18 +12,24 @@ public example() [Container(Layout.Stack)] public global::Pocos.test_primitive primitives_stack { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.Wrap)] public global::Pocos.test_primitive primitives_wrap { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.Tabs)] public global::Pocos.test_primitive primitives_tabs { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.UniformGrid)] public global::Pocos.test_primitive primitives_uniform { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.Stack)] [Group(GroupLayout.GroupBox)] public global::Pocos.test_primitive test_groupbox { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.Stack)] [Group(GroupLayout.Border)] public global::Pocos.test_primitive test_border { get; set; } = new global::Pocos.test_primitive(); + [Container(Layout.Tabs)] [Group(GroupLayout.GroupBox)] public global::Pocos.groupbox testgroupbox { get; set; } = new global::Pocos.groupbox(); @@ -31,12 +37,16 @@ public example() public global::Pocos.ixcomponent ixcomponent_instance { get; set; } = new global::Pocos.ixcomponent(); public MySecondNamespace.Pocos.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.Pocos.ixcomponent(); public ThirdNamespace.Pocos.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.Pocos.ixcomponent(); + [Container(Layout.Stack)] public global::Pocos.compositeLayout compositeStack { get; set; } = new global::Pocos.compositeLayout(); + [Container(Layout.Wrap)] public global::Pocos.compositeLayout compositeWrap { get; set; } = new global::Pocos.compositeLayout(); + [Container(Layout.UniformGrid)] public global::Pocos.compositeLayout compositeUniform { get; set; } = new global::Pocos.compositeLayout(); + [Container(Layout.Tabs)] public global::Pocos.compositeLayout compositeTabs { get; set; } = new global::Pocos.compositeLayout(); } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs index a3b524f2..c9e4405b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs @@ -26,6 +26,7 @@ public GeoLocation() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Short descriptor")] public string Description { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Long descriptor")] public string LongDescription { get; set; } = string.Empty; } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs index 0d5e7b35..e57b1d6b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs @@ -15,6 +15,7 @@ public ixcomponent() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")] public string my_string { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")] public Boolean my_bool { get; set; } } @@ -35,6 +36,7 @@ public ixcomponent() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")] public string my_string { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")] public Boolean my_bool { get; set; } } @@ -56,6 +58,7 @@ public ixcomponent() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")] public string my_string { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")] public Boolean my_bool { get; set; } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs index 7f86e614..cb5c3804 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs @@ -39,14 +39,17 @@ public Measurements() [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Stack panel")] public MeasurementExample.Pocos.Measurement measurement_stack { get; set; } = new MeasurementExample.Pocos.Measurement(); + [Container(Layout.Wrap)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Wrap panel")] public MeasurementExample.Pocos.Measurement measurement_wrap { get; set; } = new MeasurementExample.Pocos.Measurement(); + [Container(Layout.UniformGrid)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Grid")] public MeasurementExample.Pocos.Measurement measurement_grid { get; set; } = new MeasurementExample.Pocos.Measurement(); + [Container(Layout.Tabs)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")] diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs index 1d36aaf0..d898cbee 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs @@ -45,11 +45,8 @@ public DriveBase() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs index 57910bd8..d854bc5f 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs @@ -18,6 +18,7 @@ public border() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#STRING From PLC#>")] public string testString { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#WORD From PLC#>")] public UInt16 testWord { get; set; } @@ -35,10 +36,13 @@ public border() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE From PLC#>")] public DateOnly TestDate { get; set; } = default(DateOnly); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE_AND_TIME From PLC#>")] public DateTime TestDateTime { get; set; } = default(DateTime); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#TIME_OF_DAY From PLC#>")] public TimeSpan TestTimeOfDay { get; set; } = default(TimeSpan); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#ENUM Station status#>")] public global::enumStationStatus Status { get; set; } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs index 2052b51d..9de086db 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs @@ -18,6 +18,7 @@ public groupbox() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#STRING From PLC#>")] public string testString { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#WORD From PLC#>")] public UInt16 testWord { get; set; } @@ -35,10 +36,13 @@ public groupbox() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE From PLC#>")] public DateOnly TestDate { get; set; } = default(DateOnly); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE_AND_TIME From PLC#>")] public DateTime TestDateTime { get; set; } = default(DateTime); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#TIME_OF_DAY From PLC#>")] public TimeSpan TestTimeOfDay { get; set; } = default(TimeSpan); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#ENUM Station status#>")] public global::enumStationStatus Status { get; set; } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/test_primitive.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/test_primitive.g.cs index 7ce74e85..8330ff3d 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/test_primitive.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/test_primitive.g.cs @@ -18,6 +18,7 @@ public test_primitive() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#STRING From PLC#>")] public string testString { get; set; } = string.Empty; + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#WORD From PLC#>")] public UInt16 testWord { get; set; } @@ -35,10 +36,13 @@ public test_primitive() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE From PLC#>")] public DateOnly TestDate { get; set; } = default(DateOnly); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE_AND_TIME From PLC#>")] public DateTime TestDateTime { get; set; } = default(DateTime); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#TIME_OF_DAY From PLC#>")] public TimeSpan TestTimeOfDay { get; set; } = default(TimeSpan); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#ENUM Station status#>")] public global::enumStationStatus Status { get; set; } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs index 4a570aaf..8c60358e 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs @@ -12,12 +12,9 @@ public weather() public global::Pocos.GeoLocation GeoLocation { get; set; } = new global::Pocos.GeoLocation(); public Single Temperature { get; set; } - public Single Humidity { get; set; } - public string Location { get; set; } = string.Empty; public Single ChillFactor { get; set; } - public global::Feeling Feeling { get; set; } } } diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weatherBase.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weatherBase.g.cs index 2f8211a4..866acf99 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weatherBase.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weatherBase.g.cs @@ -11,14 +11,13 @@ public weatherBase() } public Single Latitude { get; set; } - public Single Longitude { get; set; } - public Single Altitude { get; set; } - public string Description { get; set; } = string.Empty; + [ReadOnly()] public string LongDescription { get; set; } = string.Empty; + [ReadOnce()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "this has [ReadOnce()] attribute will be readon only once...")] public Int16 StartCounter { get; set; } @@ -26,15 +25,19 @@ public weatherBase() [RenderIgnore()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore()] must not be displayed!")] public string RenderIgnoreAllToghether { get; set; } = string.Empty; + [RenderIgnore("Control")] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Control'')]")] public string RenderIgnoreWhenControl { get; set; } = string.Empty; + [RenderIgnore("Display")] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Display'')]")] public string RenderIgnoreWhenDisplay { get; set; } = string.Empty; + [RenderIgnore("Control", "ShadowControl")] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Control'', ''ShadowControl'')]")] public string RenderIgnoreWhenControlAndShadow { get; set; } = string.Empty; + [RenderIgnore("Display", "ShadowDisplay")] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "[RenderIgnore(''Display'', ''ShadowDisplay'')]")] public string RenderIgnoreWhenDisplayAndShadow { get; set; } = string.Empty; diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/configuration.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/configuration.g.cs index 16cf9f9a..a79c9e2b 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/configuration.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/configuration.g.cs @@ -9,71 +9,38 @@ public partial class integratedTwinController : ITwinController { public AXSharp.Connector.Connector Connector { get; } - public MonsterData.Monster Monster { get; } - public MonsterData.Monster OnlineToPlain_should_copy_entire_structure { get; } - public MonsterData.Monster PlainToOnline_should_copy_entire_structure { get; } - public MonsterData.Monster OnlineToShadowAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ShadowToOnlineAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectOnlineToPlain_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectPlainToOnline_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectOnlineToShadowAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectShadowToOnlineAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ShadowToPlainAsync_should_copy_entire_structure { get; } - public MonsterData.Monster PlainToShadowAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectShadowToPlainAsync_should_copy_entire_structure { get; } - public MonsterData.Monster ITwinObjectPlainToShadowAsync_should_copy_entire_structure { get; } - public Pokus Pokus { get; } - public RealMonsterData.RealMonster RealMonster { get; } - public RealMonsterData.RealMonster OnlineToShadow_should_copy { get; } - public RealMonsterData.RealMonster ShadowToOnline_should_copy { get; } - public RealMonsterData.RealMonster OnlineToPlain_should_copy { get; } - public RealMonsterData.RealMonster PlainToOnline_should_copy { get; } - public RealMonsterData.RealMonster ITwinObjectOnlineToShadow_should_copy { get; } - public RealMonsterData.RealMonster ITwinObjectShadowToOnline_should_copy { get; } - public RealMonsterData.RealMonster ITwinObjectOnlineToPlain_should_copy { get; } - public RealMonsterData.RealMonster ITwinObjectPlainToOnline_should_copy { get; } - public all_primitives p_online_shadow { get; } - public all_primitives p_shadow_online { get; } - public all_primitives p_online_plain { get; } - public all_primitives p_plain_online { get; } - public all_primitives p_shadow_plain { get; } - public all_primitives p_plain_shadow { get; } - public RealMonsterData.RealMonster StartPolling_should_update_cyclic_property { get; } - public RealMonsterData.RealMonster StartPolling_ConcurentOverload { get; } - public RealMonsterData.RealMonster ChangeDetections { get; } - public GH_ISSUE_183.GH_ISSUE_183_1 GH_ISSUE_183 { get; } public integratedTwinController(AXSharp.Connector.ConnectorAdapter adapter, object[] parameters) @@ -272,18 +239,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -340,9 +310,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } @@ -465,18 +433,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -533,8 +504,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/all_primitives.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/all_primitives.g.cs index c27a116f..eb460203 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/all_primitives.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/all_primitives.g.cs @@ -8,47 +8,26 @@ public partial class all_primitives : AXSharp.Connector.ITwinObject { public OnlinerBool myBOOL { get; } - public OnlinerByte myBYTE { get; } - public OnlinerWord myWORD { get; } - public OnlinerDWord myDWORD { get; } - public OnlinerLWord myLWORD { get; } - public OnlinerSInt mySINT { get; } - public OnlinerInt myINT { get; } - public OnlinerDInt myDINT { get; } - public OnlinerLInt myLINT { get; } - public OnlinerUSInt myUSINT { get; } - public OnlinerUInt myUINT { get; } - public OnlinerUDInt myUDINT { get; } - public OnlinerULInt myULINT { get; } - public OnlinerReal myREAL { get; } - public OnlinerLReal myLREAL { get; } - public OnlinerTime myTIME { get; } - public OnlinerLTime myLTIME { get; } - public OnlinerDate myDATE { get; } - public OnlinerTimeOfDay myTIME_OF_DAY { get; } - public OnlinerDateTime myDATE_AND_TIME { get; } - public OnlinerString mySTRING { get; } - public OnlinerWString myWSTRING { get; } [AXSharp.Connector.EnumeratorDiscriminatorAttribute(typeof(myEnum))] @@ -516,18 +495,21 @@ public void Poll() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -584,8 +566,6 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs index ff612903..7375a042 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs @@ -10,11 +10,8 @@ namespace MonsterData public partial class MonsterBase : AXSharp.Connector.ITwinObject { public OnlinerString Description { get; } - public OnlinerULInt Id { get; } - public OnlinerByte[] ArrayOfBytes { get; } - public MonsterData.DriveBase[] ArrayOfDrives { get; } [IgnoreOnPocoOperation()] @@ -258,18 +255,21 @@ public MonsterData.Pocos.MonsterBase CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -326,9 +326,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } @@ -487,11 +485,8 @@ public async override Task AnyChangeAsync(T plain) public partial class DriveBase : AXSharp.Connector.ITwinObject { public OnlinerLReal Position { get; } - public OnlinerLReal Velo { get; } - public OnlinerLReal Acc { get; } - public OnlinerLReal Dcc { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -671,18 +666,21 @@ public MonsterData.Pocos.DriveBase CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -739,9 +737,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs index 6ca1dac2..df576566 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs @@ -10,17 +10,11 @@ namespace RealMonsterData public partial class RealMonsterBase : AXSharp.Connector.ITwinObject { public OnlinerString Description { get; } - public OnlinerULInt Id { get; } - public OnlinerDate TestDate { get; } - public OnlinerDateTime TestDateTime { get; } - public OnlinerTimeOfDay TestTimeSpan { get; } - public OnlinerByte[] ArrayOfBytes { get; } - public RealMonsterData.DriveBaseNested[] ArrayOfDrives { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -267,18 +261,21 @@ public RealMonsterData.Pocos.RealMonsterBase CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -335,9 +332,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } @@ -496,13 +491,9 @@ public async override Task AnyChangeAsync(T plain) public partial class DriveBaseNested : AXSharp.Connector.ITwinObject { public OnlinerLReal Position { get; } - public OnlinerLReal Velo { get; } - public OnlinerLReal Acc { get; } - public OnlinerLReal Dcc { get; } - public RealMonsterData.NestedLevelOne NestedLevelOne { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -703,18 +694,21 @@ public RealMonsterData.Pocos.DriveBaseNested CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -771,22 +765,16 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } public partial class NestedLevelOne : AXSharp.Connector.ITwinObject { public OnlinerLReal Position { get; } - public OnlinerLReal Velo { get; } - public OnlinerLReal Acc { get; } - public OnlinerLReal Dcc { get; } - public RealMonsterData.NestedLevelTwo NestedLevelTwo { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -987,18 +975,21 @@ public RealMonsterData.Pocos.NestedLevelOne CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1055,22 +1046,16 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } public partial class NestedLevelTwo : AXSharp.Connector.ITwinObject { public OnlinerLReal Position { get; } - public OnlinerLReal Velo { get; } - public OnlinerLReal Acc { get; } - public OnlinerLReal Dcc { get; } - public RealMonsterData.NestedLevelThree NestedLevelThree { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1271,18 +1256,21 @@ public RealMonsterData.Pocos.NestedLevelTwo CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1339,20 +1327,15 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } public partial class NestedLevelThree : AXSharp.Connector.ITwinObject { public OnlinerLReal Position { get; } - public OnlinerLReal Velo { get; } - public OnlinerLReal Acc { get; } - public OnlinerLReal Dcc { get; } partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail); @@ -1532,18 +1515,21 @@ public RealMonsterData.Pocos.NestedLevelThree CreateEmptyPoco() } private IList Children { get; } = new List(); + public IEnumerable GetChildren() { return Children; } private IList Kids { get; } = new List(); + public IEnumerable GetKids() { return Kids; } private IList ValueTags { get; } = new List(); + public IEnumerable GetValueTags() { return ValueTags; @@ -1600,9 +1586,7 @@ public System.String GetHumanReadable(System.Globalization.CultureInfo culture) } protected System.String @SymbolTail { get; set; } - protected AXSharp.Connector.ITwinObject @Parent { get; set; } - public AXSharp.Connector.Localizations.Translator Interpreter => global::integrated.PlcTranslator.Instance; } } \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/all_primitives.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/all_primitives.g.cs index 5e0cad61..7b0058b7 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/all_primitives.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/all_primitives.g.cs @@ -11,35 +11,20 @@ public all_primitives() } public Boolean myBOOL { get; set; } - public Byte myBYTE { get; set; } - public UInt16 myWORD { get; set; } - public UInt32 myDWORD { get; set; } - public UInt64 myLWORD { get; set; } - public SByte mySINT { get; set; } - public Int16 myINT { get; set; } - public Int32 myDINT { get; set; } - public Int64 myLINT { get; set; } - public Byte myUSINT { get; set; } - public UInt16 myUINT { get; set; } - public UInt32 myUDINT { get; set; } - public UInt64 myULINT { get; set; } - public Single myREAL { get; set; } - public Double myLREAL { get; set; } - public TimeSpan myTIME { get; set; } = default(TimeSpan); public TimeSpan myLTIME { get; set; } = default(TimeSpan); public DateOnly myDATE { get; set; } = default(DateOnly); diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs index d86a3f9b..9a7007ec 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs @@ -17,11 +17,12 @@ public MonsterBase() public string Description { get; set; } = string.Empty; public UInt64 Id { get; set; } - public Byte[] ArrayOfBytes { get; set; } = new Byte[4]; public MonsterData.Pocos.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.Pocos.DriveBase[4]; + [IgnoreOnPocoOperation()] public MonsterData.Pocos.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.Pocos.DriveBase(); + [IgnoreOnPocoOperation()] public string Description_tobeignoredbypocooperations { get; set; } = string.Empty; } @@ -48,11 +49,8 @@ public DriveBase() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } } } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs index 14ac8cf0..26c71651 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs @@ -17,7 +17,6 @@ public RealMonsterBase() public string Description { get; set; } = string.Empty; public UInt64 Id { get; set; } - public DateOnly TestDate { get; set; } = default(DateOnly); public DateTime TestDateTime { get; set; } = default(DateTime); public TimeSpan TestTimeSpan { get; set; } = default(TimeSpan); @@ -47,13 +46,9 @@ public DriveBaseNested() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelOne NestedLevelOne { get; set; } = new RealMonsterData.Pocos.NestedLevelOne(); } } @@ -67,13 +62,9 @@ public NestedLevelOne() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelTwo NestedLevelTwo { get; set; } = new RealMonsterData.Pocos.NestedLevelTwo(); } } @@ -87,13 +78,9 @@ public NestedLevelTwo() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelThree NestedLevelThree { get; set; } = new RealMonsterData.Pocos.NestedLevelThree(); } } @@ -107,11 +94,8 @@ public NestedLevelThree() } public Double Position { get; set; } - public Double Velo { get; set; } - public Double Acc { get; set; } - public Double Dcc { get; set; } } }