From ad7e5fe8c0ca3d6005cd121d28335b33b4ffb17c Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:05:22 +0200 Subject: [PATCH] wip adds possibility of ignoring connector operation on poco --- cake/BuildContext.cs | 5 + cake/Program.cs | 3 + src/AXSharp-L3-tests.slnf | 22 ++- .../ax-blazor-example/AXSharp.config.json | 2 +- .../CsOnlinerPlainerOnlineToPlainBuilder.cs | 4 +- .../CsOnlinerPlainerPlainToOnlineBuilder.cs | 4 +- .../.g/Onliners/array_declaration.g.cs | 8 +- .../.g/Onliners/class_all_primitives.g.cs | 4 +- .../class_extended_by_known_type.g.cs | 8 +- .../expected/.g/Onliners/class_extends.g.cs | 8 +- .../class_extends_and_implements.g.cs | 8 +- .../.g/Onliners/class_generic_extension.g.cs | 16 +- .../.g/Onliners/class_implements.g.cs | 4 +- .../Onliners/class_implements_multiple.g.cs | 4 +- .../expected/.g/Onliners/class_internal.g.cs | 4 +- .../.g/Onliners/class_no_access_modifier.g.cs | 4 +- .../Onliners/class_with_complex_members.g.cs | 8 +- .../class_with_non_public_members.g.cs | 8 +- .../.g/Onliners/class_with_pragmas.g.cs | 8 +- .../class_with_primitive_members.g.cs | 4 +- .../Onliners/class_with_using_directives.g.cs | 4 +- .../.g/Onliners/compileromitsattribute.g.cs | 36 ++--- .../expected/.g/Onliners/configuration.g.cs | 12 +- .../expected/.g/Onliners/makereadonce.g.cs | 8 +- .../expected/.g/Onliners/makereadonly.g.cs | 8 +- .../units/expected/.g/Onliners/misc.g.cs | 28 ++-- .../expected/.g/Onliners/ref_to_simple.g.cs | 8 +- .../.g/Onliners/simple_empty_class.g.cs | 4 +- .../simple_empty_class_within_namespace.g.cs | 4 +- .../expected/.g/Onliners/struct_simple.g.cs | 8 +- .../.g/Onliners/type_named_values.g.cs | 4 +- .../Onliners/type_named_values_literals.g.cs | 4 +- .../expected/.g/Onliners/type_with_enum.g.cs | 4 +- .../Onliners/types_with_name_attributes.g.cs | 12 +- .../types_with_property_attributes.g.cs | 4 +- .../Attributes/IgnoreOnPocoOperation.cs | 24 +++ .../AXSharp.Connector/TwinObjectExtensions.cs | 100 ++++++++++++ .../tests/ax-test-project/AXSharp.config.json | 2 +- .../tests/ax-test-project/apax-lock.json | 86 +++++----- .../AXSharp.config.json | 2 +- .../ix-integration-plc/AXSharp.config.json | 2 +- .../integrated/src/ax/AXSharp.config.json | 2 +- .../integrated/src/ax/apax-lock.json | 147 ++++++++++-------- .../integrated/src/ax/apax.yml | 5 +- .../.g/Onliners/configuration.g.cs | 8 +- .../Onliners/dataswapping/all_primitives.g.cs | 4 +- .../.g/Onliners/dataswapping/moster.g.cs | 12 +- .../.g/Onliners/dataswapping/realmonster.g.cs | 24 +-- test_L10.ps1 | 2 +- 49 files changed, 430 insertions(+), 274 deletions(-) create mode 100644 src/AXSharp.connectors/src/AXSharp.Connector/Attributes/IgnoreOnPocoOperation.cs diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs index b60735f3..a651df89 100644 --- a/cake/BuildContext.cs +++ b/cake/BuildContext.cs @@ -11,6 +11,7 @@ using System.IO.Compression; using System.Linq; using Build.FilteredSolution; +using Cake.Common.IO; using Cake.Common.Tools.DotNet; using Cake.Common.Tools.DotNet.Build; using Cake.Common.Tools.DotNet.MSBuild; @@ -22,6 +23,8 @@ using Cake.Core.Diagnostics; using Cake.Core.IO; using Cake.Frosting; +using Polly; +using static NuGet.Packaging.PackagingConstants; using Path = System.IO.Path; public class BuildContext : FrostingContext @@ -90,6 +93,8 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters) public void UploadTestPlc(string workingDirectory, string targetIp, string targetPlatform) { + var lockFile = Path.Combine(workingDirectory, "apax-lock.json"); + if (File.Exists(lockFile)) this.DeleteFile(lockFile); this.Log.Information($"Installing dependencies for ax project '{workingDirectory}' at {targetIp}"); diff --git a/cake/Program.cs b/cake/Program.cs index 56cca9d0..baa4504b 100644 --- a/cake/Program.cs +++ b/cake/Program.cs @@ -39,6 +39,7 @@ using Credentials = Octokit.Credentials; using Path = System.IO.Path; using ProductHeaderValue = Octokit.ProductHeaderValue; +using static NuGet.Packaging.PackagingConstants; public static class Program @@ -71,6 +72,8 @@ public override void Run(BuildContext context) context.CleaUpAllBinsAndObjs(); context.CleanDirectory(context.Artifacts); context.CleanDirectory(context.TestResults); + + } } diff --git a/src/AXSharp-L3-tests.slnf b/src/AXSharp-L3-tests.slnf index 46034f57..26fc668f 100644 --- a/src/AXSharp-L3-tests.slnf +++ b/src/AXSharp-L3-tests.slnf @@ -5,42 +5,40 @@ "AXSharp.abstractions\\src\\AXSharp.Abstractions\\AXSharp.Abstractions.csproj", "AXSharp.blazor\\src\\AXSharp.Presentation.Blazor.Controls\\AXSharp.Presentation.Blazor.Controls.csproj", "AXSharp.blazor\\src\\AXSharp.Presentation.Blazor\\AXSharp.Presentation.Blazor.csproj", - "AXSharp.blazor\\tests\\sandbox\\ComponentsExamples\\ComponentsExamples.csproj", "AXSharp.blazor\\tests\\sandbox\\AXSharp.RenderableContent.Tests\\AXSharp.RenderableContent.Tests.csproj", + "AXSharp.blazor\\tests\\sandbox\\ComponentsExamples\\ComponentsExamples.csproj", "AXSharp.blazor\\tests\\sandbox\\IxBlazor.App\\IxBlazor.App.csproj", - "AXSharp.blazor\\tests\\sandbox\\ax-blazor-example\\ix\\ax-blazor-example.csproj", + "AXSharp.blazor\\tests\\sandbox\\ax-blazor-example\\ix\\ax_blazor_example.csproj", + "AXSharp.compiler\\src\\AXSharp.Compiler.Abstractions\\AXSharp.Compiler.Abstractions.csproj", "AXSharp.compiler\\src\\AXSharp.Compiler\\AXSharp.Compiler.csproj", "AXSharp.compiler\\src\\AXSharp.Cs.Compiler\\AXSharp.Compiler.Cs.csproj", - "AXSharp.compiler\\src\\AXSharp.Compiler.Abstractions\\AXSharp.Compiler.Abstractions.csproj", "AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj", "AXSharp.compiler\\src\\ixd\\AXSharp.ixd.csproj", "AXSharp.compiler\\src\\ixr\\AXSharp.ixr.csproj", - "AXSharp.compiler\\tests\\AXSharp.CompilerTests\\AXSharp.CompilerTests.csproj", "AXSharp.compiler\\tests\\AXSharp.Compiler.CsTests\\AXSharp.Compiler.CsTests.csproj", + "AXSharp.compiler\\tests\\AXSharp.CompilerTests\\AXSharp.CompilerTests.csproj", "AXSharp.compiler\\tests\\AXSharp.ixc.Tests\\AXSharp.ixc.Tests.csproj", "AXSharp.compiler\\tests\\AXSharp.ixr.Tests\\AXSharp.ixr.Tests.csproj", "AXSharp.connectors\\src\\AXSharp.Connector.S71500.WebAPI\\AXSharp.Connector.S71500.WebAPI.csproj", "AXSharp.connectors\\src\\AXSharp.Connector\\AXSharp.Connector.csproj", + "AXSharp.connectors\\src\\AXSharp.TIA.Connector\\AXSharp.TIA2AXSharp.csproj", "AXSharp.connectors\\tests\\AXSharp.Connector.Sax.WebAPITests\\AXSharp.Connector.S71500.WebAPITests.csproj", "AXSharp.connectors\\tests\\AXSharp.ConnectorLegacyTests\\AXSharp.ConnectorLegacyTests.csproj", "AXSharp.connectors\\tests\\AXSharp.ConnectorTests\\AXSharp.ConnectorTests\\AXSharp.ConnectorTests.csproj", + "AXSharp.connectors\\tests\\AXSharp.TIA.ConnectorTests\\AXSharp.TIA2AXSharpTests_L3.csproj", "AXSharp.connectors\\tests\\ax-test-project\\ix\\ax_test_project.csproj", "AXSharp.connectors\\tests\\exploring\\Webserver.Api.Exploratory\\Webserver.Api.Exploratory.csproj", "AXSharp.connectors\\tests\\exploring\\exploratory.consoleapp\\exploratory.consoleapp.csproj", "AXSharp.examples\\hello.world.console\\hello.world.console.plc\\ix\\hello.world.console.plc.csproj", "AXSharp.examples\\hello.world.console\\hello.world.console\\hello.world.console.csproj", - "AXSharp.templates\\working\\AXSharp.templates.csproj", - "AXSharp.templates\\working\\templates\\ixblazor\\ixblazor.app\\ixblazor.hmi.csproj", - "AXSharp.templates\\working\\templates\\ixblazor\\ixblazor.twin\\ixblazor.csproj", - "AXSharp.templates\\working\\templates\\ixconsole\\ixconsole.twin\\ixconsole.csproj", - "AXSharp.templates\\working\\templates\\ixconsole\\ixconsole\\ixconsole.app.csproj", - "AXSharp.templates\\working\\templates\\ixtwin\\ixtwin.csproj", - "AXSharp.tools\\tests\\AXSharp.LocalizablesToResx.Tests\\AXSharp.LocalizablesToResx.Tests.csproj" + "AXSharp.tools\\src\\AXSharp.LocalizablesToResx\\AXSharp.LocalizablesToResx.csproj", + "AXSharp.tools\\src\\AXSharp.TIA2AXTool\\AXSharp.TIA2AXTool.csproj", "AXSharp.tools\\src\\AXSharp.nuget.update\\AXSharp.nuget.update.csproj", + "AXSharp.tools\\tests\\AXSharp.LocalizablesToResx.Tests\\AXSharp.LocalizablesToResx.Tests.csproj", "AXSharp.tools\\tests\\AXSharp.nuget.update.Tests\\AXSharp.nuget.update.Tests.csproj", "sanbox\\integration\\ix-integration-blazor\\ix-integration-blazor.csproj", "sanbox\\integration\\ix-integration-library\\ix-integration-library.csproj", - "sanbox\\integration\\ix-integration-plc\\ix\\ix-integration-plc.csproj", + "sanbox\\integration\\ix-integration-plc\\ix\\ix_integration_plc.csproj", "tests.integrations\\integrated\\src\\integrated.app\\integrated.hmi.csproj", "tests.integrations\\integrated\\src\\integrated.twin\\integrated.csproj", "tests.integrations\\integrated\\tests\\integrated.tests\\integrated.tests.csproj" diff --git a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json index 543f25b0..2e5862ea 100644 --- a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json +++ b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json @@ -1 +1 @@ -{"OutputProjectFolder":"ix"} \ No newline at end of file +{"OutputProjectFolder":"ix","UseBase":false} \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs index 3916952f..da33f402 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs @@ -120,7 +120,7 @@ public static CsOnlinerPlainerOnlineToPlainBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"public async Task {MethodName}Async(){{\n"); builder.AddToSource($"Pocos.{semantics.FullyQualifiedName} plain = new Pocos.{semantics.FullyQualifiedName}();"); - builder.AddToSource("await this.ReadAsync();"); + builder.AddToSource("await this.ReadAsync();"); semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder)); @@ -140,7 +140,7 @@ public static CsOnlinerPlainerOnlineToPlainBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"public {qualifier} async Task {MethodName}Async(){{\n"); builder.AddToSource($"Pocos.{semantics.FullyQualifiedName} plain = new Pocos.{semantics.FullyQualifiedName}();"); - builder.AddToSource("await this.ReadAsync();"); + builder.AddToSource("await this.ReadAsync();"); if (isExtended) { diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs index 52f18072..760bdb58 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs @@ -127,7 +127,7 @@ public static CsOnlinerPlainerPlainToOnlineBuilder Create(IxNodeVisitor visitor, semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder)); - builder.AddToSource("return await this.WriteAsync();"); + builder.AddToSource("return await this.WriteAsync();"); builder.AddToSource($"}}"); return builder; @@ -153,7 +153,7 @@ public static CsOnlinerPlainerPlainToOnlineBuilder Create(IxNodeVisitor visitor, semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder)); - builder.AddToSource("return await this.WriteAsync();"); + builder.AddToSource("return await this.WriteAsync();"); builder.AddToSource($"}}"); return builder; 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 0dc08aac..189e2859 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 @@ -39,7 +39,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain = new Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class(); - await this.ReadAsync(); + await this.ReadAsync(); plain.primitive = primitive.Select(p => p.LastValue).ToArray(); plain.complex = complex.Select(async p => await p.OnlineToPlainAsync()).Select(p => p.Result).ToArray(); return plain; @@ -63,7 +63,7 @@ public async Task> PlainToOnlineAsync(Pocos.ArrayDec primitive.Select(p => p.Cyclic = plain.primitive[_primitive_i_FE8484DAB3++]).ToArray(); var _complex_i_FE8484DAB3 = 0; complex.Select(p => p.PlainToOnlineAsync(plain.complex[_complex_i_FE8484DAB3++])).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -199,7 +199,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain = new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -215,7 +215,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 5513b54f..8c4b83a1 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 @@ -95,7 +95,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.class_all_primitives plain = new Pocos.class_all_primitives(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; plain.myWORD = myWORD.LastValue; @@ -177,7 +177,7 @@ public async Task> PlainToOnlineAsync(Pocos.class_al myDATE_AND_TIME.Cyclic = plain.myDATE_AND_TIME; mySTRING.Cyclic = plain.mySTRING; myWSTRING.Cyclic = plain.myWSTRING; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 c5981b9e..035f5298 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 @@ -25,7 +25,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.Simatic.Ax.StateFramework.State1Transition plain = new Pocos.Simatic.Ax.StateFramework.State1Transition(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); return plain; } @@ -44,7 +44,7 @@ public async override Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { await base.PlainToOnlineAsync(plain); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -121,7 +121,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Simatic.Ax.StateFramework.AbstractState plain = new Pocos.Simatic.Ax.StateFramework.AbstractState(); - await this.ReadAsync(); + await this.ReadAsync(); plain.StateID = StateID.LastValue; plain.StateName = StateName.LastValue; return plain; @@ -143,7 +143,7 @@ public async Task> PlainToOnlineAsync(Pocos.Simatic. { StateID.Cyclic = plain.StateID; StateName.Cyclic = plain.StateName; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 488b89ab..4ab41b1b 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 @@ -23,7 +23,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.Extended plain = new Pocos.Extended(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); return plain; } @@ -42,7 +42,7 @@ public async override Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Extended plain) { await base.PlainToOnlineAsync(plain); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -110,7 +110,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Extendee plain = new Pocos.Extendee(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -126,7 +126,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Extendee plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 1a099419..6561aa1c 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 @@ -23,7 +23,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.ExtendsAndImplements plain = new Pocos.ExtendsAndImplements(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); return plain; } @@ -42,7 +42,7 @@ public async override Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ExtendsAndImplements plain) { await base.PlainToOnlineAsync(plain); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -110,7 +110,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ExtendeeExtendsAndImplements plain = new Pocos.ExtendeeExtendsAndImplements(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -126,7 +126,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ExtendeeExtendsAndImplements plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 a1ba6fe0..25a96a8b 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 @@ -31,7 +31,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Generics.Extender plain = new Pocos.Generics.Extender(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -47,7 +47,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Generics.Extender plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -175,7 +175,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.Generics.Extendee plain = new Pocos.Generics.Extendee(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); plain.SomeType = await SomeType.OnlineToPlainAsync(); plain.SomeTypeAsPoco = await SomeTypeAsPoco.OnlineToPlainAsync(); @@ -200,7 +200,7 @@ public async Task> PlainToOnlineAsync(Pocos.Generics await base.PlainToOnlineAsync(plain); await this.SomeType.PlainToOnlineAsync(plain.SomeType); await this.SomeTypeAsPoco.PlainToOnlineAsync(plain.SomeTypeAsPoco); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -271,7 +271,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.Generics.Extendee2 plain = new Pocos.Generics.Extendee2(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); plain.SomeType = await SomeType.OnlineToPlainAsync(); return plain; @@ -293,7 +293,7 @@ public async Task> PlainToOnlineAsync(Pocos.Generics { await base.PlainToOnlineAsync(plain); await this.SomeType.PlainToOnlineAsync(plain.SomeType); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -364,7 +364,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Generics.SomeType plain = new Pocos.Generics.SomeType(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -380,7 +380,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Generics.SomeType plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 9da2a92e..e9f8ff07 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 @@ -29,7 +29,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos._NULL_CONTEXT plain = new Pocos._NULL_CONTEXT(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -45,7 +45,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos._NULL_CONTEXT plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 9a34a628..b2f29e93 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 @@ -29,7 +29,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos._NULL_CONTEXT_MULTIPLE plain = new Pocos._NULL_CONTEXT_MULTIPLE(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -45,7 +45,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos._NULL_CONTEXT_MULTIPLE plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 b87d03b5..3f28fb4d 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 @@ -29,7 +29,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithComplexTypes plain = new Pocos.ClassWithComplexTypes(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -45,7 +45,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithComplexTypes plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 c979e22c..07fd194c 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 @@ -29,7 +29,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.NoAccessModifierClass plain = new Pocos.NoAccessModifierClass(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -45,7 +45,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.NoAccessModifierClass plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 4772c82d..85df9078 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 @@ -34,7 +34,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain = new Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myComplexType = await myComplexType.OnlineToPlainAsync(); return plain; } @@ -53,7 +53,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { await this.myComplexType.PlainToOnlineAsync(plain.myComplexType); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -184,7 +184,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain = new Pocos.ClassWithComplexTypesNamespace.ComplexType1(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -200,7 +200,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 298543de..6224aa3e 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 @@ -34,7 +34,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myComplexType = await myComplexType.OnlineToPlainAsync(); return plain; } @@ -53,7 +53,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { await this.myComplexType.PlainToOnlineAsync(plain.myComplexType); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -184,7 +184,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -200,7 +200,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 da4f407b..b9792b2c 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 @@ -36,7 +36,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain = new Pocos.ClassWithPragmasNamespace.ClassWithPragmas(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myComplexType = await myComplexType.OnlineToPlainAsync(); return plain; } @@ -55,7 +55,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { await this.myComplexType.PlainToOnlineAsync(plain.myComplexType); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -186,7 +186,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithPragmasNamespace.ComplexType1 plain = new Pocos.ClassWithPragmasNamespace.ComplexType1(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -202,7 +202,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 7eca4dc7..51914ffa 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 @@ -112,7 +112,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain = new Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; plain.myWORD = myWORD.LastValue; @@ -209,7 +209,7 @@ public async Task> PlainToOnlineAsync(Pocos.ClassWit myWCHAR.Cyclic = plain.myWCHAR; mySTRING.Cyclic = plain.mySTRING; myWSTRING.Cyclic = plain.myWSTRING; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 c6385770..b4dbb1fb 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 @@ -32,7 +32,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ClassWithUsingDirectives plain = new Pocos.ClassWithUsingDirectives(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -48,7 +48,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.ClassWithUsingDirectives plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 c08572b7..3ab58e6b 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 @@ -39,7 +39,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.CompilerOmmits.ClassWithArrays plain = new Pocos.CompilerOmmits.ClassWithArrays(); - await this.ReadAsync(); + await this.ReadAsync(); plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; } @@ -59,7 +59,7 @@ public async Task> PlainToOnlineAsync(Pocos.Compiler { var __primitive_i_FE8484DAB3 = 0; _primitive.Select(p => p.Cyclic = plain._primitive[__primitive_i_FE8484DAB3++]).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -197,7 +197,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.CompilerOmmits.Complex plain = new Pocos.CompilerOmmits.Complex(); - await this.ReadAsync(); + await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -219,7 +219,7 @@ public async Task> PlainToOnlineAsync(Pocos.Compiler { HelloString.Cyclic = plain.HelloString; Id.Cyclic = plain.Id; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -364,7 +364,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); - await this.ReadAsync(); + await this.ReadAsync(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; return plain; @@ -386,7 +386,7 @@ public async Task> PlainToOnlineAsync(Pocos.Enums.Cl { colors.Cyclic = (short)plain.colors; NamedValuesColors.Cyclic = plain.NamedValuesColors; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -543,7 +543,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); - await this.ReadAsync(); + await this.ReadAsync(); plain._SomeClass = await _SomeClass.OnlineToPlainAsync(); plain._Motor = await _Motor.OnlineToPlainAsync(); return plain; @@ -565,7 +565,7 @@ public async Task> PlainToOnlineAsync(Pocos.misc.Var { await this._SomeClass.PlainToOnlineAsync(plain._SomeClass); await this._Motor.PlainToOnlineAsync(plain._Motor); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -702,7 +702,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); - await this.ReadAsync(); + await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } @@ -721,7 +721,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.misc.SomeClass plain) { SomeClassVariable.Cyclic = plain.SomeClassVariable; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -851,7 +851,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.Motor plain = new Pocos.misc.Motor(); - await this.ReadAsync(); + await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; } @@ -870,7 +870,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.misc.Motor plain) { isRunning.Cyclic = plain.isRunning; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -1003,7 +1003,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); - await this.ReadAsync(); + await this.ReadAsync(); plain.m = await m.OnlineToPlainAsync(); plain.displacement = displacement.LastValue; return plain; @@ -1025,7 +1025,7 @@ public async Task> PlainToOnlineAsync(Pocos.misc.Veh { await this.m.PlainToOnlineAsync(plain.m); displacement.Cyclic = plain.displacement; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -1170,7 +1170,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); - await this.ReadAsync(); + await this.ReadAsync(); plain._complexKnown = _complexKnown.Select(async p => await p.OnlineToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; @@ -1194,7 +1194,7 @@ public async Task> PlainToOnlineAsync(Pocos.UnknownA _complexKnown.Select(p => p.PlainToOnlineAsync(plain._complexKnown[__complexKnown_i_FE8484DAB3++])).ToArray(); var __primitive_i_FE8484DAB3 = 0; _primitive.Select(p => p.Cyclic = plain._primitive[__primitive_i_FE8484DAB3++]).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -1336,7 +1336,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); - await this.ReadAsync(); + await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -1358,7 +1358,7 @@ public async Task> PlainToOnlineAsync(Pocos.UnknownA { HelloString.Cyclic = plain.HelloString; Id.Cyclic = plain.Id; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 46a4efa6..093f7925 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 @@ -283,7 +283,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.ComplexForConfig plain = new Pocos.ComplexForConfig(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; plain.myWORD = myWORD.LastValue; @@ -383,7 +383,7 @@ public async Task> PlainToOnlineAsync(Pocos.ComplexF mySTRING.Cyclic = plain.mySTRING; myWSTRING.Cyclic = plain.myWSTRING; await this.myMotor.PlainToOnlineAsync(plain.myMotor); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -608,7 +608,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Motor plain = new Pocos.Motor(); - await this.ReadAsync(); + await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; } @@ -627,7 +627,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Motor plain) { isRunning.Cyclic = plain.isRunning; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -760,7 +760,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Vehicle plain = new Pocos.Vehicle(); - await this.ReadAsync(); + await this.ReadAsync(); plain.m = await m.OnlineToPlainAsync(); plain.displacement = displacement.LastValue; return plain; @@ -782,7 +782,7 @@ public async Task> PlainToOnlineAsync(Pocos.Vehicle { await this.m.PlainToOnlineAsync(plain.m); displacement.Cyclic = plain.displacement; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 c93968be..cb349e0a 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 @@ -47,7 +47,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.makereadonce.MembersWithMakeReadOnce plain = new Pocos.makereadonce.MembersWithMakeReadOnce(); - await this.ReadAsync(); + await this.ReadAsync(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; plain.makeReadComplexMember = await makeReadComplexMember.OnlineToPlainAsync(); @@ -75,7 +75,7 @@ public async Task> PlainToOnlineAsync(Pocos.makeread someOtherMember.Cyclic = plain.someOtherMember; await this.makeReadComplexMember.PlainToOnlineAsync(plain.makeReadComplexMember); await this.someotherComplexMember.PlainToOnlineAsync(plain.someotherComplexMember); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -221,7 +221,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.makereadonce.ComplexMember plain = new Pocos.makereadonce.ComplexMember(); - await this.ReadAsync(); + await this.ReadAsync(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; return plain; @@ -243,7 +243,7 @@ public async Task> PlainToOnlineAsync(Pocos.makeread { someMember.Cyclic = plain.someMember; someOtherMember.Cyclic = plain.someOtherMember; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 da11953c..ddf152bf 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 @@ -47,7 +47,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.makereadonly.MembersWithMakeReadOnly plain = new Pocos.makereadonly.MembersWithMakeReadOnly(); - await this.ReadAsync(); + await this.ReadAsync(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; plain.makeReadComplexMember = await makeReadComplexMember.OnlineToPlainAsync(); @@ -75,7 +75,7 @@ public async Task> PlainToOnlineAsync(Pocos.makeread someOtherMember.Cyclic = plain.someOtherMember; await this.makeReadComplexMember.PlainToOnlineAsync(plain.makeReadComplexMember); await this.someotherComplexMember.PlainToOnlineAsync(plain.someotherComplexMember); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -221,7 +221,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.makereadonly.ComplexMember plain = new Pocos.makereadonly.ComplexMember(); - await this.ReadAsync(); + await this.ReadAsync(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; return plain; @@ -243,7 +243,7 @@ public async Task> PlainToOnlineAsync(Pocos.makeread { someMember.Cyclic = plain.someMember; someOtherMember.Cyclic = plain.someOtherMember; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 89b7cd50..d004bc82 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 @@ -39,7 +39,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); - await this.ReadAsync(); + await this.ReadAsync(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; return plain; @@ -61,7 +61,7 @@ public async Task> PlainToOnlineAsync(Pocos.Enums.Cl { colors.Cyclic = (short)plain.colors; NamedValuesColors.Cyclic = plain.NamedValuesColors; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -218,7 +218,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); - await this.ReadAsync(); + await this.ReadAsync(); plain._SomeClass = await _SomeClass.OnlineToPlainAsync(); plain._Motor = await _Motor.OnlineToPlainAsync(); return plain; @@ -240,7 +240,7 @@ public async Task> PlainToOnlineAsync(Pocos.misc.Var { await this._SomeClass.PlainToOnlineAsync(plain._SomeClass); await this._Motor.PlainToOnlineAsync(plain._Motor); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -377,7 +377,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); - await this.ReadAsync(); + await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } @@ -396,7 +396,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.misc.SomeClass plain) { SomeClassVariable.Cyclic = plain.SomeClassVariable; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -526,7 +526,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.Motor plain = new Pocos.misc.Motor(); - await this.ReadAsync(); + await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; } @@ -545,7 +545,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.misc.Motor plain) { isRunning.Cyclic = plain.isRunning; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -678,7 +678,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); - await this.ReadAsync(); + await this.ReadAsync(); plain.m = await m.OnlineToPlainAsync(); plain.displacement = displacement.LastValue; return plain; @@ -700,7 +700,7 @@ public async Task> PlainToOnlineAsync(Pocos.misc.Veh { await this.m.PlainToOnlineAsync(plain.m); displacement.Cyclic = plain.displacement; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -845,7 +845,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); - await this.ReadAsync(); + await this.ReadAsync(); plain._complexKnown = _complexKnown.Select(async p => await p.OnlineToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; @@ -869,7 +869,7 @@ public async Task> PlainToOnlineAsync(Pocos.UnknownA _complexKnown.Select(p => p.PlainToOnlineAsync(plain._complexKnown[__complexKnown_i_FE8484DAB3++])).ToArray(); var __primitive_i_FE8484DAB3 = 0; _primitive.Select(p => p.Cyclic = plain._primitive[__primitive_i_FE8484DAB3++]).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -1011,7 +1011,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); - await this.ReadAsync(); + await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -1033,7 +1033,7 @@ public async Task> PlainToOnlineAsync(Pocos.UnknownA { HelloString.Cyclic = plain.HelloString; Id.Cyclic = plain.Id; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 0c132a8d..f617ee11 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 @@ -31,7 +31,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RefToSimple.ref_to_simple plain = new Pocos.RefToSimple.ref_to_simple(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -47,7 +47,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.RefToSimple.ref_to_simple plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -178,7 +178,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RefToSimple.referenced plain = new Pocos.RefToSimple.referenced(); - await this.ReadAsync(); + await this.ReadAsync(); plain.b = b.LastValue; return plain; } @@ -197,7 +197,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.RefToSimple.referenced plain) { b.Cyclic = plain.b; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 e232bb74..2c3b3b80 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 @@ -29,7 +29,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.simple_class plain = new Pocos.simple_class(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -45,7 +45,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.simple_class plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 b1face1f..ea8c238e 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 @@ -31,7 +31,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.sampleNamespace.simple_empty_class_within_namespace plain = new Pocos.sampleNamespace.simple_empty_class_within_namespace(); - await this.ReadAsync(); + await this.ReadAsync(); return plain; } @@ -47,7 +47,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 8b956b74..b1663928 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 @@ -28,7 +28,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Motor plain = new Pocos.Motor(); - await this.ReadAsync(); + await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; } @@ -47,7 +47,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Motor plain) { isRunning.Cyclic = plain.isRunning; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -180,7 +180,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Vehicle plain = new Pocos.Vehicle(); - await this.ReadAsync(); + await this.ReadAsync(); plain.m = await m.OnlineToPlainAsync(); plain.displacement = displacement.LastValue; return plain; @@ -202,7 +202,7 @@ public async Task> PlainToOnlineAsync(Pocos.Vehicle { await this.m.PlainToOnlineAsync(plain.m); displacement.Cyclic = plain.displacement; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 d475175b..4e2aa597 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 @@ -42,7 +42,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.NamedValuesNamespace.using_type_named_values plain = new Pocos.NamedValuesNamespace.using_type_named_values(); - await this.ReadAsync(); + await this.ReadAsync(); plain.LColors = LColors.LastValue; return plain; } @@ -61,7 +61,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { LColors.Cyclic = plain.LColors; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 43d57352..e8417d71 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 @@ -44,7 +44,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Simatic.Ax.StateFramework.using_type_named_values plain = new Pocos.Simatic.Ax.StateFramework.using_type_named_values(); - await this.ReadAsync(); + await this.ReadAsync(); plain.LColors = LColors.LastValue; return plain; } @@ -63,7 +63,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { LColors.Cyclic = plain.LColors; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 44b92b1b..5bfb0a73 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 @@ -55,7 +55,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain = new Pocos.Simatic.Ax.StateFramework.CompareGuardLint(); - await this.ReadAsync(); + await this.ReadAsync(); plain.CompareToValue = CompareToValue.LastValue; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.LastValue; return plain; @@ -77,7 +77,7 @@ public async Task> PlainToOnlineAsync(Pocos.Simatic. { CompareToValue.Cyclic = plain.CompareToValue; Condition.Cyclic = (short)plain.Condition; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 1146cfe8..19d0863f 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 @@ -31,7 +31,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.TypeWithNameAttributes.Motor plain = new Pocos.TypeWithNameAttributes.Motor(); - await this.ReadAsync(); + await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; } @@ -50,7 +50,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.TypeWithNameAttributes.Motor plain) { isRunning.Cyclic = plain.isRunning; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -183,7 +183,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.TypeWithNameAttributes.Vehicle plain = new Pocos.TypeWithNameAttributes.Vehicle(); - await this.ReadAsync(); + await this.ReadAsync(); plain.m = await m.OnlineToPlainAsync(); plain.displacement = displacement.LastValue; return plain; @@ -205,7 +205,7 @@ public async Task> PlainToOnlineAsync(Pocos.TypeWith { await this.m.PlainToOnlineAsync(plain.m); displacement.Cyclic = plain.displacement; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -345,7 +345,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.TypeWithNameAttributes.NoAccessModifierClass plain = new Pocos.TypeWithNameAttributes.NoAccessModifierClass(); - await this.ReadAsync(); + await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } @@ -364,7 +364,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { SomeClassVariable.Cyclic = plain.SomeClassVariable; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 49b40ea2..23b04798 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 @@ -39,7 +39,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain = new Pocos.TypesWithPropertyAttributes.SomeAddedProperties(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Counter = Counter.LastValue; return plain; } @@ -58,7 +58,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { Counter.Cyclic = plain.Counter; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() diff --git a/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/IgnoreOnPocoOperation.cs b/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/IgnoreOnPocoOperation.cs new file mode 100644 index 00000000..1623039f --- /dev/null +++ b/src/AXSharp.connectors/src/AXSharp.Connector/Attributes/IgnoreOnPocoOperation.cs @@ -0,0 +1,24 @@ +// AXSharp.Connector +// Copyright (c) 2023 Peter Kurhajec (PTKu), MTS, and Contributors. All Rights Reserved. +// Contributors: https://github.com/ix-ax/axsharp/graphs/contributors +// See the LICENSE file in the repository root for more information. +// https://github.com/ix-ax/axsharp/blob/dev/LICENSE +// Third party licenses: https://github.com/ix-ax/axsharp/blob/master/notices.md + +using System; + +namespace AXSharp.Connector; + +/// +/// This attribute will prevent R/W operation on on given member or type, when performing operation with POCO objects. +/// +[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Class)] +public class IgnoreOnPocoOperation : Attribute +{ + /// + /// Creates new instance of + /// + public IgnoreOnPocoOperation() + { + } +} \ No newline at end of file diff --git a/src/AXSharp.connectors/src/AXSharp.Connector/TwinObjectExtensions.cs b/src/AXSharp.connectors/src/AXSharp.Connector/TwinObjectExtensions.cs index f3eae9c7..6bde182b 100644 --- a/src/AXSharp.connectors/src/AXSharp.Connector/TwinObjectExtensions.cs +++ b/src/AXSharp.connectors/src/AXSharp.Connector/TwinObjectExtensions.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Threading.Tasks; using System.Timers; using AXSharp.Connector.ValueTypes; @@ -88,6 +89,15 @@ public static async Task> ReadAsync(this ITwinObject return twinPrimitives; } + public static async Task> ReadAsync(this ITwinObject structure) where T : Attribute + { + ArgumentNullException.ThrowIfNull(structure); + var primitives = RetrievePrimitives(structure); + var twinPrimitives = primitives as ITwinPrimitive[] ?? primitives.ToArray(); + await structure.GetConnector().ReadBatchAsync(twinPrimitives); + return twinPrimitives; + } + /// /// Writes all value tags of instance /// @@ -107,6 +117,13 @@ public static async Task> WriteAsync(this ITwinObjec return twinPrimitives; } + public static async Task> WriteAsync(this ITwinObject structure) where T : Attribute + { + var primitives = structure.RetrievePrimitives(); + var twinPrimitives = primitives as ITwinPrimitive[] ?? primitives.ToArray(); + await structure.GetConnector().WriteBatchAsync(twinPrimitives); + return twinPrimitives; + } /// /// Retrieves all value tags of given object recursively. @@ -142,6 +159,89 @@ public static IEnumerable RetrievePrimitives(this ITwinObject on return valueTags; } + /// + /// Retrieves all value tags of given object recursively. + /// + /// Object from which the value tags are to be retrieved. + /// Pre-existing value tags. + /// Value tags of given object. + /// + /// This example demonstrates how to get all value tags of the MAIN PRG object. + /// + /// var mainProgramTags = Connector.MAIN.RetrievePrimitives(); + /// + /// + public static IEnumerable RetrievePrimitives(this ITwinObject onlineObject, + List valueTags = null) where T : Attribute + { + ArgumentNullException.ThrowIfNull(onlineObject); + + valueTags ??= new List(); + + var children = onlineObject.GetChildren().Where(p => !p.HasAttribute()); + + if (children != null) + foreach (var child in children) + RetrievePrimitives(child, valueTags); + + var tags = onlineObject.GetValueTags().Where(p => !p.HasAttribute()); + + if (tags != null) + foreach (var valueTag in tags) + valueTags.Add(valueTag); + + return valueTags; + } + + private static PropertyInfo GetPropertyViaSymbol(ITwinElement twinObject) + { + if (twinObject == null) return null; + var propertyName = twinObject.GetSymbolTail(); + + if (twinObject.Symbol == null) + return null; + + if (twinObject.Symbol.EndsWith("]")) + { + propertyName = propertyName?.Substring(0, propertyName.IndexOf('[') - 1); + } + + var propertyInfo = twinObject?.GetParent()?.GetType().GetProperty(propertyName); + + return propertyInfo; + } + + public static bool HasAttribute(this ITwinElement twinElement) where T : Attribute + { + if (twinElement == null) return false; + try + { + var propertyInfo = GetPropertyViaSymbol(twinElement); + if (propertyInfo != null) + { + if (propertyInfo + .GetCustomAttributes().FirstOrDefault(p => p is T) is T propertyAttribute) + { + return true; + } + } + + var typeAttribute = twinElement + .GetType() + .GetCustomAttributes(true) + .FirstOrDefault(p => p is T) as T; + + return true; + } + catch (Exception) + { + //throw; + } + + return false; + } + + /// /// Subscribes a delegate to be invoked when any value on given object changes its /// value. diff --git a/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json b/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json index 543f25b0..2e5862ea 100644 --- a/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json +++ b/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json @@ -1 +1 @@ -{"OutputProjectFolder":"ix"} \ No newline at end of file +{"OutputProjectFolder":"ix","UseBase":false} \ No newline at end of file diff --git a/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json b/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json index 8f05b8ed..d0dd2841 100644 --- a/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json +++ b/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json @@ -127,18 +127,18 @@ } }, "@ax/mod": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-0.19.4.tgz", - "integrity": "sha512-bxlV29MZsvbDHCpEbtdgYwdjC2kZ01Tq9u11263JbBRP7e0amVuRxDvaIN1rgtKiGNigakIdMtHDudlk21FJAQ==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-0.19.6.tgz", + "integrity": "sha512-ox1VIJyq7UgI+73LIwzjCxLSfOLK1PTOveiW/JwqMJWhdpg0MK+UiV8N8LhTxdciXLb4KVB0TmsteEou12SfEQ==", "dependencies": { - "@ax/mod-linux-x64": "0.19.4", - "@ax/mod-win-x64": "0.19.4" + "@ax/mod-linux-x64": "0.19.6", + "@ax/mod-win-x64": "0.19.6" } }, "@ax/mod-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-0.19.4.tgz", - "integrity": "sha512-mi6HBaVCg5DOU3cY7WUrQK6OJdnIRjSo3cSTkDVXEORFqT/GLAGooWW1vGMQqRDuy5yJZ2HUieyyGQkLP0LEZg==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-0.19.6.tgz", + "integrity": "sha512-n1TP1N+e1CHWIi1BT8h2wu6oQgny23COPqK1q34HduS7Ws3DkNUwmSwt/ypzZcUkrs/ZDLJVzrzyZ9s2TcrCmA==", "os": [ "linux" ], @@ -147,9 +147,9 @@ ] }, "@ax/mod-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-0.19.4.tgz", - "integrity": "sha512-aTQAcIiUg91HPv3Fx4QhFFfpQ3HGNxO4VPtpjHHk+5hnKEP7Q6BQ/7be5NaxdVqIhRVzyoT3m+iBfNJNdOrvsg==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-0.19.6.tgz", + "integrity": "sha512-RRo9oEoKL/XUxwHN3lPHgUDrAuDFQsN96ai9UnEuVrOV6ORNqV2UF3pEERT2Y9yPQBubwr94dPSbtZuGJLimkQ==", "os": [ "win32" ], @@ -158,18 +158,18 @@ ] }, "@ax/mon": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-0.19.4.tgz", - "integrity": "sha512-dN0yntApFz5dsLQyfxd5IalMbUvuKjiWx+zdeEUceTYWOQpWE6QFqODdC7RIAgUvAadlr+OxmzAiWIDMsL5fdw==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-0.19.6.tgz", + "integrity": "sha512-1DzxTbM7hezqKfjWvFppoVURyglO/vDx8yY/ygtOHzp2vN/fgkDS5b0i1ZMYNb8Cqh5bmWiUxef1KCPPuqiLcg==", "dependencies": { - "@ax/mon-linux-x64": "0.19.4", - "@ax/mon-win-x64": "0.19.4" + "@ax/mon-linux-x64": "0.19.6", + "@ax/mon-win-x64": "0.19.6" } }, "@ax/mon-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-0.19.4.tgz", - "integrity": "sha512-5KebvR5UIkQyvOnS5r/TxP4qBOacjFY/jHZa7g64ULf/ymwkGJnT9p2jvILIW987HLkaEsC7gMrwiaZ/72vVCw==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-0.19.6.tgz", + "integrity": "sha512-aruXr5+pkXulrf7+AOr6BbtaIUuS2BEmRmr0p5xfxLVfFmqSGspYQK1KCVh4k3lS6f87BQPMviAHXxWElmyvWA==", "os": [ "linux" ], @@ -178,9 +178,9 @@ ] }, "@ax/mon-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-0.19.4.tgz", - "integrity": "sha512-IKODNyxN+xlD5hlySzePkM+k3EICpvSb4JU7LEOFWSuK5aAl+gBefXnE0M9UWkaxXVxVC3ort9r2dv1OLUCXag==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-0.19.6.tgz", + "integrity": "sha512-suwh5N+dFMNJIgukWp3pzw8QxRzD+ae+tIxZUzHKMV91QbPbcNKJztCqa9y1dRBZyeurz+De5VZUpxZMaRobvw==", "os": [ "win32" ], @@ -189,18 +189,18 @@ ] }, "@ax/sdb": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-0.19.4.tgz", - "integrity": "sha512-m0EhoQyDVAFPC5rKsFjW0YqTMynXH9fmuBeHU+0Ug9YxHeKsRnvjNl/KOAK3tr7/R8cucWY2xn1WCELv4nMPXQ==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-0.19.6.tgz", + "integrity": "sha512-1H2E6VcaYfhGtxnFC58pjekMp8c3ule/byEISTc5G1AWgHV7+ANZtGAgXWIPimYIF5+u6JL/qd4JT94gCweJrA==", "dependencies": { - "@ax/sdb-linux-x64": "0.19.4", - "@ax/sdb-win-x64": "0.19.4" + "@ax/sdb-linux-x64": "0.19.6", + "@ax/sdb-win-x64": "0.19.6" } }, "@ax/sdb-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-0.19.4.tgz", - "integrity": "sha512-Z/ZUVa0Vf7yxc7EPBAa1X1I2OAp47O82ZByYRHMQ5H9n9WfNQin9OCW/AmRXlXcLt3grjIB1w+y0dnfC0lzpfA==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-0.19.6.tgz", + "integrity": "sha512-7oVkmc8nCXIj7dPRHxwUipRVvxQpyYpCNpseWYYsgKyfzaeRKeZpwF3zuSe5I9NSsWenGT1HtvJhyfSJ2Dyebg==", "os": [ "linux" ], @@ -209,9 +209,9 @@ ] }, "@ax/sdb-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-0.19.4.tgz", - "integrity": "sha512-PNokxJe/U9hXWsse/OETS+9194N8lNkrDRnGEp18YMFvBr1Lg+maXmiQvLByS2nET0EkyJmepY77mDw22Eku4A==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-0.19.6.tgz", + "integrity": "sha512-Rkeb7x1I1t3tKpop+xYbNhWw4Qk0u7tU+maj8JsidQyuSEs/dcgOE95nCb32JhaMKRykwZ6uQ0SVsnrqtCvwrA==", "os": [ "win32" ], @@ -220,17 +220,17 @@ ] }, "@ax/sdk": { - "version": "4.0.8", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-4.0.8.tgz", - "integrity": "sha512-zyzHy3wobh4f+uG1MQlh2T+4FkrR9HA6gc9ejB1YZdyD0mrVVgBRLjvW1u4QlNv/lvtGCdNczNUHEUYlU74iaQ==", + "version": "4.0.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-4.0.9.tgz", + "integrity": "sha512-WU8Q7Ozjr197x20X0dEY7cuQ1MtSs3W4TF/4C3Bm8C9u7JBJQHqTiNbpeHmC3XdtxeLHK3l0wQ+f5e5hQYPF4w==", "dependencies": { "@ax/axunit": "4.0.6", "@ax/axunit-ls-contrib": "4.0.6", - "@ax/mod": "0.19.4", - "@ax/mon": "0.19.4", - "@ax/sdb": "0.19.4", + "@ax/mod": "0.19.6", + "@ax/mon": "0.19.6", + "@ax/sdb": "0.19.6", "@ax/sld": "1.0.11", - "@ax/st": "4.0.8", + "@ax/st": "4.0.9", "@ax/target-llvm": "5.4.89", "@ax/target-mc7plus": "5.4.89" } @@ -267,9 +267,9 @@ ] }, "@ax/st": { - "version": "4.0.8", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st/-/st-4.0.8.tgz", - "integrity": "sha512-Qu4xGCcSqOSaotNZHN0M462dPgEEhkmQQxUavzTpVVHKSMnLZ1ixeYBcWpWtXN0bqR8wQCojh8vc3szh41+aIg==", + "version": "4.0.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st/-/st-4.0.9.tgz", + "integrity": "sha512-WLmJ7c9fotx9+/wIWQaj8u0cRhXWh+2g5wr9IwdOfY+5UBkDe0AJcUkKJFWOipi2rZFDHruOhbP/XkrzWvAcmA==", "dependencies": { "@ax/apax-build": "0.7.0", "@ax/stc": "5.4.89" diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json index 543f25b0..2e5862ea 100644 --- a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json +++ b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json @@ -1 +1 @@ -{"OutputProjectFolder":"ix"} \ No newline at end of file +{"OutputProjectFolder":"ix","UseBase":false} \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/AXSharp.config.json b/src/sanbox/integration/ix-integration-plc/AXSharp.config.json index 543f25b0..2e5862ea 100644 --- a/src/sanbox/integration/ix-integration-plc/AXSharp.config.json +++ b/src/sanbox/integration/ix-integration-plc/AXSharp.config.json @@ -1 +1 @@ -{"OutputProjectFolder":"ix"} \ No newline at end of file +{"OutputProjectFolder":"ix","UseBase":false} \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/ax/AXSharp.config.json b/src/tests.integrations/integrated/src/ax/AXSharp.config.json index 4f385272..7f536c15 100644 --- a/src/tests.integrations/integrated/src/ax/AXSharp.config.json +++ b/src/tests.integrations/integrated/src/ax/AXSharp.config.json @@ -1 +1 @@ -{"OutputProjectFolder":"..\\integrated.twin"} \ No newline at end of file +{"OutputProjectFolder":"..\\integrated.twin","UseBase":false} \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/ax/apax-lock.json b/src/tests.integrations/integrated/src/ax/apax-lock.json index d4ee99b0..d0dd2841 100644 --- a/src/tests.integrations/integrated/src/ax/apax-lock.json +++ b/src/tests.integrations/integrated/src/ax/apax-lock.json @@ -127,18 +127,18 @@ } }, "@ax/mod": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-0.19.4.tgz", - "integrity": "sha512-bxlV29MZsvbDHCpEbtdgYwdjC2kZ01Tq9u11263JbBRP7e0amVuRxDvaIN1rgtKiGNigakIdMtHDudlk21FJAQ==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-0.19.6.tgz", + "integrity": "sha512-ox1VIJyq7UgI+73LIwzjCxLSfOLK1PTOveiW/JwqMJWhdpg0MK+UiV8N8LhTxdciXLb4KVB0TmsteEou12SfEQ==", "dependencies": { - "@ax/mod-linux-x64": "0.19.4", - "@ax/mod-win-x64": "0.19.4" + "@ax/mod-linux-x64": "0.19.6", + "@ax/mod-win-x64": "0.19.6" } }, "@ax/mod-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-0.19.4.tgz", - "integrity": "sha512-mi6HBaVCg5DOU3cY7WUrQK6OJdnIRjSo3cSTkDVXEORFqT/GLAGooWW1vGMQqRDuy5yJZ2HUieyyGQkLP0LEZg==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-0.19.6.tgz", + "integrity": "sha512-n1TP1N+e1CHWIi1BT8h2wu6oQgny23COPqK1q34HduS7Ws3DkNUwmSwt/ypzZcUkrs/ZDLJVzrzyZ9s2TcrCmA==", "os": [ "linux" ], @@ -147,9 +147,9 @@ ] }, "@ax/mod-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-0.19.4.tgz", - "integrity": "sha512-aTQAcIiUg91HPv3Fx4QhFFfpQ3HGNxO4VPtpjHHk+5hnKEP7Q6BQ/7be5NaxdVqIhRVzyoT3m+iBfNJNdOrvsg==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-0.19.6.tgz", + "integrity": "sha512-RRo9oEoKL/XUxwHN3lPHgUDrAuDFQsN96ai9UnEuVrOV6ORNqV2UF3pEERT2Y9yPQBubwr94dPSbtZuGJLimkQ==", "os": [ "win32" ], @@ -158,18 +158,18 @@ ] }, "@ax/mon": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-0.19.4.tgz", - "integrity": "sha512-dN0yntApFz5dsLQyfxd5IalMbUvuKjiWx+zdeEUceTYWOQpWE6QFqODdC7RIAgUvAadlr+OxmzAiWIDMsL5fdw==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-0.19.6.tgz", + "integrity": "sha512-1DzxTbM7hezqKfjWvFppoVURyglO/vDx8yY/ygtOHzp2vN/fgkDS5b0i1ZMYNb8Cqh5bmWiUxef1KCPPuqiLcg==", "dependencies": { - "@ax/mon-linux-x64": "0.19.4", - "@ax/mon-win-x64": "0.19.4" + "@ax/mon-linux-x64": "0.19.6", + "@ax/mon-win-x64": "0.19.6" } }, "@ax/mon-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-0.19.4.tgz", - "integrity": "sha512-5KebvR5UIkQyvOnS5r/TxP4qBOacjFY/jHZa7g64ULf/ymwkGJnT9p2jvILIW987HLkaEsC7gMrwiaZ/72vVCw==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-0.19.6.tgz", + "integrity": "sha512-aruXr5+pkXulrf7+AOr6BbtaIUuS2BEmRmr0p5xfxLVfFmqSGspYQK1KCVh4k3lS6f87BQPMviAHXxWElmyvWA==", "os": [ "linux" ], @@ -178,9 +178,9 @@ ] }, "@ax/mon-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-0.19.4.tgz", - "integrity": "sha512-IKODNyxN+xlD5hlySzePkM+k3EICpvSb4JU7LEOFWSuK5aAl+gBefXnE0M9UWkaxXVxVC3ort9r2dv1OLUCXag==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-0.19.6.tgz", + "integrity": "sha512-suwh5N+dFMNJIgukWp3pzw8QxRzD+ae+tIxZUzHKMV91QbPbcNKJztCqa9y1dRBZyeurz+De5VZUpxZMaRobvw==", "os": [ "win32" ], @@ -189,18 +189,18 @@ ] }, "@ax/sdb": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-0.19.4.tgz", - "integrity": "sha512-m0EhoQyDVAFPC5rKsFjW0YqTMynXH9fmuBeHU+0Ug9YxHeKsRnvjNl/KOAK3tr7/R8cucWY2xn1WCELv4nMPXQ==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-0.19.6.tgz", + "integrity": "sha512-1H2E6VcaYfhGtxnFC58pjekMp8c3ule/byEISTc5G1AWgHV7+ANZtGAgXWIPimYIF5+u6JL/qd4JT94gCweJrA==", "dependencies": { - "@ax/sdb-linux-x64": "0.19.4", - "@ax/sdb-win-x64": "0.19.4" + "@ax/sdb-linux-x64": "0.19.6", + "@ax/sdb-win-x64": "0.19.6" } }, "@ax/sdb-linux-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-0.19.4.tgz", - "integrity": "sha512-Z/ZUVa0Vf7yxc7EPBAa1X1I2OAp47O82ZByYRHMQ5H9n9WfNQin9OCW/AmRXlXcLt3grjIB1w+y0dnfC0lzpfA==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-0.19.6.tgz", + "integrity": "sha512-7oVkmc8nCXIj7dPRHxwUipRVvxQpyYpCNpseWYYsgKyfzaeRKeZpwF3zuSe5I9NSsWenGT1HtvJhyfSJ2Dyebg==", "os": [ "linux" ], @@ -209,9 +209,9 @@ ] }, "@ax/sdb-win-x64": { - "version": "0.19.4", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-0.19.4.tgz", - "integrity": "sha512-PNokxJe/U9hXWsse/OETS+9194N8lNkrDRnGEp18YMFvBr1Lg+maXmiQvLByS2nET0EkyJmepY77mDw22Eku4A==", + "version": "0.19.6", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-0.19.6.tgz", + "integrity": "sha512-Rkeb7x1I1t3tKpop+xYbNhWw4Qk0u7tU+maj8JsidQyuSEs/dcgOE95nCb32JhaMKRykwZ6uQ0SVsnrqtCvwrA==", "os": [ "win32" ], @@ -220,56 +220,79 @@ ] }, "@ax/sdk": { - "version": "4.0.8", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-4.0.8.tgz", - "integrity": "sha512-zyzHy3wobh4f+uG1MQlh2T+4FkrR9HA6gc9ejB1YZdyD0mrVVgBRLjvW1u4QlNv/lvtGCdNczNUHEUYlU74iaQ==", + "version": "4.0.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-4.0.9.tgz", + "integrity": "sha512-WU8Q7Ozjr197x20X0dEY7cuQ1MtSs3W4TF/4C3Bm8C9u7JBJQHqTiNbpeHmC3XdtxeLHK3l0wQ+f5e5hQYPF4w==", "dependencies": { "@ax/axunit": "4.0.6", "@ax/axunit-ls-contrib": "4.0.6", - "@ax/mod": "0.19.4", - "@ax/mon": "0.19.4", - "@ax/sdb": "0.19.4", + "@ax/mod": "0.19.6", + "@ax/mon": "0.19.6", + "@ax/sdb": "0.19.6", "@ax/sld": "1.0.11", - "@ax/st": "4.0.8", + "@ax/st": "4.0.9", "@ax/target-llvm": "5.4.89", "@ax/target-mc7plus": "5.4.89" } }, "@ax/sld": { - "version": "1.0.11", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-1.0.11.tgz", - "integrity": "sha512-l+sJGBl604kyWrq5/dtsYc96MX5UbwGBTfrDXmbIrnPuuCpS+pJ4/B4CEunskb2r6qfgQ2j4cXu5b5h06pd0jw==", + "version": "0.15.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-0.15.9.tgz", + "integrity": "sha512-Moqh0zbGNcpD88Z3uax2iXL0exnjsgXQodaZXiIFy5CrQaJzM3X/EzEHKBXQ8q+Xr8hs/Q6fWTUkkbDezVBZ6Q==", + "dependencies": { + "@ax/sld-linux-x64": "0.15.9", + "@ax/sld-win-x64": "0.15.9" + } + }, + "@ax/sld-linux-x64": { + "version": "0.15.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld-linux-x64/-/sld-linux-x64-0.15.9.tgz", + "integrity": "sha512-jChM/HtZIP+nfMdkKYpkDkllg+tGkK9Y8qpVmCUjmliJ1nyO2mprVMRJKI9Q3m81mGdzpuD+vew4Vgx2e6xptw==", + "os": [ + "linux" + ], + "cpu": [ + "x64" + ] + }, + "@ax/sld-win-x64": { + "version": "0.15.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld-win-x64/-/sld-win-x64-0.15.9.tgz", + "integrity": "sha512-NYPJWNaNAZAL3t33gRb6cI9n1rvogbyrbb/Y0agBnvjY+MBqNxviyizFyMsloql//vZwKKl674TPFx4FFWcYDg==", + "os": [ + "win32" + ], "cpu": [ "x64" ] }, "@ax/st": { - "version": "4.0.8", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st/-/st-4.0.8.tgz", - "integrity": "sha512-Qu4xGCcSqOSaotNZHN0M462dPgEEhkmQQxUavzTpVVHKSMnLZ1ixeYBcWpWtXN0bqR8wQCojh8vc3szh41+aIg==", + "version": "4.0.9", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st/-/st-4.0.9.tgz", + "integrity": "sha512-WLmJ7c9fotx9+/wIWQaj8u0cRhXWh+2g5wr9IwdOfY+5UBkDe0AJcUkKJFWOipi2rZFDHruOhbP/XkrzWvAcmA==", "dependencies": { "@ax/apax-build": "0.7.0", "@ax/stc": "5.4.89" } }, "@ax/st-docs": { - "version": "5.4.89", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-5.4.89.tgz", - "integrity": "sha512-TogaSV69nQtoPVUFMna4rZOz64SEa5m8mfEjoXcYABI1GgDhqz9ptzzCLbpcz7l6+zimdv1erV36WxRYoX9guQ==" + "version": "5.4.92", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-5.4.92.tgz", + "integrity": "sha512-nBNjUsS3YIP4ww9QPEW5H5zleHUSnkUAzZdKatLhF/ffOvFCRO/s78ECDD43QUI33+yuoP2wsaotCcoz0qnk4g==" }, "@ax/stc": { - "version": "5.4.89", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-5.4.89.tgz", - "integrity": "sha512-PylnoEsIPZj8IK2XwSnjHlDK66CJ7ABaZ9UqBLGP281JI5XLwP88+e9Xjb7RjZbyomeg+1lcvHT1juXZSyc8Ig==", + "version": "5.4.92", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-5.4.92.tgz", + "integrity": "sha512-yiOSa2zkG5s+/JHAbYFxcVXW0ud/cCP5HmVlcF0+AiH9smQX1qwydbx76zW0vz2tLUOkfgTmhzGhwbQAXm3sOw==", "dependencies": { - "@ax/stc-linux-x64": "5.4.89", - "@ax/stc-win-x64": "5.4.89" + "@ax/stc-linux-x64": "5.4.92", + "@ax/stc-win-x64": "5.4.92" } }, "@ax/stc-linux-x64": { - "version": "5.4.89", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-5.4.89.tgz", - "integrity": "sha512-WFNqenCSEs+Qy1ZzSEEmmg7eOxUggPyVqJ+ZQjwR+LqAmVYJRm0yFzOFQvTghVO/znvSgGeKywK8W9OjFu2BEw==", + "version": "5.4.92", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-5.4.92.tgz", + "integrity": "sha512-OCxzgK9L0CFYnuuEEcaUMn3C35gjq4odqx1q0VSOu90Sk8BKKXHhCf0bLerhRXsbdkdwvZRa2NQpcLFiiti2mQ==", "os": [ "linux" ], @@ -277,13 +300,13 @@ "x64" ], "dependencies": { - "@ax/st-docs": "5.4.89" + "@ax/st-docs": "5.4.92" } }, "@ax/stc-win-x64": { - "version": "5.4.89", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-5.4.89.tgz", - "integrity": "sha512-ysCVJdJ3Gk7p+FzHhntapHYhvKkyHVU0HV36pMBrpYVTCgTOoHlFkeDeTy+JU6cfx7x4LVuIFTzQusJrFPUs8g==", + "version": "5.4.92", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-5.4.92.tgz", + "integrity": "sha512-wgfHPuROR8nrcPy69R6tBbfNe+VRGdZ0b7R0RcW8msLQua+oHu5dlRD/rzlb16+6+KkkvC2XSO0roDL23UtXZA==", "os": [ "win32" ], @@ -291,7 +314,7 @@ "x64" ], "dependencies": { - "@ax/st-docs": "5.4.89" + "@ax/st-docs": "5.4.92" } }, "@ax/target-axunit": { diff --git a/src/tests.integrations/integrated/src/ax/apax.yml b/src/tests.integrations/integrated/src/ax/apax.yml index b04ecc21..9afa2f68 100644 --- a/src/tests.integrations/integrated/src/ax/apax.yml +++ b/src/tests.integrations/integrated/src/ax/apax.yml @@ -7,7 +7,10 @@ targets: - plcsim - swcpu devDependencies: - "@ax/sdk": ^4.0.3 + "@ax/sdk": ^4.0.8 + "@ax/sld": ^0.15.9 + "@ax/stc": ^5.4.89 + variables: APAX_BUILD_ARGS: [ -d ] scripts: 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 691e1aef..2785a655 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 @@ -176,7 +176,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Pokus plain = new Pocos.Pokus(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Nested = await Nested.OnlineToPlainAsync(); return plain; } @@ -195,7 +195,7 @@ public async virtual Task PlainToOnline(T plain) public async Task> PlainToOnlineAsync(Pocos.Pokus plain) { await this.Nested.PlainToOnlineAsync(plain.Nested); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -335,7 +335,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.Nested plain = new Pocos.Nested(); - await this.ReadAsync(); + await this.ReadAsync(); plain.SomeString = SomeString.LastValue; plain.SomeInt = SomeInt.LastValue; plain.SomeByte = SomeByte.LastValue; @@ -360,7 +360,7 @@ public async Task> PlainToOnlineAsync(Pocos.Nested p SomeString.Cyclic = plain.SomeString; SomeInt.Cyclic = plain.SomeInt; SomeByte.Cyclic = plain.SomeByte; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 a5f1e7ef..457b1a6c 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 @@ -99,7 +99,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.all_primitives plain = new Pocos.all_primitives(); - await this.ReadAsync(); + await this.ReadAsync(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; plain.myWORD = myWORD.LastValue; @@ -184,7 +184,7 @@ public async Task> PlainToOnlineAsync(Pocos.all_prim mySTRING.Cyclic = plain.mySTRING; myWSTRING.Cyclic = plain.myWSTRING; myEnum.Cyclic = (short)plain.myEnum; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 1ab6e53b..1da9239e 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 @@ -45,7 +45,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.MonsterData.MonsterBase plain = new Pocos.MonsterData.MonsterBase(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; plain.ArrayOfBytes = ArrayOfBytes.Select(p => p.LastValue).ToArray(); @@ -75,7 +75,7 @@ public async Task> PlainToOnlineAsync(Pocos.MonsterD ArrayOfBytes.Select(p => p.Cyclic = plain.ArrayOfBytes[_ArrayOfBytes_i_FE8484DAB3++]).ToArray(); var _ArrayOfDrives_i_FE8484DAB3 = 0; ArrayOfDrives.Select(p => p.PlainToOnlineAsync(plain.ArrayOfDrives[_ArrayOfDrives_i_FE8484DAB3++])).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -214,7 +214,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.MonsterData.Monster plain = new Pocos.MonsterData.Monster(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); plain.DriveA = await DriveA.OnlineToPlainAsync(); return plain; @@ -236,7 +236,7 @@ public async Task> PlainToOnlineAsync(Pocos.MonsterD { await base.PlainToOnlineAsync(plain); await this.DriveA.PlainToOnlineAsync(plain.DriveA); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -319,7 +319,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.MonsterData.DriveBase plain = new Pocos.MonsterData.DriveBase(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -347,7 +347,7 @@ public async Task> PlainToOnlineAsync(Pocos.MonsterD Velo.Cyclic = plain.Velo; Acc.Cyclic = plain.Acc; Dcc.Cyclic = plain.Dcc; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() 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 2a6356d4..fbb4bb2d 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 @@ -54,7 +54,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RealMonsterData.RealMonsterBase plain = new Pocos.RealMonsterData.RealMonsterBase(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; plain.TestDate = TestDate.LastValue; @@ -93,7 +93,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons ArrayOfBytes.Select(p => p.Cyclic = plain.ArrayOfBytes[_ArrayOfBytes_i_FE8484DAB3++]).ToArray(); var _ArrayOfDrives_i_FE8484DAB3 = 0; ArrayOfDrives.Select(p => p.PlainToOnlineAsync(plain.ArrayOfDrives[_ArrayOfDrives_i_FE8484DAB3++])).ToArray(); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -241,7 +241,7 @@ public async override Task OnlineToPlain() public new async Task OnlineToPlainAsync() { Pocos.RealMonsterData.RealMonster plain = new Pocos.RealMonsterData.RealMonster(); - await this.ReadAsync(); + await this.ReadAsync(); await base.OnlineToPlainAsync(plain); plain.DriveA = await DriveA.OnlineToPlainAsync(); return plain; @@ -263,7 +263,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons { await base.PlainToOnlineAsync(plain); await this.DriveA.PlainToOnlineAsync(plain.DriveA); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async override Task ShadowToPlain() @@ -349,7 +349,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RealMonsterData.DriveBaseNested plain = new Pocos.RealMonsterData.DriveBaseNested(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -380,7 +380,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons Acc.Cyclic = plain.Acc; Dcc.Cyclic = plain.Dcc; await this.NestedLevelOne.PlainToOnlineAsync(plain.NestedLevelOne); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -538,7 +538,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RealMonsterData.NestedLevelOne plain = new Pocos.RealMonsterData.NestedLevelOne(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -569,7 +569,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons Acc.Cyclic = plain.Acc; Dcc.Cyclic = plain.Dcc; await this.NestedLevelTwo.PlainToOnlineAsync(plain.NestedLevelTwo); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -727,7 +727,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RealMonsterData.NestedLevelTwo plain = new Pocos.RealMonsterData.NestedLevelTwo(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -758,7 +758,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons Acc.Cyclic = plain.Acc; Dcc.Cyclic = plain.Dcc; await this.NestedLevelThree.PlainToOnlineAsync(plain.NestedLevelThree); - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() @@ -913,7 +913,7 @@ public async virtual Task OnlineToPlain() public async Task OnlineToPlainAsync() { Pocos.RealMonsterData.NestedLevelThree plain = new Pocos.RealMonsterData.NestedLevelThree(); - await this.ReadAsync(); + await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -941,7 +941,7 @@ public async Task> PlainToOnlineAsync(Pocos.RealMons Velo.Cyclic = plain.Velo; Acc.Cyclic = plain.Acc; Dcc.Cyclic = plain.Dcc; - return await this.WriteAsync(); + return await this.WriteAsync(); } public async virtual Task ShadowToPlain() diff --git a/test_L10.ps1 b/test_L10.ps1 index aa96e560..ab64f11a 100644 --- a/test_L10.ps1 +++ b/test_L10.ps1 @@ -1,4 +1,4 @@ # run build -dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 10 +dotnet run --project cake/Build.csproj --do-test --test-level 10 exit $LASTEXITCODE; \ No newline at end of file