From 62bbe6d81052d2c19c5c0898ff2de6b427fbd6ba Mon Sep 17 00:00:00 2001 From: IX-BOT <137874481+IX-BOT@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:08:27 +0100 Subject: [PATCH 1/2] Create draft PR for #338 From 7046f3e67b346ab3c571366c28f572039f823149 Mon Sep 17 00:00:00 2001 From: PTKu <61538034+PTKu@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:09:21 +0100 Subject: [PATCH 2/2] adds attributes to plain objects and added properties as attribute --- .../Plain/CsPlainSourceBuilder.cs | 12 ++++++++- .../Pragmas/PragmaExtensions.cs | 26 ++++++++++++++++++- .../Ast/AddedPropertySetterAstNode.cs | 4 +++ .../Pragmas/PragmaParser/PragmaVisitor.cs | 2 ++ .../expected/.g/POCO/abstract_members.g.cs | 1 + .../expected/.g/POCO/array_declaration.g.cs | 1 + .../.g/POCO/class_all_primitives.g.cs | 1 + .../.g/POCO/class_extended_by_known_type.g.cs | 1 + .../units/expected/.g/POCO/class_extends.g.cs | 1 + .../.g/POCO/class_extends_and_implements.g.cs | 1 + .../.g/POCO/class_generic_extension.g.cs | 1 + .../expected/.g/POCO/class_implements.g.cs | 1 + .../.g/POCO/class_implements_multiple.g.cs | 1 + .../expected/.g/POCO/class_internal.g.cs | 1 + .../.g/POCO/class_no_access_modifier.g.cs | 1 + .../.g/POCO/class_with_complex_members.g.cs | 1 + .../POCO/class_with_non_public_members.g.cs | 1 + .../expected/.g/POCO/class_with_pragmas.g.cs | 2 ++ .../.g/POCO/class_with_primitive_members.g.cs | 1 + .../.g/POCO/class_with_using_directives.g.cs | 1 + .../.g/POCO/compileromitsattribute.g.cs | 2 ++ .../units/expected/.g/POCO/configuration.g.cs | 6 +++++ .../units/expected/.g/POCO/enum_simple.g.cs | 1 + .../.g/POCO/file_with_unsupported.g.cs | 1 + .../expected/.g/POCO/file_with_usings.g.cs | 1 + .../units/expected/.g/POCO/generics.g.cs | 4 +++ .../units/expected/.g/POCO/makereadonce.g.cs | 3 +++ .../units/expected/.g/POCO/makereadonly.g.cs | 3 +++ .../samples/units/expected/.g/POCO/misc.g.cs | 1 + .../units/expected/.g/POCO/mixed_access.g.cs | 1 + .../units/expected/.g/POCO/program.g.cs | 1 + .../units/expected/.g/POCO/ref_to_simple.g.cs | 1 + .../expected/.g/POCO/simple_empty_class.g.cs | 1 + .../simple_empty_class_within_namespace.g.cs | 1 + .../units/expected/.g/POCO/struct_simple.g.cs | 1 + .../expected/.g/POCO/type_named_values.g.cs | 1 + .../.g/POCO/type_named_values_literals.g.cs | 1 + .../expected/.g/POCO/type_with_enum.g.cs | 1 + .../.g/POCO/types_with_name_attributes.g.cs | 1 + .../POCO/types_with_property_attributes.g.cs | 3 +++ .../samples/units/expected/units.csproj | 4 +-- .../app/ix/.g/POCO/configuration.g.cs | 1 + .../expected/app/ix/.g/POCO/program.g.cs | 1 + .../integration/expected/lib1/src/library.st | 2 +- .../integration/expected/lib1/test/test.st | 1 + .../integration/expected/lib2/src/library.st | 1 + .../integration/expected/lib2/test/test.st | 1 + .../Attributes/AddedPropertiesAttribute.cs | 18 +++++++++++++ .../ix/.g/POCO/all_primitives.g.cs | 1 + .../ix/.g/POCO/configuration.g.cs | 8 ++++++ .../ix/.g/POCO/example.g.cs | 15 +++++++++++ .../ix/.g/POCO/geolocation.g.cs | 11 ++++++++ .../ix/.g/POCO/ixcomponent.g.cs | 10 +++++++ .../ix/.g/POCO/measurement.g.cs | 18 +++++++++++++ .../ix/.g/POCO/monster.g.cs | 1 + .../ix/.g/POCO/program.g.cs | 1 + .../ix/.g/POCO/stacked/weather.g.cs | 1 + .../ix/.g/POCO/tabbed/weather.g.cs | 1 + .../ix/.g/POCO/test/border.g.cs | 13 ++++++++++ .../ix/.g/POCO/test/enumStationStatus.g.cs | 1 + .../ix/.g/POCO/test/groupbox.g.cs | 13 ++++++++++ .../ix/.g/POCO/test/test_primitive.g.cs | 13 ++++++++++ .../ix/.g/POCO/weather.g.cs | 1 + .../ix/.g/POCO/weatherBase.g.cs | 14 ++++++++++ .../ix/.g/POCO/wrapped/weather.g.cs | 1 + .../.g/POCO/configuration.g.cs | 1 + .../.g/POCO/dataswapping/all_primitives.g.cs | 1 + .../.g/POCO/dataswapping/moster.g.cs | 3 +++ .../.g/POCO/dataswapping/myEnum.g.cs | 1 + .../.g/POCO/dataswapping/realmonster.g.cs | 1 + .../src/integrated.twin/.g/POCO/program.g.cs | 1 + 71 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 src/AXSharp.connectors/src/AXSharp.Connector/Attributes/AddedPropertiesAttribute.cs diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs index 144da0ec..7af3e64d 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs @@ -66,8 +66,13 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta { TypeCommAccessibility = eCommAccessibility.ReadOnly; } - + classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this)); + + var classDeclarations = this.Compilation.GetSemanticTree().Classes + .Where(p => p.FullyQualifiedName == classDeclaration.GetQualifiedName()); + AddToSource(classDeclaration.Pragmas.AddedPropertiesAsAttributes()); + AddToSource($"{classDeclaration.AccessModifier.Transform()}partial class {classDeclaration.Name}"); var isExtended = Compilation.GetSemanticTree().Types @@ -109,6 +114,8 @@ public void CreateFieldDeclaration(IFieldDeclaration fieldDeclaration, IxNodeVis { if (fieldDeclaration.IsMemberEligibleForTranspile(this)) { + AddToSource(fieldDeclaration.Pragmas.AddAttributes()); + AddToSource(fieldDeclaration.Pragmas.AddedPropertiesAsAttributes()); switch (fieldDeclaration.Type) { case IArrayTypeDeclaration arrayType: @@ -182,6 +189,7 @@ public void CreateFile(IFileSyntax fileSyntax, IxNodeVisitor visitor) { AddToSource("using System;"); AddToSource("using AXSharp.Abstractions.Presentation;"); + AddToSource("using AXSharp.Connector;"); foreach (var fileSyntaxUsingDirective in fileSyntax.UsingDirectives @@ -259,6 +267,8 @@ public void CreateVariableDeclaration(IVariableDeclaration fieldDeclaration, IxN { if (fieldDeclaration.IsMemberEligibleForTranspile(this)) { + AddToSource(fieldDeclaration.Pragmas.AddAttributes()); + AddToSource(fieldDeclaration.Pragmas.AddedPropertiesAsAttributes()); switch (fieldDeclaration.Type) { case IArrayTypeDeclaration arrayType: diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaExtensions.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaExtensions.cs index ccb052fd..fdfe2c79 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaExtensions.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaExtensions.cs @@ -11,6 +11,7 @@ using AX.ST.Semantic.Pragmas; using AXSharp.Compiler.Core; using AXSharp.Compiler.Cs.Pragmas.PragmaParser; +using AXSharp.Connector; namespace AXSharp.Compiler.Cs; @@ -40,6 +41,29 @@ public static string AddAttributes(this IEnumerable pragmas) .Select(p => Pragmas.PragmaParser.PragmaCompiler.Compile(p).Product)); } + public static string AddedPropertiesAsAttributes(this IEnumerable pragmas) + { + var properties = pragmas.Where(p => + p.Content.StartsWith(PRAGMA_PROPERTY_SET_SIGNATURE)) + .Select(p => Pragmas.PragmaParser.PragmaCompiler.Compile(p).Property); + + + var valueTuples = properties as (string PropertyName, string InitValue)[] ?? properties.ToArray(); + if (valueTuples.Count() > 0) + { + var sb = new StringBuilder(); + + foreach (var property in valueTuples) + { + sb.AppendLine($"[AXSharp.Connector.AddedPropertiesAttribute(\"{property.PropertyName}\", {property.InitValue})]\n"); + } + + return sb.ToString(); + } + + return string.Empty; + } + /// /// Produces property from list of ix pragmas declared on type declaration. /// @@ -74,7 +98,7 @@ public static string SetProperties(this IFieldDeclaration fieldDeclaration) return string.Join("\r\n", fieldDeclaration.Pragmas.Where(p => p.Content.StartsWith(PRAGMA_PROPERTY_SET_SIGNATURE)).Select(p => Pragmas.PragmaParser.PragmaCompiler.Compile(p, fieldDeclaration).Product)); } - + public static VisitorProduct GetGenericAttributes(this ITypeDeclaration typeDeclaration) { return typeDeclaration.Pragmas diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs index db682e3a..8e686468 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/Ast/AddedPropertySetterAstNode.cs @@ -32,8 +32,12 @@ public override void AcceptVisitor(IAstVisitor visitor) { if (visitor is PragmaVisitor v) + { v.Product.Product = MemberName != null ? $"{MemberName}.{PropertyName} = {InitValue};" : $"{PropertyName} = {InitValue};"; + + if (PropertyName != null) v.Product.Property = (PropertyName, InitValue); + } } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/PragmaVisitor.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/PragmaVisitor.cs index 8040138d..e41c1c98 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/PragmaVisitor.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaParser/PragmaVisitor.cs @@ -31,4 +31,6 @@ public class VisitorProduct public string? GenericConstrains { get; set; } public IEnumerable GenericTypes { get; set; } public (string type, bool isPoco) GenericTypeAssignment { get; set; } + + public (string PropertyName, string? InitValue) Property { get; set; } } \ 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 a541d2fc..89ec4046 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs index b77ea8ae..4be77021 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 ac7225ce..d6d0b616 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 018ee378..a02dfcfd 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs index 4987d471..4ce871c9 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs index f3e25608..91481513 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs index af9ac664..906b0bc0 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs index 26416e84..5eb39ed0 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs index 69f951fb..aca3704d 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_internal.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_internal.g.cs index 536cad9f..e4ba926f 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_internal.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_internal.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_no_access_modifier.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_no_access_modifier.g.cs index b2425993..43b8cdaa 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_no_access_modifier.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_no_access_modifier.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs index 93ad6936..27f5f1d8 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs index 2aef116e..7f96b873 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs index 06b6bc58..874c9530 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -11,6 +12,7 @@ public ClassWithPragmas() { } + [Container(Layout.Wrap)] public ClassWithPragmasNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithPragmasNamespace.ComplexType1(); } 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 249a2199..13008057 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs index 63bfb393..ca595c93 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 54dd5001..fd3e74f6 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -11,6 +12,7 @@ public ClassWithArrays() { } + [CompilerOmitsAttribute("Onliner")] public CompilerOmmits.Complex _must_be_omitted_in_onliner { get; set; } = new CompilerOmmits.Complex(); public Byte[] _primitive { get; set; } = new Byte[11]; } 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 308f7eef..bf589263 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -50,14 +51,19 @@ public partial class unitsTwinController 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 ComplexForConfig cReadOnce { get; set; } = new ComplexForConfig(); + [ReadOnly()] public ComplexForConfig cReadOnly { get; set; } = new ComplexForConfig(); public global::Colorss Colorss { get; set; } public UInt64 Colorsss { get; set; } + [CompilerOmitsAttribute("Onliner")] public Boolean _must_be_omitted_in_onliner { get; set; } } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs index a0b88721..e23d372b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs index fcca5151..56cacaa1 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs index 9de21a2d..1fecb933 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; using Pocos.FileWithUsingsSimpleFirstLevelNamespace; using Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified; using Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo; 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 55d946a7..c950e084 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -29,6 +30,9 @@ public Extendee2() : base() { } + [AXOpen.Data.AxoDataEntityAttribute] + [Container(Layout.Stack)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Shared Header")] public GenericsTests.SomeTypeToBeGeneric SomeData { get; set; } = new GenericsTests.SomeTypeToBeGeneric(); } } 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 db62bac4..32d6a742 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -11,8 +12,10 @@ public MembersWithMakeReadOnce() { } + [ReadOnce()] public string makeReadOnceMember { get; set; } = string.Empty; public string someOtherMember { get; set; } = string.Empty; + [ReadOnce()] public makereadonce.ComplexMember makeReadComplexMember { get; set; } = new makereadonce.ComplexMember(); public makereadonce.ComplexMember someotherComplexMember { get; set; } = new makereadonce.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 18f0b3e2..e4a569d8 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -11,8 +12,10 @@ public MembersWithMakeReadOnly() { } + [ReadOnly()] public string makeReadOnceMember { get; set; } = string.Empty; public string someOtherMember { get; set; } = string.Empty; + [ReadOnly()] public makereadonly.ComplexMember makeReadComplexMember { get; set; } = new makereadonly.ComplexMember(); public makereadonly.ComplexMember someotherComplexMember { get; set; } = new makereadonly.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 026eb5e4..c1d3efe3 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 de45b70d..ef826ab8 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs index a0b88721..e23d372b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs index 1ec3d999..22248e83 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class.g.cs index 7e14c9ff..49d5fd25 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs index b57595c0..3cf279ae 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs index 96f9ba33..0c0b4d7c 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs index 90d7f5cb..a5e6936b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs index 53a824a8..14b4df59 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 660fe53e..3a3c5da5 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs index 97142b37..2c9aba9f 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs index 0470f243..85e0d82b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs @@ -1,16 +1,19 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { namespace TypesWithPropertyAttributes { + [AXSharp.Connector.AddedPropertiesAttribute("Description", "Some added property name value")] public partial class SomeAddedProperties : AXSharp.Connector.IPlain { public SomeAddedProperties() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Pocitadlo")] public Int16 Counter { 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 912973e0..826d6fc1 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 @@ -6,8 +6,8 @@ - - + + diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs index 39a1edd6..842fa3b1 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs index a0b88721..e23d372b 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/AXSharp.compiler/tests/integration/expected/lib1/src/library.st b/src/AXSharp.compiler/tests/integration/expected/lib1/src/library.st index 0a325855..aeac64f5 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib1/src/library.st +++ b/src/AXSharp.compiler/tests/integration/expected/lib1/src/library.st @@ -1,5 +1,5 @@ NAMESPACE lib1 - + {S7.extern=ReadWrite} CLASS PUBLIC MyClass VAR PUBLIC MyString : STRING; diff --git a/src/AXSharp.compiler/tests/integration/expected/lib1/test/test.st b/src/AXSharp.compiler/tests/integration/expected/lib1/test/test.st index b43340ec..96f33008 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib1/test/test.st +++ b/src/AXSharp.compiler/tests/integration/expected/lib1/test/test.st @@ -4,6 +4,7 @@ USING MyLibrary; NAMESPACE MyTest {TestFixture} + {S7.extern=ReadWrite} CLASS MyTestFixture VAR PROTECTED diff --git a/src/AXSharp.compiler/tests/integration/expected/lib2/src/library.st b/src/AXSharp.compiler/tests/integration/expected/lib2/src/library.st index d94c021e..afec9373 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib2/src/library.st +++ b/src/AXSharp.compiler/tests/integration/expected/lib2/src/library.st @@ -1,5 +1,6 @@ NAMESPACE lib2 + {S7.extern=ReadWrite} CLASS PUBLIC MyClass VAR PUBLIC MyString : STRING; diff --git a/src/AXSharp.compiler/tests/integration/expected/lib2/test/test.st b/src/AXSharp.compiler/tests/integration/expected/lib2/test/test.st index b43340ec..96f33008 100644 --- a/src/AXSharp.compiler/tests/integration/expected/lib2/test/test.st +++ b/src/AXSharp.compiler/tests/integration/expected/lib2/test/test.st @@ -4,6 +4,7 @@ USING MyLibrary; NAMESPACE MyTest {TestFixture} + {S7.extern=ReadWrite} CLASS MyTestFixture VAR PROTECTED diff --git a/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/AddedPropertiesAttribute.cs b/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/AddedPropertiesAttribute.cs new file mode 100644 index 00000000..4a2d2ff1 --- /dev/null +++ b/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/AddedPropertiesAttribute.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; + +namespace AXSharp.Connector; + + +[AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = true)] +public class AddedPropertiesAttribute : Attribute +{ + public string PropertyName { get; set; } + public object PropertyValue { get; set; } + + public AddedPropertiesAttribute(string propertyName, object propertyValue) + { + PropertyName = propertyName; + PropertyValue = propertyValue; + } +} \ No newline at end of file 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 0d2eb3d6..582540d7 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 58fd75e9..c892c64a 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; using Pocos.MonsterData; namespace Pocos @@ -9,10 +10,17 @@ public partial class ix_integration_plcTwinController public all_primitives all_primitives { get; set; } = new all_primitives(); public weather weather { get; set; } = new weather(); public weathers weathers { get; set; } = new weathers(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a stack pannel and grouped in group box")] public Layouts.Stacked.weather weather_stacked { get; set; } = new Layouts.Stacked.weather(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a wrap pannel and grouped in group box")] public Layouts.Wrapped.weather weather_wrapped { get; set; } = new Layouts.Wrapped.weather(); + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a tabs and grouped in group box")] public Layouts.Tabbed.weather weather_tabbed { get; set; } = new Layouts.Tabbed.weather(); + [ReadOnce()] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read once")] public Layouts.Stacked.weather weather_readOnce { get; set; } = new Layouts.Stacked.weather(); + [ReadOnly()] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read only")] public Layouts.Stacked.weather weather_readOnly { get; set; } = new Layouts.Stacked.weather(); public example test_example { get; set; } = new example(); public MeasurementExample.Measurements measurements { get; set; } = new MeasurementExample.Measurements(); 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 4697931d..82a32939 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -9,20 +10,34 @@ public example() { } + [Container(Layout.Stack)] public test_primitive primitives_stack { get; set; } = new test_primitive(); + [Container(Layout.Wrap)] public test_primitive primitives_wrap { get; set; } = new test_primitive(); + [Container(Layout.Tabs)] public test_primitive primitives_tabs { get; set; } = new test_primitive(); + [Container(Layout.UniformGrid)] public test_primitive primitives_uniform { get; set; } = new test_primitive(); + [Container(Layout.Stack)] + [Group(GroupLayout.GroupBox)] public test_primitive test_groupbox { get; set; } = new test_primitive(); + [Container(Layout.Stack)] + [Group(GroupLayout.Border)] public test_primitive test_border { get; set; } = new test_primitive(); + [Container(Layout.Tabs)] + [Group(GroupLayout.GroupBox)] public groupbox testgroupbox { get; set; } = new groupbox(); public border testborder { get; set; } = new border(); public ixcomponent ixcomponent_instance { get; set; } = new ixcomponent(); public MySecondNamespace.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.ixcomponent(); public ThirdNamespace.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.ixcomponent(); + [Container(Layout.Stack)] public compositeLayout compositeStack { get; set; } = new compositeLayout(); + [Container(Layout.Wrap)] public compositeLayout compositeWrap { get; set; } = new compositeLayout(); + [Container(Layout.UniformGrid)] public compositeLayout compositeUniform { get; set; } = new compositeLayout(); + [Container(Layout.Tabs)] public compositeLayout compositeTabs { get; set; } = new compositeLayout(); } } \ No newline at end of file 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 50657fd4..a3b524f2 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 @@ -1,21 +1,32 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Location")] public partial class GeoLocation : AXSharp.Connector.IPlain { public GeoLocation() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Latitude [°]")] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeMinimum", -90.0f)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeMaximum", 90.0f)] public Single Latitude { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Logitude [°]")] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeMinimum", 0.0f)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeMaximum", 180.0f)] public Single Longitude { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Altitude [m]")] public Single Altitude { get; set; } + [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; } } \ No newline at end of file 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 a1d97ef5..d1e660f4 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -9,9 +10,12 @@ public ixcomponent() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")] public Int16 my_int { get; set; } + [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; } } @@ -23,9 +27,12 @@ public ixcomponent() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")] public Int16 my_int { get; set; } + [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; } } } @@ -38,9 +45,12 @@ public ixcomponent() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")] public Int16 my_int { get; set; } + [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 57ce2a68..7904dd16 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -11,12 +12,17 @@ public Measurement() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Minimum")] public Single Min { get; set; } + [ReadOnly()] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measured")] public Single Acquired { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Maximum")] public Single Max { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measurement Result")] public Int16 Result { get; set; } } @@ -26,9 +32,21 @@ public Measurements() { } + [Container(Layout.Stack)] + [Group(GroupLayout.GroupBox)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Stack panel")] public MeasurementExample.Measurement measurement_stack { get; set; } = new MeasurementExample.Measurement(); + [Container(Layout.Wrap)] + [Group(GroupLayout.GroupBox)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Wrap panel")] public MeasurementExample.Measurement measurement_wrap { get; set; } = new MeasurementExample.Measurement(); + [Container(Layout.UniformGrid)] + [Group(GroupLayout.GroupBox)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Grid")] public MeasurementExample.Measurement measurement_grid { get; set; } = new MeasurementExample.Measurement(); + [Container(Layout.Tabs)] + [Group(GroupLayout.GroupBox)] + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")] public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement(); } } 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 491c573b..e895f70d 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs index a0b88721..e23d372b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs index ab347e98..9f5f7a0b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs index a44f79ec..fd02cdd1 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 51ca5c5c..57910bd8 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -9,24 +10,36 @@ public border() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#Integer From PLC#>")] public Int16 testInteger { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#UInteger From PLC#>")] public Int16 testUInteger { get; set; } + [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; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BYTE From PLC#>")] public Byte testByte { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#REAL From PLC#>")] public Single testReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#LREAL From PLC#>")] public Double testLReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BOOL From PLC#>")] public Boolean testBool { get; set; } + [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; } } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs index a0b88721..e23d372b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 8e8d8034..2052b51d 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -9,24 +10,36 @@ public groupbox() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#Integer From PLC#>")] public Int16 testInteger { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#UInteger From PLC#>")] public Int16 testUInteger { get; set; } + [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; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BYTE From PLC#>")] public Byte testByte { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#REAL From PLC#>")] public Single testReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#LREAL From PLC#>")] public Double testLReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BOOL From PLC#>")] public Boolean testBool { get; set; } + [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; } } } \ No newline at end of file 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 ef0349e1..7ce74e85 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -9,24 +10,36 @@ public test_primitive() { } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#Integer From PLC#>")] public Int16 testInteger { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#UInteger From PLC#>")] public Int16 testUInteger { get; set; } + [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; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BYTE From PLC#>")] public Byte testByte { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#REAL From PLC#>")] public Single testReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#LREAL From PLC#>")] public Double testLReal { get; set; } + [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BOOL From PLC#>")] public Boolean testBool { get; set; } + [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; } } } \ No newline at end of file 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 58bbe243..34bdaab5 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 75abe6ad..2f8211a4 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -16,13 +17,26 @@ public weatherBase() 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; } + [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; } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs index f1e9aa0d..0236c8dd 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs index 0e8e1ad4..b3d4996b 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; using Pocos.RealMonsterData; namespace Pocos 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 ec93d986..5e0cad61 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 edef61ee..f1f264d5 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { @@ -19,7 +20,9 @@ public MonsterBase() public Byte[] ArrayOfBytes { get; set; } = new Byte[4]; public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4]; + [IgnoreOnPocoOperation()] public MonsterData.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.DriveBase(); + [IgnoreOnPocoOperation()] public string Description_tobeignoredbypocooperations { get; set; } = string.Empty; } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs index a0b88721..e23d372b 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { 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 b75557c5..4796ea11 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 @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos { diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs index a0b88721..e23d372b 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs @@ -1,5 +1,6 @@ using System; using AXSharp.Abstractions.Presentation; +using AXSharp.Connector; namespace Pocos {