diff --git a/cake/Program.cs b/cake/Program.cs index 11d4aed74..0f30fc2ec 100644 --- a/cake/Program.cs +++ b/cake/Program.cs @@ -170,19 +170,34 @@ public override void Run(BuildContext context) } if (context.BuildParameters.TestLevel >= 3) { - context.UploadTestPlc( - Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")), - Environment.GetEnvironmentVariable("AXTARGET"), - Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT")); - - context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf")); - - context.UploadTestPlc( - Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")), - Environment.GetEnvironmentVariable("AXTARGET"), - Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT")); - - context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf")); + // This must be run in a separate environment! + try + { + context.UploadTestPlc( + Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//AXSharp.connectors//tests//ax-test-project//")), + Environment.GetEnvironmentVariable("AXTARGET"), + Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT")); + + context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_WebApi.slnf")); + } + catch + { + System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT"); + } + + try + { + context.UploadTestPlc( + Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")), + Environment.GetEnvironmentVariable("AXTARGET"), + Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT")); + + context.RunTestsFromFilteredSolution(Path.Combine(context.ScrDir, "AXSharp-L3-tests_Integration.slnf")); + } + catch + { + System.Console.WriteLine("Some WebAPI tests failed. RUN IN APPROPRIATE EVNIRONMENT"); + } } diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/CsHelpers.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/CsHelpers.cs index 52fb9f68a..20e6a7075 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/CsHelpers.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/CsHelpers.cs @@ -67,6 +67,6 @@ public static string CreateGenericSwapperMethodFromPlainer(string methodName, st /// Fully qualified poco name for given declarations public static string GetFullyQualifiedPocoName(this IDeclaration declaration) { - return declaration.ContainingNamespace.FullyQualifiedName == "$GLOBAL" ? $"global::Pocos.{declaration.Name}" : $"{declaration.ContainingNamespace.FullyQualifiedName}.Pocos.{declaration.Name}"; + return declaration.ContainingNamespace.FullyQualifiedName == "$GLOBAL" ? $"global::Pocos.{declaration.Name}" : $"Pocos.{declaration.ContainingNamespace.FullyQualifiedName}.{declaration.Name}"; } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs index 7a065e1bd..7af3e64db 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs @@ -67,9 +67,6 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta TypeCommAccessibility = eCommAccessibility.ReadOnly; } - - AddToSource($"namespace Pocos{{"); - classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this)); var classDeclarations = this.Compilation.GetSemanticTree().Classes @@ -82,7 +79,7 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta .Any(p => p.FullyQualifiedName == classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.FullyQualifiedName); if (isExtended) - AddToSource($" : {classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.GetFullyQualifiedPocoName()}"); + AddToSource($" : {classDeclaration.ExtendedTypeAccesses.FirstOrDefault()?.Type.FullyQualifiedName}"); @@ -101,8 +98,6 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this)); classDeclaration.Fields.ToList().ForEach(p => p.Accept(visitor, this)); AddToSource("}"); - - AddToSource("}"); // Close namespace } /// @@ -200,9 +195,11 @@ public void CreateFile(IFileSyntax fileSyntax, IxNodeVisitor visitor) fileSyntax.UsingDirectives .Where(p => this.Compilation.GetSemanticTree().Namespaces.Select(p => p.FullyQualifiedName).Contains(p.QualifiedIdentifierList.GetText()))) { - AddToSource($"using {fileSyntaxUsingDirective.QualifiedIdentifierList.GetText()}.Pocos;"); + AddToSource($"using Pocos.{fileSyntaxUsingDirective.QualifiedIdentifierList.GetText()};"); } + AddToSource("namespace Pocos {"); fileSyntax.Declarations.ToList().ForEach(p => p.Visit(visitor, this)); + AddToSource("}"); } /// @@ -212,19 +209,9 @@ public void CreateConfigDeclaration(IConfigDeclarationSyntax configDeclarationSy { TypeCommAccessibility = eCommAccessibility.None; - if (configurationDeclaration.ContainingNamespace.FullyQualifiedName != "$GLOBAL") - { - AddToSource($"namespace {configurationDeclaration.ContainingNamespace.FullyQualifiedName}.Pocos{{"); - } - else - { - AddToSource($"namespace Pocos{{"); - } - AddToSource($"public partial class {Project.TargetProject.ProjectRootNamespace}TwinController{{"); configurationDeclaration.Variables.ToList().ForEach(p => p.Accept(visitor, this)); AddToSource("}"); - AddToSource("}");// closing namespace } /// @@ -333,9 +320,7 @@ public void CreateStructuredType(IStructTypeDeclarationSyntax structTypeDeclarat IxNodeVisitor visitor) { TypeCommAccessibility = structuredTypeDeclaration.GetCommAccessibility(this); - - AddToSource($"namespace Pocos{{"); - + AddToSource( $"{structuredTypeDeclaration.AccessModifier.Transform()}partial class {structTypeDeclarationSyntax.Name.Text} : AXSharp.Connector.IPlain"); AddToSource("{"); @@ -344,8 +329,6 @@ public void CreateStructuredType(IStructTypeDeclarationSyntax structTypeDeclarat structuredTypeDeclaration.Fields.ToList().ForEach(p => p.Accept(visitor, this)); AddToSource("}"); - - AddToSource("}"); // namespace closing } /// @@ -369,13 +352,13 @@ public void CreateScalarTypeDeclaration(IScalarTypeDeclaration scalarTypeDeclara /// public void CreateClassDeclaration(IClassDeclaration classDeclaration, IxNodeVisitor data) { - AddToSource(classDeclaration.GetFullyQualifiedPocoName()); + AddToSource(classDeclaration.GetQualifiedName()); } /// public void CreateInterfaceDeclaration(IInterfaceDeclaration interfaceDeclaration, IxNodeVisitor visitor) { - AddToSource(interfaceDeclaration.GetFullyQualifiedPocoName()); + AddToSource(interfaceDeclaration.GetQualifiedName()); } /// @@ -404,7 +387,7 @@ public void CreateStringTypeDeclaration(IStringTypeDeclaration stringTypeDeclara public void CreateStructuredType(IStructuredTypeDeclaration structuredTypeDeclaration, IxNodeVisitor visitor) { structuredTypeDeclaration.Pragmas.ToList().ForEach(p => p.Accept(visitor, this)); - AddToSource($"{structuredTypeDeclaration.GetFullyQualifiedPocoName()}"); + AddToSource($"{structuredTypeDeclaration.GetQualifiedName()}"); } /// 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 bbe1e56be..d306e6373 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 @@ -36,9 +36,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain = new ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class(); + Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain = new Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class(); await this.ReadAsync(); plain.primitive = primitive.Select(p => p.LastValue).ToArray(); #pragma warning disable CS0612 @@ -49,9 +49,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain = new ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class(); + Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain = new Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class(); plain.primitive = primitive.Select(p => p.LastValue).ToArray(); #pragma warning disable CS0612 plain.complex = complex.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); @@ -61,7 +61,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain) { plain.primitive = primitive.Select(p => p.LastValue).ToArray(); #pragma warning disable CS0612 @@ -75,7 +75,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain) + public async Task> PlainToOnlineAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain) { var _primitive_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -90,7 +90,7 @@ public async Task> PlainToOnlineAsync(ArrayDeclarati [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain) { var _primitive_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -107,15 +107,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain = new ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class(); + Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain = new Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class(); plain.primitive = primitive.Select(p => p.Shadow).ToArray(); plain.complex = complex.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); return plain; } - protected async Task ShadowToPlainAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain) + protected async Task ShadowToPlainAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain) { plain.primitive = primitive.Select(p => p.Shadow).ToArray(); plain.complex = complex.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); @@ -127,7 +127,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain) + public async Task> PlainToShadowAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain) { var _primitive_i_FE8484DAB3 = 0; primitive.Select(p => p.Shadow = plain.primitive[_primitive_i_FE8484DAB3++]).ToArray(); @@ -146,7 +146,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class plain, ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain, Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -175,9 +175,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class CreateEmptyPoco() + public Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class CreateEmptyPoco() { - return new ArrayDeclarationSimpleNamespace.Pocos.array_declaration_class(); + return new Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class(); } private IList Children { get; } = new List(); @@ -278,24 +278,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain = new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type(); + Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain = new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain = new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type(); + Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain = new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { return plain; } @@ -305,14 +305,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain) + public async Task> PlainToOnlineAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { } @@ -321,13 +321,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain = new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type(); + Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain = new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(); return plain; } - protected async Task ShadowToPlainAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain) + protected async Task ShadowToPlainAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { return plain; } @@ -337,7 +337,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain) + public async Task> PlainToShadowAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain) { return this.RetrievePrimitives(); } @@ -352,7 +352,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ArrayDeclarationSimpleNamespace.Pocos.some_complex_type plain, ArrayDeclarationSimpleNamespace.Pocos.some_complex_type latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain, Pocos.ArrayDeclarationSimpleNamespace.some_complex_type latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -369,9 +369,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ArrayDeclarationSimpleNamespace.Pocos.some_complex_type CreateEmptyPoco() + public Pocos.ArrayDeclarationSimpleNamespace.some_complex_type CreateEmptyPoco() { - return new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type(); + return new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(); } private IList Children { get; } = new List(); 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 17b37b6e7..e845f2dd8 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 @@ -23,9 +23,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.State1Transition plain = new Simatic.Ax.StateFramework.Pocos.State1Transition(); + Pocos.Simatic.Ax.StateFramework.State1Transition plain = new Pocos.Simatic.Ax.StateFramework.State1Transition(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -35,9 +35,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - Simatic.Ax.StateFramework.Pocos.State1Transition plain = new Simatic.Ax.StateFramework.Pocos.State1Transition(); + Pocos.Simatic.Ax.StateFramework.State1Transition plain = new Pocos.Simatic.Ax.StateFramework.State1Transition(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -46,7 +46,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -59,7 +59,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain) + public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { await base._PlainToOnlineNoacAsync(plain); return await this.WriteAsync(); @@ -67,7 +67,7 @@ public async Task> PlainToOnlineAsync(Simatic.Ax.Sta [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { await base._PlainToOnlineNoacAsync(plain); } @@ -77,14 +77,14 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.State1Transition plain = new Simatic.Ax.StateFramework.Pocos.State1Transition(); + Pocos.Simatic.Ax.StateFramework.State1Transition plain = new Pocos.Simatic.Ax.StateFramework.State1Transition(); await base.ShadowToPlainAsync(plain); return plain; } - protected async Task ShadowToPlainAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain) + protected async Task ShadowToPlainAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { await base.ShadowToPlainAsync(plain); return plain; @@ -95,7 +95,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain) + public async Task> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain) { await base.PlainToShadowAsync(plain); return this.RetrievePrimitives(); @@ -111,7 +111,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(Simatic.Ax.StateFramework.Pocos.State1Transition plain, Simatic.Ax.StateFramework.Pocos.State1Transition latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain, Pocos.Simatic.Ax.StateFramework.State1Transition latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -130,9 +130,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new Simatic.Ax.StateFramework.Pocos.State1Transition CreateEmptyPoco() + public new Pocos.Simatic.Ax.StateFramework.State1Transition CreateEmptyPoco() { - return new Simatic.Ax.StateFramework.Pocos.State1Transition(); + return new Pocos.Simatic.Ax.StateFramework.State1Transition(); } } } @@ -166,9 +166,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.AbstractState plain = new Simatic.Ax.StateFramework.Pocos.AbstractState(); + Pocos.Simatic.Ax.StateFramework.AbstractState plain = new Pocos.Simatic.Ax.StateFramework.AbstractState(); await this.ReadAsync(); plain.StateID = StateID.LastValue; plain.StateName = StateName.LastValue; @@ -177,9 +177,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Simatic.Ax.StateFramework.Pocos.AbstractState plain = new Simatic.Ax.StateFramework.Pocos.AbstractState(); + Pocos.Simatic.Ax.StateFramework.AbstractState plain = new Pocos.Simatic.Ax.StateFramework.AbstractState(); plain.StateID = StateID.LastValue; plain.StateName = StateName.LastValue; return plain; @@ -187,7 +187,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain) { plain.StateID = StateID.LastValue; plain.StateName = StateName.LastValue; @@ -199,7 +199,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain) + public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain) { #pragma warning disable CS0612 StateID.LethargicWrite(plain.StateID); @@ -212,7 +212,7 @@ public async Task> PlainToOnlineAsync(Simatic.Ax.Sta [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain) { #pragma warning disable CS0612 StateID.LethargicWrite(plain.StateID); @@ -227,15 +227,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.AbstractState plain = new Simatic.Ax.StateFramework.Pocos.AbstractState(); + Pocos.Simatic.Ax.StateFramework.AbstractState plain = new Pocos.Simatic.Ax.StateFramework.AbstractState(); plain.StateID = StateID.Shadow; plain.StateName = StateName.Shadow; return plain; } - protected async Task ShadowToPlainAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain) + protected async Task ShadowToPlainAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain) { plain.StateID = StateID.Shadow; plain.StateName = StateName.Shadow; @@ -247,7 +247,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain) + public async Task> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain) { StateID.Shadow = plain.StateID; StateName.Shadow = plain.StateName; @@ -264,7 +264,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Simatic.Ax.StateFramework.Pocos.AbstractState plain, Simatic.Ax.StateFramework.Pocos.AbstractState latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain, Pocos.Simatic.Ax.StateFramework.AbstractState latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -285,9 +285,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Simatic.Ax.StateFramework.Pocos.AbstractState CreateEmptyPoco() + public Pocos.Simatic.Ax.StateFramework.AbstractState CreateEmptyPoco() { - return new Simatic.Ax.StateFramework.Pocos.AbstractState(); + return new Pocos.Simatic.Ax.StateFramework.AbstractState(); } private IList Children { get; } = new List(); 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 f8030c33f..55bb0214f 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 @@ -29,24 +29,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Generics.Pocos.Extender plain = new Generics.Pocos.Extender(); + Pocos.Generics.Extender plain = new Pocos.Generics.Extender(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Generics.Pocos.Extender plain = new Generics.Pocos.Extender(); + Pocos.Generics.Extender plain = new Pocos.Generics.Extender(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Generics.Pocos.Extender plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Generics.Extender plain) { return plain; } @@ -56,14 +56,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Generics.Pocos.Extender plain) + public async Task> PlainToOnlineAsync(Pocos.Generics.Extender plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Generics.Pocos.Extender plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Generics.Extender plain) { } @@ -72,13 +72,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Generics.Pocos.Extender plain = new Generics.Pocos.Extender(); + Pocos.Generics.Extender plain = new Pocos.Generics.Extender(); return plain; } - protected async Task ShadowToPlainAsync(Generics.Pocos.Extender plain) + protected async Task ShadowToPlainAsync(Pocos.Generics.Extender plain) { return plain; } @@ -88,7 +88,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Generics.Pocos.Extender plain) + public async Task> PlainToShadowAsync(Pocos.Generics.Extender plain) { return this.RetrievePrimitives(); } @@ -103,7 +103,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Generics.Pocos.Extender plain, Generics.Pocos.Extender latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Generics.Extender plain, Pocos.Generics.Extender latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -120,9 +120,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Generics.Pocos.Extender CreateEmptyPoco() + public Pocos.Generics.Extender CreateEmptyPoco() { - return new Generics.Pocos.Extender(); + return new Pocos.Generics.Extender(); } private IList Children { get; } = new List(); @@ -222,9 +222,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - Generics.Pocos.Extendee plain = new Generics.Pocos.Extendee(); + Pocos.Generics.Extendee plain = new Pocos.Generics.Extendee(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -240,9 +240,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - Generics.Pocos.Extendee plain = new Generics.Pocos.Extendee(); + Pocos.Generics.Extendee plain = new Pocos.Generics.Extendee(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -257,7 +257,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Generics.Pocos.Extendee plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Generics.Extendee plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -276,7 +276,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Generics.Pocos.Extendee plain) + public async Task> PlainToOnlineAsync(Pocos.Generics.Extendee plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -290,7 +290,7 @@ public async Task> PlainToOnlineAsync(Generics.Pocos [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Generics.Pocos.Extendee plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Generics.Extendee plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -306,16 +306,16 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - Generics.Pocos.Extendee plain = new Generics.Pocos.Extendee(); + Pocos.Generics.Extendee plain = new Pocos.Generics.Extendee(); await base.ShadowToPlainAsync(plain); plain.SomeType = await SomeType.ShadowToPlainAsync(); plain.SomeTypeAsPoco = await SomeTypeAsPoco.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(Generics.Pocos.Extendee plain) + protected async Task ShadowToPlainAsync(Pocos.Generics.Extendee plain) { await base.ShadowToPlainAsync(plain); plain.SomeType = await SomeType.ShadowToPlainAsync(); @@ -328,7 +328,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Generics.Pocos.Extendee plain) + public async Task> PlainToShadowAsync(Pocos.Generics.Extendee plain) { await base.PlainToShadowAsync(plain); await this.SomeType.PlainToShadowAsync(plain.SomeType); @@ -346,7 +346,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(Generics.Pocos.Extendee plain, Generics.Pocos.Extendee latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.Generics.Extendee plain, Pocos.Generics.Extendee latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -369,9 +369,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new Generics.Pocos.Extendee CreateEmptyPoco() + public new Pocos.Generics.Extendee CreateEmptyPoco() { - return new Generics.Pocos.Extendee(); + return new Pocos.Generics.Extendee(); } } @@ -394,9 +394,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - Generics.Pocos.Extendee2 plain = new Generics.Pocos.Extendee2(); + Pocos.Generics.Extendee2 plain = new Pocos.Generics.Extendee2(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -409,9 +409,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - Generics.Pocos.Extendee2 plain = new Generics.Pocos.Extendee2(); + Pocos.Generics.Extendee2 plain = new Pocos.Generics.Extendee2(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -423,7 +423,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Generics.Pocos.Extendee2 plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Generics.Extendee2 plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -439,7 +439,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Generics.Pocos.Extendee2 plain) + public async Task> PlainToOnlineAsync(Pocos.Generics.Extendee2 plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -450,7 +450,7 @@ public async Task> PlainToOnlineAsync(Generics.Pocos [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Generics.Pocos.Extendee2 plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Generics.Extendee2 plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -463,15 +463,15 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - Generics.Pocos.Extendee2 plain = new Generics.Pocos.Extendee2(); + Pocos.Generics.Extendee2 plain = new Pocos.Generics.Extendee2(); await base.ShadowToPlainAsync(plain); plain.SomeType = await SomeType.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(Generics.Pocos.Extendee2 plain) + protected async Task ShadowToPlainAsync(Pocos.Generics.Extendee2 plain) { await base.ShadowToPlainAsync(plain); plain.SomeType = await SomeType.ShadowToPlainAsync(); @@ -483,7 +483,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Generics.Pocos.Extendee2 plain) + public async Task> PlainToShadowAsync(Pocos.Generics.Extendee2 plain) { await base.PlainToShadowAsync(plain); await this.SomeType.PlainToShadowAsync(plain.SomeType); @@ -500,7 +500,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(Generics.Pocos.Extendee2 plain, Generics.Pocos.Extendee2 latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.Generics.Extendee2 plain, Pocos.Generics.Extendee2 latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -521,9 +521,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new Generics.Pocos.Extendee2 CreateEmptyPoco() + public new Pocos.Generics.Extendee2 CreateEmptyPoco() { - return new Generics.Pocos.Extendee2(); + return new Pocos.Generics.Extendee2(); } } @@ -549,24 +549,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Generics.Pocos.SomeType plain = new Generics.Pocos.SomeType(); + Pocos.Generics.SomeType plain = new Pocos.Generics.SomeType(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Generics.Pocos.SomeType plain = new Generics.Pocos.SomeType(); + Pocos.Generics.SomeType plain = new Pocos.Generics.SomeType(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Generics.Pocos.SomeType plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Generics.SomeType plain) { return plain; } @@ -576,14 +576,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Generics.Pocos.SomeType plain) + public async Task> PlainToOnlineAsync(Pocos.Generics.SomeType plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Generics.Pocos.SomeType plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Generics.SomeType plain) { } @@ -592,13 +592,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Generics.Pocos.SomeType plain = new Generics.Pocos.SomeType(); + Pocos.Generics.SomeType plain = new Pocos.Generics.SomeType(); return plain; } - protected async Task ShadowToPlainAsync(Generics.Pocos.SomeType plain) + protected async Task ShadowToPlainAsync(Pocos.Generics.SomeType plain) { return plain; } @@ -608,7 +608,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Generics.Pocos.SomeType plain) + public async Task> PlainToShadowAsync(Pocos.Generics.SomeType plain) { return this.RetrievePrimitives(); } @@ -623,7 +623,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Generics.Pocos.SomeType plain, Generics.Pocos.SomeType latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Generics.SomeType plain, Pocos.Generics.SomeType latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -640,9 +640,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Generics.Pocos.SomeType CreateEmptyPoco() + public Pocos.Generics.SomeType CreateEmptyPoco() { - return new Generics.Pocos.SomeType(); + return new Pocos.Generics.SomeType(); } private IList Children { get; } = new List(); 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 310d09c56..76e48ab75 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 @@ -32,9 +32,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain = new ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes(); + Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain = new Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes(); await this.ReadAsync(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -44,9 +44,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain = new ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes(); + Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain = new Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -55,7 +55,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -68,7 +68,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -78,7 +78,7 @@ public async Task> PlainToOnlineAsync(ClassWithCompl [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -90,14 +90,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain = new ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes(); + Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain = new Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes(); plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; @@ -108,7 +108,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain) { await this.myComplexType.PlainToShadowAsync(plain.myComplexType); return this.RetrievePrimitives(); @@ -124,7 +124,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes plain, ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes plain, Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -143,9 +143,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes CreateEmptyPoco() + public Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes CreateEmptyPoco() { - return new ClassWithComplexTypesNamespace.Pocos.ClassWithComplexTypes(); + return new Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes(); } private IList Children { get; } = new List(); @@ -246,24 +246,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain = new ClassWithComplexTypesNamespace.Pocos.ComplexType1(); + Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain = new Pocos.ClassWithComplexTypesNamespace.ComplexType1(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain = new ClassWithComplexTypesNamespace.Pocos.ComplexType1(); + Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain = new Pocos.ClassWithComplexTypesNamespace.ComplexType1(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { return plain; } @@ -273,14 +273,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { } @@ -289,13 +289,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain = new ClassWithComplexTypesNamespace.Pocos.ComplexType1(); + Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain = new Pocos.ClassWithComplexTypesNamespace.ComplexType1(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { return plain; } @@ -305,7 +305,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain) { return this.RetrievePrimitives(); } @@ -320,7 +320,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithComplexTypesNamespace.Pocos.ComplexType1 plain, ClassWithComplexTypesNamespace.Pocos.ComplexType1 latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithComplexTypesNamespace.ComplexType1 plain, Pocos.ClassWithComplexTypesNamespace.ComplexType1 latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -337,9 +337,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithComplexTypesNamespace.Pocos.ComplexType1 CreateEmptyPoco() + public Pocos.ClassWithComplexTypesNamespace.ComplexType1 CreateEmptyPoco() { - return new ClassWithComplexTypesNamespace.Pocos.ComplexType1(); + return new Pocos.ClassWithComplexTypesNamespace.ComplexType1(); } private IList Children { get; } = new List(); 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 9daed2f69..4d85005e9 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 @@ -32,9 +32,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers(); await this.ReadAsync(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -44,9 +44,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -55,7 +55,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -68,7 +68,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -78,7 +78,7 @@ public async Task> PlainToOnlineAsync(ClassWithNonTr [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -90,14 +90,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers(); plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; @@ -108,7 +108,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain) { await this.myComplexType.PlainToShadowAsync(plain.myComplexType); return this.RetrievePrimitives(); @@ -124,7 +124,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers plain, ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers plain, Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -143,9 +143,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers CreateEmptyPoco() + public Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers CreateEmptyPoco() { - return new ClassWithNonTraspilableMemberssNamespace.Pocos.ClassWithNonTraspilableMembers(); + return new Pocos.ClassWithNonTraspilableMemberssNamespace.ClassWithNonTraspilableMembers(); } private IList Children { get; } = new List(); @@ -246,24 +246,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { return plain; } @@ -273,14 +273,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { } @@ -289,13 +289,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain = new ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1(); + Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain = new Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { return plain; } @@ -305,7 +305,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain) { return this.RetrievePrimitives(); } @@ -320,7 +320,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 plain, ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 plain, Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -337,9 +337,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 CreateEmptyPoco() + public Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1 CreateEmptyPoco() { - return new ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1(); + return new Pocos.ClassWithNonTraspilableMemberssNamespace.ComplexType1(); } private IList Children { get; } = new List(); 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 cdae8e1ad..a9e3b21e6 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 @@ -34,9 +34,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain = new ClassWithPragmasNamespace.Pocos.ClassWithPragmas(); + Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain = new Pocos.ClassWithPragmasNamespace.ClassWithPragmas(); await this.ReadAsync(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -46,9 +46,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain = new ClassWithPragmasNamespace.Pocos.ClassWithPragmas(); + Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain = new Pocos.ClassWithPragmasNamespace.ClassWithPragmas(); #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -57,7 +57,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { #pragma warning disable CS0612 plain.myComplexType = await myComplexType._OnlineToPlainNoacAsync(); @@ -70,7 +70,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -80,7 +80,7 @@ public async Task> PlainToOnlineAsync(ClassWithPragm [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { #pragma warning disable CS0612 await this.myComplexType._PlainToOnlineNoacAsync(plain.myComplexType); @@ -92,14 +92,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain = new ClassWithPragmasNamespace.Pocos.ClassWithPragmas(); + Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain = new Pocos.ClassWithPragmasNamespace.ClassWithPragmas(); plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { plain.myComplexType = await myComplexType.ShadowToPlainAsync(); return plain; @@ -110,7 +110,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain) { await this.myComplexType.PlainToShadowAsync(plain.myComplexType); return this.RetrievePrimitives(); @@ -126,7 +126,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithPragmasNamespace.Pocos.ClassWithPragmas plain, ClassWithPragmasNamespace.Pocos.ClassWithPragmas latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithPragmasNamespace.ClassWithPragmas plain, Pocos.ClassWithPragmasNamespace.ClassWithPragmas latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -145,9 +145,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithPragmasNamespace.Pocos.ClassWithPragmas CreateEmptyPoco() + public Pocos.ClassWithPragmasNamespace.ClassWithPragmas CreateEmptyPoco() { - return new ClassWithPragmasNamespace.Pocos.ClassWithPragmas(); + return new Pocos.ClassWithPragmasNamespace.ClassWithPragmas(); } private IList Children { get; } = new List(); @@ -248,24 +248,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithPragmasNamespace.Pocos.ComplexType1 plain = new ClassWithPragmasNamespace.Pocos.ComplexType1(); + Pocos.ClassWithPragmasNamespace.ComplexType1 plain = new Pocos.ClassWithPragmasNamespace.ComplexType1(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithPragmasNamespace.Pocos.ComplexType1 plain = new ClassWithPragmasNamespace.Pocos.ComplexType1(); + Pocos.ClassWithPragmasNamespace.ComplexType1 plain = new Pocos.ClassWithPragmasNamespace.ComplexType1(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { return plain; } @@ -275,14 +275,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { } @@ -291,13 +291,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithPragmasNamespace.Pocos.ComplexType1 plain = new ClassWithPragmasNamespace.Pocos.ComplexType1(); + Pocos.ClassWithPragmasNamespace.ComplexType1 plain = new Pocos.ClassWithPragmasNamespace.ComplexType1(); return plain; } - protected async Task ShadowToPlainAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { return plain; } @@ -307,7 +307,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain) { return this.RetrievePrimitives(); } @@ -322,7 +322,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithPragmasNamespace.Pocos.ComplexType1 plain, ClassWithPragmasNamespace.Pocos.ComplexType1 latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithPragmasNamespace.ComplexType1 plain, Pocos.ClassWithPragmasNamespace.ComplexType1 latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -339,9 +339,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithPragmasNamespace.Pocos.ComplexType1 CreateEmptyPoco() + public Pocos.ClassWithPragmasNamespace.ComplexType1 CreateEmptyPoco() { - return new ClassWithPragmasNamespace.Pocos.ComplexType1(); + return new Pocos.ClassWithPragmasNamespace.ComplexType1(); } private IList Children { get; } = new List(); 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 1aaf817db..a976712bc 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 @@ -84,9 +84,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain = new ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes(); + Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain = new Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes(); await this.ReadAsync(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; @@ -120,9 +120,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain = new ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes(); + Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain = new Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes(); plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; plain.myWORD = myWORD.LastValue; @@ -155,7 +155,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain) { plain.myBOOL = myBOOL.LastValue; plain.myBYTE = myBYTE.LastValue; @@ -192,7 +192,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain) + public async Task> PlainToOnlineAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain) { #pragma warning disable CS0612 myBOOL.LethargicWrite(plain.myBOOL); @@ -280,7 +280,7 @@ public async Task> PlainToOnlineAsync(ClassWithPrimi [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain) { #pragma warning disable CS0612 myBOOL.LethargicWrite(plain.myBOOL); @@ -370,9 +370,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain = new ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes(); + Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain = new Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes(); plain.myBOOL = myBOOL.Shadow; plain.myBYTE = myBYTE.Shadow; plain.myWORD = myWORD.Shadow; @@ -403,7 +403,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain) + protected async Task ShadowToPlainAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain) { plain.myBOOL = myBOOL.Shadow; plain.myBYTE = myBYTE.Shadow; @@ -440,7 +440,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain) + public async Task> PlainToShadowAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain) { myBOOL.Shadow = plain.myBOOL; myBYTE.Shadow = plain.myBYTE; @@ -482,7 +482,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes plain, ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes plain, Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -553,9 +553,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes CreateEmptyPoco() + public Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes CreateEmptyPoco() { - return new ClassWithPrimitiveTypesNamespace.Pocos.ClassWithPrimitiveTypes(); + return new Pocos.ClassWithPrimitiveTypesNamespace.ClassWithPrimitiveTypes(); } private IList Children { get; } = new List(); 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 41d34dd20..b2aa4e2fb 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 @@ -36,9 +36,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - CompilerOmmits.Pocos.ClassWithArrays plain = new CompilerOmmits.Pocos.ClassWithArrays(); + Pocos.CompilerOmmits.ClassWithArrays plain = new Pocos.CompilerOmmits.ClassWithArrays(); await this.ReadAsync(); plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; @@ -46,16 +46,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - CompilerOmmits.Pocos.ClassWithArrays plain = new CompilerOmmits.Pocos.ClassWithArrays(); + Pocos.CompilerOmmits.ClassWithArrays plain = new Pocos.CompilerOmmits.ClassWithArrays(); plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(CompilerOmmits.Pocos.ClassWithArrays plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.CompilerOmmits.ClassWithArrays plain) { plain._primitive = _primitive.Select(p => p.LastValue).ToArray(); return plain; @@ -66,7 +66,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(CompilerOmmits.Pocos.ClassWithArrays plain) + public async Task> PlainToOnlineAsync(Pocos.CompilerOmmits.ClassWithArrays plain) { var __primitive_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -77,7 +77,7 @@ public async Task> PlainToOnlineAsync(CompilerOmmits [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(CompilerOmmits.Pocos.ClassWithArrays plain) + public async Task _PlainToOnlineNoacAsync(Pocos.CompilerOmmits.ClassWithArrays plain) { var __primitive_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -90,14 +90,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - CompilerOmmits.Pocos.ClassWithArrays plain = new CompilerOmmits.Pocos.ClassWithArrays(); + Pocos.CompilerOmmits.ClassWithArrays plain = new Pocos.CompilerOmmits.ClassWithArrays(); plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); return plain; } - protected async Task ShadowToPlainAsync(CompilerOmmits.Pocos.ClassWithArrays plain) + protected async Task ShadowToPlainAsync(Pocos.CompilerOmmits.ClassWithArrays plain) { plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); return plain; @@ -108,7 +108,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(CompilerOmmits.Pocos.ClassWithArrays plain) + public async Task> PlainToShadowAsync(Pocos.CompilerOmmits.ClassWithArrays plain) { var __primitive_i_FE8484DAB3 = 0; _primitive.Select(p => p.Shadow = plain._primitive[__primitive_i_FE8484DAB3++]).ToArray(); @@ -125,7 +125,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(CompilerOmmits.Pocos.ClassWithArrays plain, CompilerOmmits.Pocos.ClassWithArrays latest = null) + public async Task DetectsAnyChangeAsync(Pocos.CompilerOmmits.ClassWithArrays plain, Pocos.CompilerOmmits.ClassWithArrays latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -148,9 +148,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public CompilerOmmits.Pocos.ClassWithArrays CreateEmptyPoco() + public Pocos.CompilerOmmits.ClassWithArrays CreateEmptyPoco() { - return new CompilerOmmits.Pocos.ClassWithArrays(); + return new Pocos.CompilerOmmits.ClassWithArrays(); } private IList Children { get; } = new List(); @@ -256,9 +256,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - CompilerOmmits.Pocos.Complex plain = new CompilerOmmits.Pocos.Complex(); + Pocos.CompilerOmmits.Complex plain = new Pocos.CompilerOmmits.Complex(); await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -267,9 +267,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - CompilerOmmits.Pocos.Complex plain = new CompilerOmmits.Pocos.Complex(); + Pocos.CompilerOmmits.Complex plain = new Pocos.CompilerOmmits.Complex(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -277,7 +277,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(CompilerOmmits.Pocos.Complex plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.CompilerOmmits.Complex plain) { plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -289,7 +289,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(CompilerOmmits.Pocos.Complex plain) + public async Task> PlainToOnlineAsync(Pocos.CompilerOmmits.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -302,7 +302,7 @@ public async Task> PlainToOnlineAsync(CompilerOmmits [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(CompilerOmmits.Pocos.Complex plain) + public async Task _PlainToOnlineNoacAsync(Pocos.CompilerOmmits.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -317,15 +317,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - CompilerOmmits.Pocos.Complex plain = new CompilerOmmits.Pocos.Complex(); + Pocos.CompilerOmmits.Complex plain = new Pocos.CompilerOmmits.Complex(); plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; return plain; } - protected async Task ShadowToPlainAsync(CompilerOmmits.Pocos.Complex plain) + protected async Task ShadowToPlainAsync(Pocos.CompilerOmmits.Complex plain) { plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; @@ -337,7 +337,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(CompilerOmmits.Pocos.Complex plain) + public async Task> PlainToShadowAsync(Pocos.CompilerOmmits.Complex plain) { HelloString.Shadow = plain.HelloString; Id.Shadow = plain.Id; @@ -354,7 +354,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(CompilerOmmits.Pocos.Complex plain, CompilerOmmits.Pocos.Complex latest = null) + public async Task DetectsAnyChangeAsync(Pocos.CompilerOmmits.Complex plain, Pocos.CompilerOmmits.Complex latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -375,9 +375,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public CompilerOmmits.Pocos.Complex CreateEmptyPoco() + public Pocos.CompilerOmmits.Complex CreateEmptyPoco() { - return new CompilerOmmits.Pocos.Complex(); + return new Pocos.CompilerOmmits.Complex(); } private IList Children { get; } = new List(); @@ -489,9 +489,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); await this.ReadAsync(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; @@ -500,9 +500,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; return plain; @@ -510,7 +510,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Enums.Pocos.ClassWithEnums plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Enums.ClassWithEnums plain) { plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; @@ -522,7 +522,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Enums.Pocos.ClassWithEnums plain) + public async Task> PlainToOnlineAsync(Pocos.Enums.ClassWithEnums plain) { #pragma warning disable CS0612 colors.LethargicWrite((short)plain.colors); @@ -535,7 +535,7 @@ public async Task> PlainToOnlineAsync(Enums.Pocos.Cl [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Enums.Pocos.ClassWithEnums plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Enums.ClassWithEnums plain) { #pragma warning disable CS0612 colors.LethargicWrite((short)plain.colors); @@ -550,15 +550,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); plain.colors = (Enums.Colors)colors.Shadow; plain.NamedValuesColors = NamedValuesColors.Shadow; return plain; } - protected async Task ShadowToPlainAsync(Enums.Pocos.ClassWithEnums plain) + protected async Task ShadowToPlainAsync(Pocos.Enums.ClassWithEnums plain) { plain.colors = (Enums.Colors)colors.Shadow; plain.NamedValuesColors = NamedValuesColors.Shadow; @@ -570,7 +570,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Enums.Pocos.ClassWithEnums plain) + public async Task> PlainToShadowAsync(Pocos.Enums.ClassWithEnums plain) { colors.Shadow = (short)plain.colors; NamedValuesColors.Shadow = plain.NamedValuesColors; @@ -587,7 +587,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Enums.Pocos.ClassWithEnums plain, Enums.Pocos.ClassWithEnums latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Enums.ClassWithEnums plain, Pocos.Enums.ClassWithEnums latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -608,9 +608,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Enums.Pocos.ClassWithEnums CreateEmptyPoco() + public Pocos.Enums.ClassWithEnums CreateEmptyPoco() { - return new Enums.Pocos.ClassWithEnums(); + return new Pocos.Enums.ClassWithEnums(); } private IList Children { get; } = new List(); @@ -733,9 +733,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); await this.ReadAsync(); #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); @@ -748,9 +748,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -762,7 +762,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(misc.Pocos.VariousMembers plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); @@ -778,7 +778,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.VariousMembers plain) + public async Task> PlainToOnlineAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 await this._SomeClass._PlainToOnlineNoacAsync(plain._SomeClass); @@ -791,7 +791,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Var [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.VariousMembers plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 await this._SomeClass._PlainToOnlineNoacAsync(plain._SomeClass); @@ -806,15 +806,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); plain._SomeClass = await _SomeClass.ShadowToPlainAsync(); plain._Motor = await _Motor.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.VariousMembers plain) + protected async Task ShadowToPlainAsync(Pocos.misc.VariousMembers plain) { plain._SomeClass = await _SomeClass.ShadowToPlainAsync(); plain._Motor = await _Motor.ShadowToPlainAsync(); @@ -826,7 +826,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.VariousMembers plain) + public async Task> PlainToShadowAsync(Pocos.misc.VariousMembers plain) { await this._SomeClass.PlainToShadowAsync(plain._SomeClass); await this._Motor.PlainToShadowAsync(plain._Motor); @@ -843,7 +843,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.VariousMembers plain, misc.Pocos.VariousMembers latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.VariousMembers plain, Pocos.misc.VariousMembers latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -864,9 +864,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.VariousMembers CreateEmptyPoco() + public Pocos.misc.VariousMembers CreateEmptyPoco() { - return new misc.Pocos.VariousMembers(); + return new Pocos.misc.VariousMembers(); } private IList Children { get; } = new List(); @@ -970,9 +970,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -980,16 +980,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(misc.Pocos.SomeClass plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.misc.SomeClass plain) { plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -1000,7 +1000,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.SomeClass plain) + public async Task> PlainToOnlineAsync(Pocos.misc.SomeClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -1010,7 +1010,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Som [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.SomeClass plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.SomeClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -1022,14 +1022,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.SomeClass plain) + protected async Task ShadowToPlainAsync(Pocos.misc.SomeClass plain) { plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; @@ -1040,7 +1040,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.SomeClass plain) + public async Task> PlainToShadowAsync(Pocos.misc.SomeClass plain) { SomeClassVariable.Shadow = plain.SomeClassVariable; return this.RetrievePrimitives(); @@ -1056,7 +1056,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.SomeClass plain, misc.Pocos.SomeClass latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.SomeClass plain, Pocos.misc.SomeClass latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1075,9 +1075,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.SomeClass CreateEmptyPoco() + public Pocos.misc.SomeClass CreateEmptyPoco() { - return new misc.Pocos.SomeClass(); + return new Pocos.misc.SomeClass(); } private IList Children { get; } = new List(); @@ -1181,9 +1181,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; @@ -1191,14 +1191,14 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); plain.isRunning = isRunning.LastValue; return plain; } - protected async Task OnlineToPlainAsync(misc.Pocos.Motor plain) + protected async Task OnlineToPlainAsync(Pocos.misc.Motor plain) { plain.isRunning = isRunning.LastValue; return plain; @@ -1209,7 +1209,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.Motor plain) + public async Task> PlainToOnlineAsync(Pocos.misc.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -1219,7 +1219,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Mot [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.Motor plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -1231,14 +1231,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); plain.isRunning = isRunning.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.Motor plain) + protected async Task ShadowToPlainAsync(Pocos.misc.Motor plain) { plain.isRunning = isRunning.Shadow; return plain; @@ -1249,7 +1249,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.Motor plain) + public async Task> PlainToShadowAsync(Pocos.misc.Motor plain) { isRunning.Shadow = plain.isRunning; return this.RetrievePrimitives(); @@ -1265,7 +1265,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.Motor plain, misc.Pocos.Motor latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.Motor plain, Pocos.misc.Motor latest = null) { var somethingChanged = false; if (latest == null) @@ -1284,9 +1284,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.Motor CreateEmptyPoco() + public Pocos.misc.Motor CreateEmptyPoco() { - return new misc.Pocos.Motor(); + return new Pocos.misc.Motor(); } private IList Children { get; } = new List(); @@ -1392,9 +1392,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); await this.ReadAsync(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -1405,9 +1405,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -1415,7 +1415,7 @@ public async virtual Task OnlineToPlain() return plain; } - protected async Task OnlineToPlainAsync(misc.Pocos.Vehicle plain) + protected async Task OnlineToPlainAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -1429,7 +1429,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.Vehicle plain) + public async Task> PlainToOnlineAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -1442,7 +1442,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Veh [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.Vehicle plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -1457,15 +1457,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.Vehicle plain) + protected async Task ShadowToPlainAsync(Pocos.misc.Vehicle plain) { plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; @@ -1477,7 +1477,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.Vehicle plain) + public async Task> PlainToShadowAsync(Pocos.misc.Vehicle plain) { await this.m.PlainToShadowAsync(plain.m); displacement.Shadow = plain.displacement; @@ -1494,7 +1494,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.Vehicle plain, misc.Pocos.Vehicle latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.Vehicle plain, Pocos.misc.Vehicle latest = null) { var somethingChanged = false; if (latest == null) @@ -1515,9 +1515,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.Vehicle CreateEmptyPoco() + public Pocos.misc.Vehicle CreateEmptyPoco() { - return new misc.Pocos.Vehicle(); + return new Pocos.misc.Vehicle(); } private IList Children { get; } = new List(); @@ -1628,9 +1628,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); await this.ReadAsync(); #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); @@ -1641,9 +1641,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); #pragma warning restore CS0612 @@ -1653,7 +1653,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); @@ -1667,7 +1667,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task> PlainToOnlineAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -1682,7 +1682,7 @@ public async Task> PlainToOnlineAsync(UnknownArraysS [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task _PlainToOnlineNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -1699,15 +1699,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); plain._complexKnown = _complexKnown.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); return plain; } - protected async Task ShadowToPlainAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + protected async Task ShadowToPlainAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { plain._complexKnown = _complexKnown.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); @@ -1719,7 +1719,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task> PlainToShadowAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; _complexKnown.Select(p => p.PlainToShadowAsync(plain._complexKnown[__complexKnown_i_FE8484DAB3++])).ToArray(); @@ -1738,7 +1738,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain, UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays latest = null) + public async Task DetectsAnyChangeAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain, Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1767,9 +1767,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays CreateEmptyPoco() + public Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays CreateEmptyPoco() { - return new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + return new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); } private IList Children { get; } = new List(); @@ -1875,9 +1875,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -1886,9 +1886,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -1896,7 +1896,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -1908,7 +1908,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task> PlainToOnlineAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -1921,7 +1921,7 @@ public async Task> PlainToOnlineAsync(UnknownArraysS [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task _PlainToOnlineNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -1936,15 +1936,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; return plain; } - protected async Task ShadowToPlainAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + protected async Task ShadowToPlainAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; @@ -1956,7 +1956,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task> PlainToShadowAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { HelloString.Shadow = plain.HelloString; Id.Shadow = plain.Id; @@ -1973,7 +1973,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain, UnknownArraysShouldNotBeTraspiled.Pocos.Complex latest = null) + public async Task DetectsAnyChangeAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain, Pocos.UnknownArraysShouldNotBeTraspiled.Complex latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1994,9 +1994,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public UnknownArraysShouldNotBeTraspiled.Pocos.Complex CreateEmptyPoco() + public Pocos.UnknownArraysShouldNotBeTraspiled.Complex CreateEmptyPoco() { - return new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + return new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); } private IList Children { get; } = new List(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs index 4df192a21..1534cf3d4 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/file_with_usings.g.cs @@ -32,24 +32,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain = new FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello(); + Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain = new Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain = new FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello(); + Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain = new Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain) { return plain; } @@ -59,14 +59,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain) + public async Task> PlainToOnlineAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain) + public async Task _PlainToOnlineNoacAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain) { } @@ -75,13 +75,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain = new FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello(); + Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain = new Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello(); return plain; } - protected async Task ShadowToPlainAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain) + protected async Task ShadowToPlainAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain) { return plain; } @@ -91,7 +91,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain) + public async Task> PlainToShadowAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain) { return this.RetrievePrimitives(); } @@ -106,7 +106,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello plain, FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello latest = null) + public async Task DetectsAnyChangeAsync(Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello plain, Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -123,9 +123,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello CreateEmptyPoco() + public Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello CreateEmptyPoco() { - return new FileWithUsingsSimpleFirstLevelNamespace.Pocos.Hello(); + return new Pocos.FileWithUsingsSimpleFirstLevelNamespace.Hello(); } private IList Children { get; } = new List(); @@ -229,24 +229,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain = new FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello(); + Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain = new Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain = new FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello(); + Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain = new Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain) { return plain; } @@ -256,14 +256,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain) + public async Task> PlainToOnlineAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain) + public async Task _PlainToOnlineNoacAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain) { } @@ -272,13 +272,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain = new FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello(); + Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain = new Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello(); return plain; } - protected async Task ShadowToPlainAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain) + protected async Task ShadowToPlainAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain) { return plain; } @@ -288,7 +288,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain) + public async Task> PlainToShadowAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain) { return this.RetrievePrimitives(); } @@ -303,7 +303,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello plain, FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello latest = null) + public async Task DetectsAnyChangeAsync(Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello plain, Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -320,9 +320,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello CreateEmptyPoco() + public Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello CreateEmptyPoco() { - return new FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos.Hello(); + return new Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified.Hello(); } private IList Children { get; } = new List(); @@ -428,24 +428,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain = new FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello(); + Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain = new Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain = new FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello(); + Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain = new Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain) { return plain; } @@ -455,14 +455,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain) + public async Task> PlainToOnlineAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain) + public async Task _PlainToOnlineNoacAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain) { } @@ -471,13 +471,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain = new FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello(); + Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain = new Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello(); return plain; } - protected async Task ShadowToPlainAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain) + protected async Task ShadowToPlainAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain) { return plain; } @@ -487,7 +487,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain) + public async Task> PlainToShadowAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain) { return this.RetrievePrimitives(); } @@ -502,7 +502,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello plain, FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello latest = null) + public async Task DetectsAnyChangeAsync(Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello plain, Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -519,9 +519,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello CreateEmptyPoco() + public Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello CreateEmptyPoco() { - return new FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos.Hello(); + return new Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Hello(); } private IList Children { get; } = new List(); @@ -626,24 +626,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - ExampleNamespace.Pocos.Hello plain = new ExampleNamespace.Pocos.Hello(); + Pocos.ExampleNamespace.Hello plain = new Pocos.ExampleNamespace.Hello(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - ExampleNamespace.Pocos.Hello plain = new ExampleNamespace.Pocos.Hello(); + Pocos.ExampleNamespace.Hello plain = new Pocos.ExampleNamespace.Hello(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(ExampleNamespace.Pocos.Hello plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.ExampleNamespace.Hello plain) { return plain; } @@ -653,14 +653,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(ExampleNamespace.Pocos.Hello plain) + public async Task> PlainToOnlineAsync(Pocos.ExampleNamespace.Hello plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(ExampleNamespace.Pocos.Hello plain) + public async Task _PlainToOnlineNoacAsync(Pocos.ExampleNamespace.Hello plain) { } @@ -669,13 +669,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - ExampleNamespace.Pocos.Hello plain = new ExampleNamespace.Pocos.Hello(); + Pocos.ExampleNamespace.Hello plain = new Pocos.ExampleNamespace.Hello(); return plain; } - protected async Task ShadowToPlainAsync(ExampleNamespace.Pocos.Hello plain) + protected async Task ShadowToPlainAsync(Pocos.ExampleNamespace.Hello plain) { return plain; } @@ -685,7 +685,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(ExampleNamespace.Pocos.Hello plain) + public async Task> PlainToShadowAsync(Pocos.ExampleNamespace.Hello plain) { return this.RetrievePrimitives(); } @@ -700,7 +700,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(ExampleNamespace.Pocos.Hello plain, ExampleNamespace.Pocos.Hello latest = null) + public async Task DetectsAnyChangeAsync(Pocos.ExampleNamespace.Hello plain, Pocos.ExampleNamespace.Hello latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -717,9 +717,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public ExampleNamespace.Pocos.Hello CreateEmptyPoco() + public Pocos.ExampleNamespace.Hello CreateEmptyPoco() { - return new ExampleNamespace.Pocos.Hello(); + return new Pocos.ExampleNamespace.Hello(); } private IList Children { get; } = new List(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs index b80829bf2..5a04dfd7b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/generics.g.cs @@ -29,24 +29,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - GenericsTests.Pocos.Extender plain = new GenericsTests.Pocos.Extender(); + Pocos.GenericsTests.Extender plain = new Pocos.GenericsTests.Extender(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - GenericsTests.Pocos.Extender plain = new GenericsTests.Pocos.Extender(); + Pocos.GenericsTests.Extender plain = new Pocos.GenericsTests.Extender(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(GenericsTests.Pocos.Extender plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.GenericsTests.Extender plain) { return plain; } @@ -56,14 +56,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(GenericsTests.Pocos.Extender plain) + public async Task> PlainToOnlineAsync(Pocos.GenericsTests.Extender plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(GenericsTests.Pocos.Extender plain) + public async Task _PlainToOnlineNoacAsync(Pocos.GenericsTests.Extender plain) { } @@ -72,13 +72,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - GenericsTests.Pocos.Extender plain = new GenericsTests.Pocos.Extender(); + Pocos.GenericsTests.Extender plain = new Pocos.GenericsTests.Extender(); return plain; } - protected async Task ShadowToPlainAsync(GenericsTests.Pocos.Extender plain) + protected async Task ShadowToPlainAsync(Pocos.GenericsTests.Extender plain) { return plain; } @@ -88,7 +88,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(GenericsTests.Pocos.Extender plain) + public async Task> PlainToShadowAsync(Pocos.GenericsTests.Extender plain) { return this.RetrievePrimitives(); } @@ -103,7 +103,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(GenericsTests.Pocos.Extender plain, GenericsTests.Pocos.Extender latest = null) + public async Task DetectsAnyChangeAsync(Pocos.GenericsTests.Extender plain, Pocos.GenericsTests.Extender latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -120,9 +120,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public GenericsTests.Pocos.Extender CreateEmptyPoco() + public Pocos.GenericsTests.Extender CreateEmptyPoco() { - return new GenericsTests.Pocos.Extender(); + return new Pocos.GenericsTests.Extender(); } private IList Children { get; } = new List(); @@ -228,9 +228,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - GenericsTests.Pocos.SomeTypeToBeGeneric plain = new GenericsTests.Pocos.SomeTypeToBeGeneric(); + Pocos.GenericsTests.SomeTypeToBeGeneric plain = new Pocos.GenericsTests.SomeTypeToBeGeneric(); await this.ReadAsync(); plain.Boolean = Boolean.LastValue; plain.Cele = Cele.LastValue; @@ -239,9 +239,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - GenericsTests.Pocos.SomeTypeToBeGeneric plain = new GenericsTests.Pocos.SomeTypeToBeGeneric(); + Pocos.GenericsTests.SomeTypeToBeGeneric plain = new Pocos.GenericsTests.SomeTypeToBeGeneric(); plain.Boolean = Boolean.LastValue; plain.Cele = Cele.LastValue; return plain; @@ -249,7 +249,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain) { plain.Boolean = Boolean.LastValue; plain.Cele = Cele.LastValue; @@ -261,7 +261,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain) + public async Task> PlainToOnlineAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain) { #pragma warning disable CS0612 Boolean.LethargicWrite(plain.Boolean); @@ -274,7 +274,7 @@ public async Task> PlainToOnlineAsync(GenericsTests. [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain) + public async Task _PlainToOnlineNoacAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain) { #pragma warning disable CS0612 Boolean.LethargicWrite(plain.Boolean); @@ -289,15 +289,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - GenericsTests.Pocos.SomeTypeToBeGeneric plain = new GenericsTests.Pocos.SomeTypeToBeGeneric(); + Pocos.GenericsTests.SomeTypeToBeGeneric plain = new Pocos.GenericsTests.SomeTypeToBeGeneric(); plain.Boolean = Boolean.Shadow; plain.Cele = Cele.Shadow; return plain; } - protected async Task ShadowToPlainAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain) + protected async Task ShadowToPlainAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain) { plain.Boolean = Boolean.Shadow; plain.Cele = Cele.Shadow; @@ -309,7 +309,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain) + public async Task> PlainToShadowAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain) { Boolean.Shadow = plain.Boolean; Cele.Shadow = plain.Cele; @@ -326,7 +326,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(GenericsTests.Pocos.SomeTypeToBeGeneric plain, GenericsTests.Pocos.SomeTypeToBeGeneric latest = null) + public async Task DetectsAnyChangeAsync(Pocos.GenericsTests.SomeTypeToBeGeneric plain, Pocos.GenericsTests.SomeTypeToBeGeneric latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -347,9 +347,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public GenericsTests.Pocos.SomeTypeToBeGeneric CreateEmptyPoco() + public Pocos.GenericsTests.SomeTypeToBeGeneric CreateEmptyPoco() { - return new GenericsTests.Pocos.SomeTypeToBeGeneric(); + return new Pocos.GenericsTests.SomeTypeToBeGeneric(); } private IList Children { get; } = new List(); @@ -450,9 +450,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - GenericsTests.Pocos.Extendee2 plain = new GenericsTests.Pocos.Extendee2(); + Pocos.GenericsTests.Extendee2 plain = new Pocos.GenericsTests.Extendee2(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -465,9 +465,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - GenericsTests.Pocos.Extendee2 plain = new GenericsTests.Pocos.Extendee2(); + Pocos.GenericsTests.Extendee2 plain = new Pocos.GenericsTests.Extendee2(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -479,7 +479,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(GenericsTests.Pocos.Extendee2 plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.GenericsTests.Extendee2 plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -495,7 +495,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(GenericsTests.Pocos.Extendee2 plain) + public async Task> PlainToOnlineAsync(Pocos.GenericsTests.Extendee2 plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -506,7 +506,7 @@ public async Task> PlainToOnlineAsync(GenericsTests. [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(GenericsTests.Pocos.Extendee2 plain) + public async Task _PlainToOnlineNoacAsync(Pocos.GenericsTests.Extendee2 plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -519,15 +519,15 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - GenericsTests.Pocos.Extendee2 plain = new GenericsTests.Pocos.Extendee2(); + Pocos.GenericsTests.Extendee2 plain = new Pocos.GenericsTests.Extendee2(); await base.ShadowToPlainAsync(plain); plain.SomeData = await SomeData.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(GenericsTests.Pocos.Extendee2 plain) + protected async Task ShadowToPlainAsync(Pocos.GenericsTests.Extendee2 plain) { await base.ShadowToPlainAsync(plain); plain.SomeData = await SomeData.ShadowToPlainAsync(); @@ -539,7 +539,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(GenericsTests.Pocos.Extendee2 plain) + public async Task> PlainToShadowAsync(Pocos.GenericsTests.Extendee2 plain) { await base.PlainToShadowAsync(plain); await this.SomeData.PlainToShadowAsync(plain.SomeData); @@ -556,7 +556,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(GenericsTests.Pocos.Extendee2 plain, GenericsTests.Pocos.Extendee2 latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.GenericsTests.Extendee2 plain, Pocos.GenericsTests.Extendee2 latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -577,9 +577,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new GenericsTests.Pocos.Extendee2 CreateEmptyPoco() + public new Pocos.GenericsTests.Extendee2 CreateEmptyPoco() { - return new GenericsTests.Pocos.Extendee2(); + return new Pocos.GenericsTests.Extendee2(); } } } \ No newline at end of file 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 2ac189cd9..154628935 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 @@ -43,9 +43,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - makereadonce.Pocos.MembersWithMakeReadOnce plain = new makereadonce.Pocos.MembersWithMakeReadOnce(); + Pocos.makereadonce.MembersWithMakeReadOnce plain = new Pocos.makereadonce.MembersWithMakeReadOnce(); await this.ReadAsync(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -60,9 +60,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - makereadonce.Pocos.MembersWithMakeReadOnce plain = new makereadonce.Pocos.MembersWithMakeReadOnce(); + Pocos.makereadonce.MembersWithMakeReadOnce plain = new Pocos.makereadonce.MembersWithMakeReadOnce(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; #pragma warning disable CS0612 @@ -76,7 +76,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain) { plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -94,7 +94,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain) + public async Task> PlainToOnlineAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain) { #pragma warning disable CS0612 makeReadOnceMember.LethargicWrite(plain.makeReadOnceMember); @@ -113,7 +113,7 @@ public async Task> PlainToOnlineAsync(makereadonce.P [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain) + public async Task _PlainToOnlineNoacAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain) { #pragma warning disable CS0612 makeReadOnceMember.LethargicWrite(plain.makeReadOnceMember); @@ -134,9 +134,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - makereadonce.Pocos.MembersWithMakeReadOnce plain = new makereadonce.Pocos.MembersWithMakeReadOnce(); + Pocos.makereadonce.MembersWithMakeReadOnce plain = new Pocos.makereadonce.MembersWithMakeReadOnce(); plain.makeReadOnceMember = makeReadOnceMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; plain.makeReadComplexMember = await makeReadComplexMember.ShadowToPlainAsync(); @@ -144,7 +144,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain) + protected async Task ShadowToPlainAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain) { plain.makeReadOnceMember = makeReadOnceMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; @@ -158,7 +158,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain) + public async Task> PlainToShadowAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain) { makeReadOnceMember.Shadow = plain.makeReadOnceMember; someOtherMember.Shadow = plain.someOtherMember; @@ -177,7 +177,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(makereadonce.Pocos.MembersWithMakeReadOnce plain, makereadonce.Pocos.MembersWithMakeReadOnce latest = null) + public async Task DetectsAnyChangeAsync(Pocos.makereadonce.MembersWithMakeReadOnce plain, Pocos.makereadonce.MembersWithMakeReadOnce latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -202,9 +202,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public makereadonce.Pocos.MembersWithMakeReadOnce CreateEmptyPoco() + public Pocos.makereadonce.MembersWithMakeReadOnce CreateEmptyPoco() { - return new makereadonce.Pocos.MembersWithMakeReadOnce(); + return new Pocos.makereadonce.MembersWithMakeReadOnce(); } private IList Children { get; } = new List(); @@ -310,9 +310,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - makereadonce.Pocos.ComplexMember plain = new makereadonce.Pocos.ComplexMember(); + Pocos.makereadonce.ComplexMember plain = new Pocos.makereadonce.ComplexMember(); await this.ReadAsync(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -321,9 +321,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - makereadonce.Pocos.ComplexMember plain = new makereadonce.Pocos.ComplexMember(); + Pocos.makereadonce.ComplexMember plain = new Pocos.makereadonce.ComplexMember(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; return plain; @@ -331,7 +331,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(makereadonce.Pocos.ComplexMember plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.makereadonce.ComplexMember plain) { plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -343,7 +343,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(makereadonce.Pocos.ComplexMember plain) + public async Task> PlainToOnlineAsync(Pocos.makereadonce.ComplexMember plain) { #pragma warning disable CS0612 someMember.LethargicWrite(plain.someMember); @@ -356,7 +356,7 @@ public async Task> PlainToOnlineAsync(makereadonce.P [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(makereadonce.Pocos.ComplexMember plain) + public async Task _PlainToOnlineNoacAsync(Pocos.makereadonce.ComplexMember plain) { #pragma warning disable CS0612 someMember.LethargicWrite(plain.someMember); @@ -371,15 +371,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - makereadonce.Pocos.ComplexMember plain = new makereadonce.Pocos.ComplexMember(); + Pocos.makereadonce.ComplexMember plain = new Pocos.makereadonce.ComplexMember(); plain.someMember = someMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; return plain; } - protected async Task ShadowToPlainAsync(makereadonce.Pocos.ComplexMember plain) + protected async Task ShadowToPlainAsync(Pocos.makereadonce.ComplexMember plain) { plain.someMember = someMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; @@ -391,7 +391,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(makereadonce.Pocos.ComplexMember plain) + public async Task> PlainToShadowAsync(Pocos.makereadonce.ComplexMember plain) { someMember.Shadow = plain.someMember; someOtherMember.Shadow = plain.someOtherMember; @@ -408,7 +408,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(makereadonce.Pocos.ComplexMember plain, makereadonce.Pocos.ComplexMember latest = null) + public async Task DetectsAnyChangeAsync(Pocos.makereadonce.ComplexMember plain, Pocos.makereadonce.ComplexMember latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -429,9 +429,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public makereadonce.Pocos.ComplexMember CreateEmptyPoco() + public Pocos.makereadonce.ComplexMember CreateEmptyPoco() { - return new makereadonce.Pocos.ComplexMember(); + return new Pocos.makereadonce.ComplexMember(); } private IList Children { get; } = new List(); 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 7bb29172f..645226946 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 @@ -43,9 +43,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - makereadonly.Pocos.MembersWithMakeReadOnly plain = new makereadonly.Pocos.MembersWithMakeReadOnly(); + Pocos.makereadonly.MembersWithMakeReadOnly plain = new Pocos.makereadonly.MembersWithMakeReadOnly(); await this.ReadAsync(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -60,9 +60,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - makereadonly.Pocos.MembersWithMakeReadOnly plain = new makereadonly.Pocos.MembersWithMakeReadOnly(); + Pocos.makereadonly.MembersWithMakeReadOnly plain = new Pocos.makereadonly.MembersWithMakeReadOnly(); plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; #pragma warning disable CS0612 @@ -76,7 +76,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain) { plain.makeReadOnceMember = makeReadOnceMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -94,7 +94,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain) + public async Task> PlainToOnlineAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain) { #pragma warning disable CS0612 makeReadOnceMember.LethargicWrite(plain.makeReadOnceMember); @@ -113,7 +113,7 @@ public async Task> PlainToOnlineAsync(makereadonly.P [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain) + public async Task _PlainToOnlineNoacAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain) { #pragma warning disable CS0612 makeReadOnceMember.LethargicWrite(plain.makeReadOnceMember); @@ -134,9 +134,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - makereadonly.Pocos.MembersWithMakeReadOnly plain = new makereadonly.Pocos.MembersWithMakeReadOnly(); + Pocos.makereadonly.MembersWithMakeReadOnly plain = new Pocos.makereadonly.MembersWithMakeReadOnly(); plain.makeReadOnceMember = makeReadOnceMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; plain.makeReadComplexMember = await makeReadComplexMember.ShadowToPlainAsync(); @@ -144,7 +144,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain) + protected async Task ShadowToPlainAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain) { plain.makeReadOnceMember = makeReadOnceMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; @@ -158,7 +158,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain) + public async Task> PlainToShadowAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain) { makeReadOnceMember.Shadow = plain.makeReadOnceMember; someOtherMember.Shadow = plain.someOtherMember; @@ -177,7 +177,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(makereadonly.Pocos.MembersWithMakeReadOnly plain, makereadonly.Pocos.MembersWithMakeReadOnly latest = null) + public async Task DetectsAnyChangeAsync(Pocos.makereadonly.MembersWithMakeReadOnly plain, Pocos.makereadonly.MembersWithMakeReadOnly latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -202,9 +202,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public makereadonly.Pocos.MembersWithMakeReadOnly CreateEmptyPoco() + public Pocos.makereadonly.MembersWithMakeReadOnly CreateEmptyPoco() { - return new makereadonly.Pocos.MembersWithMakeReadOnly(); + return new Pocos.makereadonly.MembersWithMakeReadOnly(); } private IList Children { get; } = new List(); @@ -310,9 +310,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - makereadonly.Pocos.ComplexMember plain = new makereadonly.Pocos.ComplexMember(); + Pocos.makereadonly.ComplexMember plain = new Pocos.makereadonly.ComplexMember(); await this.ReadAsync(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -321,9 +321,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - makereadonly.Pocos.ComplexMember plain = new makereadonly.Pocos.ComplexMember(); + Pocos.makereadonly.ComplexMember plain = new Pocos.makereadonly.ComplexMember(); plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; return plain; @@ -331,7 +331,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(makereadonly.Pocos.ComplexMember plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.makereadonly.ComplexMember plain) { plain.someMember = someMember.LastValue; plain.someOtherMember = someOtherMember.LastValue; @@ -343,7 +343,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(makereadonly.Pocos.ComplexMember plain) + public async Task> PlainToOnlineAsync(Pocos.makereadonly.ComplexMember plain) { #pragma warning disable CS0612 someMember.LethargicWrite(plain.someMember); @@ -356,7 +356,7 @@ public async Task> PlainToOnlineAsync(makereadonly.P [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(makereadonly.Pocos.ComplexMember plain) + public async Task _PlainToOnlineNoacAsync(Pocos.makereadonly.ComplexMember plain) { #pragma warning disable CS0612 someMember.LethargicWrite(plain.someMember); @@ -371,15 +371,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - makereadonly.Pocos.ComplexMember plain = new makereadonly.Pocos.ComplexMember(); + Pocos.makereadonly.ComplexMember plain = new Pocos.makereadonly.ComplexMember(); plain.someMember = someMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; return plain; } - protected async Task ShadowToPlainAsync(makereadonly.Pocos.ComplexMember plain) + protected async Task ShadowToPlainAsync(Pocos.makereadonly.ComplexMember plain) { plain.someMember = someMember.Shadow; plain.someOtherMember = someOtherMember.Shadow; @@ -391,7 +391,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(makereadonly.Pocos.ComplexMember plain) + public async Task> PlainToShadowAsync(Pocos.makereadonly.ComplexMember plain) { someMember.Shadow = plain.someMember; someOtherMember.Shadow = plain.someOtherMember; @@ -408,7 +408,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(makereadonly.Pocos.ComplexMember plain, makereadonly.Pocos.ComplexMember latest = null) + public async Task DetectsAnyChangeAsync(Pocos.makereadonly.ComplexMember plain, Pocos.makereadonly.ComplexMember latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -429,9 +429,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public makereadonly.Pocos.ComplexMember CreateEmptyPoco() + public Pocos.makereadonly.ComplexMember CreateEmptyPoco() { - return new makereadonly.Pocos.ComplexMember(); + return new Pocos.makereadonly.ComplexMember(); } private IList Children { get; } = new List(); 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 460f0f170..19c825a53 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 @@ -37,9 +37,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); await this.ReadAsync(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; @@ -48,9 +48,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; return plain; @@ -58,7 +58,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Enums.Pocos.ClassWithEnums plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Enums.ClassWithEnums plain) { plain.colors = (Enums.Colors)colors.LastValue; plain.NamedValuesColors = NamedValuesColors.LastValue; @@ -70,7 +70,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Enums.Pocos.ClassWithEnums plain) + public async Task> PlainToOnlineAsync(Pocos.Enums.ClassWithEnums plain) { #pragma warning disable CS0612 colors.LethargicWrite((short)plain.colors); @@ -83,7 +83,7 @@ public async Task> PlainToOnlineAsync(Enums.Pocos.Cl [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Enums.Pocos.ClassWithEnums plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Enums.ClassWithEnums plain) { #pragma warning disable CS0612 colors.LethargicWrite((short)plain.colors); @@ -98,15 +98,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Enums.Pocos.ClassWithEnums plain = new Enums.Pocos.ClassWithEnums(); + Pocos.Enums.ClassWithEnums plain = new Pocos.Enums.ClassWithEnums(); plain.colors = (Enums.Colors)colors.Shadow; plain.NamedValuesColors = NamedValuesColors.Shadow; return plain; } - protected async Task ShadowToPlainAsync(Enums.Pocos.ClassWithEnums plain) + protected async Task ShadowToPlainAsync(Pocos.Enums.ClassWithEnums plain) { plain.colors = (Enums.Colors)colors.Shadow; plain.NamedValuesColors = NamedValuesColors.Shadow; @@ -118,7 +118,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Enums.Pocos.ClassWithEnums plain) + public async Task> PlainToShadowAsync(Pocos.Enums.ClassWithEnums plain) { colors.Shadow = (short)plain.colors; NamedValuesColors.Shadow = plain.NamedValuesColors; @@ -135,7 +135,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Enums.Pocos.ClassWithEnums plain, Enums.Pocos.ClassWithEnums latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Enums.ClassWithEnums plain, Pocos.Enums.ClassWithEnums latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -156,9 +156,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Enums.Pocos.ClassWithEnums CreateEmptyPoco() + public Pocos.Enums.ClassWithEnums CreateEmptyPoco() { - return new Enums.Pocos.ClassWithEnums(); + return new Pocos.Enums.ClassWithEnums(); } private IList Children { get; } = new List(); @@ -281,9 +281,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); await this.ReadAsync(); #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); @@ -296,9 +296,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -310,7 +310,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(misc.Pocos.VariousMembers plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 plain._SomeClass = await _SomeClass._OnlineToPlainNoacAsync(); @@ -326,7 +326,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.VariousMembers plain) + public async Task> PlainToOnlineAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 await this._SomeClass._PlainToOnlineNoacAsync(plain._SomeClass); @@ -339,7 +339,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Var [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.VariousMembers plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.VariousMembers plain) { #pragma warning disable CS0612 await this._SomeClass._PlainToOnlineNoacAsync(plain._SomeClass); @@ -354,15 +354,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.VariousMembers plain = new misc.Pocos.VariousMembers(); + Pocos.misc.VariousMembers plain = new Pocos.misc.VariousMembers(); plain._SomeClass = await _SomeClass.ShadowToPlainAsync(); plain._Motor = await _Motor.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.VariousMembers plain) + protected async Task ShadowToPlainAsync(Pocos.misc.VariousMembers plain) { plain._SomeClass = await _SomeClass.ShadowToPlainAsync(); plain._Motor = await _Motor.ShadowToPlainAsync(); @@ -374,7 +374,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.VariousMembers plain) + public async Task> PlainToShadowAsync(Pocos.misc.VariousMembers plain) { await this._SomeClass.PlainToShadowAsync(plain._SomeClass); await this._Motor.PlainToShadowAsync(plain._Motor); @@ -391,7 +391,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.VariousMembers plain, misc.Pocos.VariousMembers latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.VariousMembers plain, Pocos.misc.VariousMembers latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -412,9 +412,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.VariousMembers CreateEmptyPoco() + public Pocos.misc.VariousMembers CreateEmptyPoco() { - return new misc.Pocos.VariousMembers(); + return new Pocos.misc.VariousMembers(); } private IList Children { get; } = new List(); @@ -518,9 +518,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -528,16 +528,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(misc.Pocos.SomeClass plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.misc.SomeClass plain) { plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -548,7 +548,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.SomeClass plain) + public async Task> PlainToOnlineAsync(Pocos.misc.SomeClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -558,7 +558,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Som [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.SomeClass plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.SomeClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -570,14 +570,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.SomeClass plain = new misc.Pocos.SomeClass(); + Pocos.misc.SomeClass plain = new Pocos.misc.SomeClass(); plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.SomeClass plain) + protected async Task ShadowToPlainAsync(Pocos.misc.SomeClass plain) { plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; @@ -588,7 +588,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.SomeClass plain) + public async Task> PlainToShadowAsync(Pocos.misc.SomeClass plain) { SomeClassVariable.Shadow = plain.SomeClassVariable; return this.RetrievePrimitives(); @@ -604,7 +604,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.SomeClass plain, misc.Pocos.SomeClass latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.SomeClass plain, Pocos.misc.SomeClass latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -623,9 +623,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.SomeClass CreateEmptyPoco() + public Pocos.misc.SomeClass CreateEmptyPoco() { - return new misc.Pocos.SomeClass(); + return new Pocos.misc.SomeClass(); } private IList Children { get; } = new List(); @@ -729,9 +729,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; @@ -739,14 +739,14 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); plain.isRunning = isRunning.LastValue; return plain; } - protected async Task OnlineToPlainAsync(misc.Pocos.Motor plain) + protected async Task OnlineToPlainAsync(Pocos.misc.Motor plain) { plain.isRunning = isRunning.LastValue; return plain; @@ -757,7 +757,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.Motor plain) + public async Task> PlainToOnlineAsync(Pocos.misc.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -767,7 +767,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Mot [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.Motor plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -779,14 +779,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.Motor plain = new misc.Pocos.Motor(); + Pocos.misc.Motor plain = new Pocos.misc.Motor(); plain.isRunning = isRunning.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.Motor plain) + protected async Task ShadowToPlainAsync(Pocos.misc.Motor plain) { plain.isRunning = isRunning.Shadow; return plain; @@ -797,7 +797,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.Motor plain) + public async Task> PlainToShadowAsync(Pocos.misc.Motor plain) { isRunning.Shadow = plain.isRunning; return this.RetrievePrimitives(); @@ -813,7 +813,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.Motor plain, misc.Pocos.Motor latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.Motor plain, Pocos.misc.Motor latest = null) { var somethingChanged = false; if (latest == null) @@ -832,9 +832,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.Motor CreateEmptyPoco() + public Pocos.misc.Motor CreateEmptyPoco() { - return new misc.Pocos.Motor(); + return new Pocos.misc.Motor(); } private IList Children { get; } = new List(); @@ -940,9 +940,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); await this.ReadAsync(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -953,9 +953,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -963,7 +963,7 @@ public async virtual Task OnlineToPlain() return plain; } - protected async Task OnlineToPlainAsync(misc.Pocos.Vehicle plain) + protected async Task OnlineToPlainAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -977,7 +977,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(misc.Pocos.Vehicle plain) + public async Task> PlainToOnlineAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -990,7 +990,7 @@ public async Task> PlainToOnlineAsync(misc.Pocos.Veh [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(misc.Pocos.Vehicle plain) + public async Task _PlainToOnlineNoacAsync(Pocos.misc.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -1005,15 +1005,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - misc.Pocos.Vehicle plain = new misc.Pocos.Vehicle(); + Pocos.misc.Vehicle plain = new Pocos.misc.Vehicle(); plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; return plain; } - protected async Task ShadowToPlainAsync(misc.Pocos.Vehicle plain) + protected async Task ShadowToPlainAsync(Pocos.misc.Vehicle plain) { plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; @@ -1025,7 +1025,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(misc.Pocos.Vehicle plain) + public async Task> PlainToShadowAsync(Pocos.misc.Vehicle plain) { await this.m.PlainToShadowAsync(plain.m); displacement.Shadow = plain.displacement; @@ -1042,7 +1042,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(misc.Pocos.Vehicle plain, misc.Pocos.Vehicle latest = null) + public async Task DetectsAnyChangeAsync(Pocos.misc.Vehicle plain, Pocos.misc.Vehicle latest = null) { var somethingChanged = false; if (latest == null) @@ -1063,9 +1063,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public misc.Pocos.Vehicle CreateEmptyPoco() + public Pocos.misc.Vehicle CreateEmptyPoco() { - return new misc.Pocos.Vehicle(); + return new Pocos.misc.Vehicle(); } private IList Children { get; } = new List(); @@ -1176,9 +1176,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); await this.ReadAsync(); #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); @@ -1189,9 +1189,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); #pragma warning restore CS0612 @@ -1201,7 +1201,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { #pragma warning disable CS0612 plain._complexKnown = _complexKnown.Select(async p => await p._OnlineToPlainNoacAsync()).Select(p => p.Result).ToArray(); @@ -1215,7 +1215,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task> PlainToOnlineAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -1230,7 +1230,7 @@ public async Task> PlainToOnlineAsync(UnknownArraysS [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task _PlainToOnlineNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; #pragma warning disable CS0612 @@ -1247,15 +1247,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain = new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain = new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); plain._complexKnown = _complexKnown.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); return plain; } - protected async Task ShadowToPlainAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + protected async Task ShadowToPlainAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { plain._complexKnown = _complexKnown.Select(async p => await p.ShadowToPlainAsync()).Select(p => p.Result).ToArray(); plain._primitive = _primitive.Select(p => p.Shadow).ToArray(); @@ -1267,7 +1267,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain) + public async Task> PlainToShadowAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain) { var __complexKnown_i_FE8484DAB3 = 0; _complexKnown.Select(p => p.PlainToShadowAsync(plain._complexKnown[__complexKnown_i_FE8484DAB3++])).ToArray(); @@ -1286,7 +1286,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays plain, UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays latest = null) + public async Task DetectsAnyChangeAsync(Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays plain, Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1315,9 +1315,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays CreateEmptyPoco() + public Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays CreateEmptyPoco() { - return new UnknownArraysShouldNotBeTraspiled.Pocos.ClassWithArrays(); + return new Pocos.UnknownArraysShouldNotBeTraspiled.ClassWithArrays(); } private IList Children { get; } = new List(); @@ -1423,9 +1423,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); await this.ReadAsync(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -1434,9 +1434,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; return plain; @@ -1444,7 +1444,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { plain.HelloString = HelloString.LastValue; plain.Id = Id.LastValue; @@ -1456,7 +1456,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task> PlainToOnlineAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -1469,7 +1469,7 @@ public async Task> PlainToOnlineAsync(UnknownArraysS [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task _PlainToOnlineNoacAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { #pragma warning disable CS0612 HelloString.LethargicWrite(plain.HelloString); @@ -1484,15 +1484,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain = new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; return plain; } - protected async Task ShadowToPlainAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + protected async Task ShadowToPlainAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { plain.HelloString = HelloString.Shadow; plain.Id = Id.Shadow; @@ -1504,7 +1504,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain) + public async Task> PlainToShadowAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain) { HelloString.Shadow = plain.HelloString; Id.Shadow = plain.Id; @@ -1521,7 +1521,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(UnknownArraysShouldNotBeTraspiled.Pocos.Complex plain, UnknownArraysShouldNotBeTraspiled.Pocos.Complex latest = null) + public async Task DetectsAnyChangeAsync(Pocos.UnknownArraysShouldNotBeTraspiled.Complex plain, Pocos.UnknownArraysShouldNotBeTraspiled.Complex latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1542,9 +1542,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public UnknownArraysShouldNotBeTraspiled.Pocos.Complex CreateEmptyPoco() + public Pocos.UnknownArraysShouldNotBeTraspiled.Complex CreateEmptyPoco() { - return new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(); + return new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(); } private IList Children { get; } = new List(); 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 aa8c32959..23ebdfe20 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 @@ -29,24 +29,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RefToSimple.Pocos.ref_to_simple plain = new RefToSimple.Pocos.ref_to_simple(); + Pocos.RefToSimple.ref_to_simple plain = new Pocos.RefToSimple.ref_to_simple(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RefToSimple.Pocos.ref_to_simple plain = new RefToSimple.Pocos.ref_to_simple(); + Pocos.RefToSimple.ref_to_simple plain = new Pocos.RefToSimple.ref_to_simple(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RefToSimple.Pocos.ref_to_simple plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RefToSimple.ref_to_simple plain) { return plain; } @@ -56,14 +56,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RefToSimple.Pocos.ref_to_simple plain) + public async Task> PlainToOnlineAsync(Pocos.RefToSimple.ref_to_simple plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RefToSimple.Pocos.ref_to_simple plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RefToSimple.ref_to_simple plain) { } @@ -72,13 +72,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RefToSimple.Pocos.ref_to_simple plain = new RefToSimple.Pocos.ref_to_simple(); + Pocos.RefToSimple.ref_to_simple plain = new Pocos.RefToSimple.ref_to_simple(); return plain; } - protected async Task ShadowToPlainAsync(RefToSimple.Pocos.ref_to_simple plain) + protected async Task ShadowToPlainAsync(Pocos.RefToSimple.ref_to_simple plain) { return plain; } @@ -88,7 +88,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RefToSimple.Pocos.ref_to_simple plain) + public async Task> PlainToShadowAsync(Pocos.RefToSimple.ref_to_simple plain) { return this.RetrievePrimitives(); } @@ -103,7 +103,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RefToSimple.Pocos.ref_to_simple plain, RefToSimple.Pocos.ref_to_simple latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RefToSimple.ref_to_simple plain, Pocos.RefToSimple.ref_to_simple latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -120,9 +120,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RefToSimple.Pocos.ref_to_simple CreateEmptyPoco() + public Pocos.RefToSimple.ref_to_simple CreateEmptyPoco() { - return new RefToSimple.Pocos.ref_to_simple(); + return new Pocos.RefToSimple.ref_to_simple(); } private IList Children { get; } = new List(); @@ -226,9 +226,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RefToSimple.Pocos.referenced plain = new RefToSimple.Pocos.referenced(); + Pocos.RefToSimple.referenced plain = new Pocos.RefToSimple.referenced(); await this.ReadAsync(); plain.b = b.LastValue; return plain; @@ -236,16 +236,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RefToSimple.Pocos.referenced plain = new RefToSimple.Pocos.referenced(); + Pocos.RefToSimple.referenced plain = new Pocos.RefToSimple.referenced(); plain.b = b.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RefToSimple.Pocos.referenced plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RefToSimple.referenced plain) { plain.b = b.LastValue; return plain; @@ -256,7 +256,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RefToSimple.Pocos.referenced plain) + public async Task> PlainToOnlineAsync(Pocos.RefToSimple.referenced plain) { #pragma warning disable CS0612 b.LethargicWrite(plain.b); @@ -266,7 +266,7 @@ public async Task> PlainToOnlineAsync(RefToSimple.Po [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RefToSimple.Pocos.referenced plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RefToSimple.referenced plain) { #pragma warning disable CS0612 b.LethargicWrite(plain.b); @@ -278,14 +278,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RefToSimple.Pocos.referenced plain = new RefToSimple.Pocos.referenced(); + Pocos.RefToSimple.referenced plain = new Pocos.RefToSimple.referenced(); plain.b = b.Shadow; return plain; } - protected async Task ShadowToPlainAsync(RefToSimple.Pocos.referenced plain) + protected async Task ShadowToPlainAsync(Pocos.RefToSimple.referenced plain) { plain.b = b.Shadow; return plain; @@ -296,7 +296,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RefToSimple.Pocos.referenced plain) + public async Task> PlainToShadowAsync(Pocos.RefToSimple.referenced plain) { b.Shadow = plain.b; return this.RetrievePrimitives(); @@ -312,7 +312,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RefToSimple.Pocos.referenced plain, RefToSimple.Pocos.referenced latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RefToSimple.referenced plain, Pocos.RefToSimple.referenced latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -331,9 +331,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RefToSimple.Pocos.referenced CreateEmptyPoco() + public Pocos.RefToSimple.referenced CreateEmptyPoco() { - return new RefToSimple.Pocos.referenced(); + return new Pocos.RefToSimple.referenced(); } private IList Children { get; } = new List(); 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 44c3f9b49..07141bc02 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 @@ -29,24 +29,24 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - sampleNamespace.Pocos.simple_empty_class_within_namespace plain = new sampleNamespace.Pocos.simple_empty_class_within_namespace(); + Pocos.sampleNamespace.simple_empty_class_within_namespace plain = new Pocos.sampleNamespace.simple_empty_class_within_namespace(); await this.ReadAsync(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - sampleNamespace.Pocos.simple_empty_class_within_namespace plain = new sampleNamespace.Pocos.simple_empty_class_within_namespace(); + Pocos.sampleNamespace.simple_empty_class_within_namespace plain = new Pocos.sampleNamespace.simple_empty_class_within_namespace(); return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { return plain; } @@ -56,14 +56,14 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain) + public async Task> PlainToOnlineAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { return await this.WriteAsync(); } [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain) + public async Task _PlainToOnlineNoacAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { } @@ -72,13 +72,13 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - sampleNamespace.Pocos.simple_empty_class_within_namespace plain = new sampleNamespace.Pocos.simple_empty_class_within_namespace(); + Pocos.sampleNamespace.simple_empty_class_within_namespace plain = new Pocos.sampleNamespace.simple_empty_class_within_namespace(); return plain; } - protected async Task ShadowToPlainAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain) + protected async Task ShadowToPlainAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { return plain; } @@ -88,7 +88,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain) + public async Task> PlainToShadowAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain) { return this.RetrievePrimitives(); } @@ -103,7 +103,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(sampleNamespace.Pocos.simple_empty_class_within_namespace plain, sampleNamespace.Pocos.simple_empty_class_within_namespace latest = null) + public async Task DetectsAnyChangeAsync(Pocos.sampleNamespace.simple_empty_class_within_namespace plain, Pocos.sampleNamespace.simple_empty_class_within_namespace latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -120,9 +120,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public sampleNamespace.Pocos.simple_empty_class_within_namespace CreateEmptyPoco() + public Pocos.sampleNamespace.simple_empty_class_within_namespace CreateEmptyPoco() { - return new sampleNamespace.Pocos.simple_empty_class_within_namespace(); + return new Pocos.sampleNamespace.simple_empty_class_within_namespace(); } private IList Children { get; } = new List(); 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 8f91b8ea0..8cfb62079 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 @@ -40,9 +40,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - NamedValuesNamespace.Pocos.using_type_named_values plain = new NamedValuesNamespace.Pocos.using_type_named_values(); + Pocos.NamedValuesNamespace.using_type_named_values plain = new Pocos.NamedValuesNamespace.using_type_named_values(); await this.ReadAsync(); plain.LColors = LColors.LastValue; return plain; @@ -50,16 +50,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - NamedValuesNamespace.Pocos.using_type_named_values plain = new NamedValuesNamespace.Pocos.using_type_named_values(); + Pocos.NamedValuesNamespace.using_type_named_values plain = new Pocos.NamedValuesNamespace.using_type_named_values(); plain.LColors = LColors.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(NamedValuesNamespace.Pocos.using_type_named_values plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { plain.LColors = LColors.LastValue; return plain; @@ -70,7 +70,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(NamedValuesNamespace.Pocos.using_type_named_values plain) + public async Task> PlainToOnlineAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { #pragma warning disable CS0612 LColors.LethargicWrite(plain.LColors); @@ -80,7 +80,7 @@ public async Task> PlainToOnlineAsync(NamedValuesNam [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(NamedValuesNamespace.Pocos.using_type_named_values plain) + public async Task _PlainToOnlineNoacAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { #pragma warning disable CS0612 LColors.LethargicWrite(plain.LColors); @@ -92,14 +92,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - NamedValuesNamespace.Pocos.using_type_named_values plain = new NamedValuesNamespace.Pocos.using_type_named_values(); + Pocos.NamedValuesNamespace.using_type_named_values plain = new Pocos.NamedValuesNamespace.using_type_named_values(); plain.LColors = LColors.Shadow; return plain; } - protected async Task ShadowToPlainAsync(NamedValuesNamespace.Pocos.using_type_named_values plain) + protected async Task ShadowToPlainAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { plain.LColors = LColors.Shadow; return plain; @@ -110,7 +110,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(NamedValuesNamespace.Pocos.using_type_named_values plain) + public async Task> PlainToShadowAsync(Pocos.NamedValuesNamespace.using_type_named_values plain) { LColors.Shadow = plain.LColors; return this.RetrievePrimitives(); @@ -126,7 +126,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(NamedValuesNamespace.Pocos.using_type_named_values plain, NamedValuesNamespace.Pocos.using_type_named_values latest = null) + public async Task DetectsAnyChangeAsync(Pocos.NamedValuesNamespace.using_type_named_values plain, Pocos.NamedValuesNamespace.using_type_named_values latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -145,9 +145,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public NamedValuesNamespace.Pocos.using_type_named_values CreateEmptyPoco() + public Pocos.NamedValuesNamespace.using_type_named_values CreateEmptyPoco() { - return new NamedValuesNamespace.Pocos.using_type_named_values(); + return new Pocos.NamedValuesNamespace.using_type_named_values(); } private IList Children { get; } = new List(); 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 6d62a378b..c07afdbef 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 @@ -42,9 +42,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.using_type_named_values plain = new Simatic.Ax.StateFramework.Pocos.using_type_named_values(); + Pocos.Simatic.Ax.StateFramework.using_type_named_values plain = new Pocos.Simatic.Ax.StateFramework.using_type_named_values(); await this.ReadAsync(); plain.LColors = LColors.LastValue; return plain; @@ -52,16 +52,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Simatic.Ax.StateFramework.Pocos.using_type_named_values plain = new Simatic.Ax.StateFramework.Pocos.using_type_named_values(); + Pocos.Simatic.Ax.StateFramework.using_type_named_values plain = new Pocos.Simatic.Ax.StateFramework.using_type_named_values(); plain.LColors = LColors.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { plain.LColors = LColors.LastValue; return plain; @@ -72,7 +72,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain) + public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { #pragma warning disable CS0612 LColors.LethargicWrite(plain.LColors); @@ -82,7 +82,7 @@ public async Task> PlainToOnlineAsync(Simatic.Ax.Sta [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { #pragma warning disable CS0612 LColors.LethargicWrite(plain.LColors); @@ -94,14 +94,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.using_type_named_values plain = new Simatic.Ax.StateFramework.Pocos.using_type_named_values(); + Pocos.Simatic.Ax.StateFramework.using_type_named_values plain = new Pocos.Simatic.Ax.StateFramework.using_type_named_values(); plain.LColors = LColors.Shadow; return plain; } - protected async Task ShadowToPlainAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain) + protected async Task ShadowToPlainAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { plain.LColors = LColors.Shadow; return plain; @@ -112,7 +112,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain) + public async Task> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain) { LColors.Shadow = plain.LColors; return this.RetrievePrimitives(); @@ -128,7 +128,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Simatic.Ax.StateFramework.Pocos.using_type_named_values plain, Simatic.Ax.StateFramework.Pocos.using_type_named_values latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Simatic.Ax.StateFramework.using_type_named_values plain, Pocos.Simatic.Ax.StateFramework.using_type_named_values latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -147,9 +147,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Simatic.Ax.StateFramework.Pocos.using_type_named_values CreateEmptyPoco() + public Pocos.Simatic.Ax.StateFramework.using_type_named_values CreateEmptyPoco() { - return new Simatic.Ax.StateFramework.Pocos.using_type_named_values(); + return new Pocos.Simatic.Ax.StateFramework.using_type_named_values(); } private IList Children { get; } = new List(); 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 ec7388c85..ee5fd3776 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 @@ -53,9 +53,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain = new Simatic.Ax.StateFramework.Pocos.CompareGuardLint(); + Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain = new Pocos.Simatic.Ax.StateFramework.CompareGuardLint(); await this.ReadAsync(); plain.CompareToValue = CompareToValue.LastValue; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.LastValue; @@ -64,9 +64,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain = new Simatic.Ax.StateFramework.Pocos.CompareGuardLint(); + Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain = new Pocos.Simatic.Ax.StateFramework.CompareGuardLint(); plain.CompareToValue = CompareToValue.LastValue; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.LastValue; return plain; @@ -74,7 +74,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain) { plain.CompareToValue = CompareToValue.LastValue; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.LastValue; @@ -86,7 +86,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain) + public async Task> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain) { #pragma warning disable CS0612 CompareToValue.LethargicWrite(plain.CompareToValue); @@ -99,7 +99,7 @@ public async Task> PlainToOnlineAsync(Simatic.Ax.Sta [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain) + public async Task _PlainToOnlineNoacAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain) { #pragma warning disable CS0612 CompareToValue.LethargicWrite(plain.CompareToValue); @@ -114,15 +114,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain = new Simatic.Ax.StateFramework.Pocos.CompareGuardLint(); + Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain = new Pocos.Simatic.Ax.StateFramework.CompareGuardLint(); plain.CompareToValue = CompareToValue.Shadow; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.Shadow; return plain; } - protected async Task ShadowToPlainAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain) + protected async Task ShadowToPlainAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain) { plain.CompareToValue = CompareToValue.Shadow; plain.Condition = (Simatic.Ax.StateFramework.Condition)Condition.Shadow; @@ -134,7 +134,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain) + public async Task> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain) { CompareToValue.Shadow = plain.CompareToValue; Condition.Shadow = (short)plain.Condition; @@ -151,7 +151,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(Simatic.Ax.StateFramework.Pocos.CompareGuardLint plain, Simatic.Ax.StateFramework.Pocos.CompareGuardLint latest = null) + public async Task DetectsAnyChangeAsync(Pocos.Simatic.Ax.StateFramework.CompareGuardLint plain, Pocos.Simatic.Ax.StateFramework.CompareGuardLint latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -172,9 +172,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public Simatic.Ax.StateFramework.Pocos.CompareGuardLint CreateEmptyPoco() + public Pocos.Simatic.Ax.StateFramework.CompareGuardLint CreateEmptyPoco() { - return new Simatic.Ax.StateFramework.Pocos.CompareGuardLint(); + return new Pocos.Simatic.Ax.StateFramework.CompareGuardLint(); } private IList Children { get; } = new List(); 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 56fc275f1..96b766c54 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 @@ -33,9 +33,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - TypeWithNameAttributes.Pocos.Motor plain = new TypeWithNameAttributes.Pocos.Motor(); + Pocos.TypeWithNameAttributes.Motor plain = new Pocos.TypeWithNameAttributes.Motor(); await this.ReadAsync(); plain.isRunning = isRunning.LastValue; return plain; @@ -43,14 +43,14 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - TypeWithNameAttributes.Pocos.Motor plain = new TypeWithNameAttributes.Pocos.Motor(); + Pocos.TypeWithNameAttributes.Motor plain = new Pocos.TypeWithNameAttributes.Motor(); plain.isRunning = isRunning.LastValue; return plain; } - protected async Task OnlineToPlainAsync(TypeWithNameAttributes.Pocos.Motor plain) + protected async Task OnlineToPlainAsync(Pocos.TypeWithNameAttributes.Motor plain) { plain.isRunning = isRunning.LastValue; return plain; @@ -61,7 +61,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(TypeWithNameAttributes.Pocos.Motor plain) + public async Task> PlainToOnlineAsync(Pocos.TypeWithNameAttributes.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -71,7 +71,7 @@ public async Task> PlainToOnlineAsync(TypeWithNameAt [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(TypeWithNameAttributes.Pocos.Motor plain) + public async Task _PlainToOnlineNoacAsync(Pocos.TypeWithNameAttributes.Motor plain) { #pragma warning disable CS0612 isRunning.LethargicWrite(plain.isRunning); @@ -83,14 +83,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - TypeWithNameAttributes.Pocos.Motor plain = new TypeWithNameAttributes.Pocos.Motor(); + Pocos.TypeWithNameAttributes.Motor plain = new Pocos.TypeWithNameAttributes.Motor(); plain.isRunning = isRunning.Shadow; return plain; } - protected async Task ShadowToPlainAsync(TypeWithNameAttributes.Pocos.Motor plain) + protected async Task ShadowToPlainAsync(Pocos.TypeWithNameAttributes.Motor plain) { plain.isRunning = isRunning.Shadow; return plain; @@ -101,7 +101,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(TypeWithNameAttributes.Pocos.Motor plain) + public async Task> PlainToShadowAsync(Pocos.TypeWithNameAttributes.Motor plain) { isRunning.Shadow = plain.isRunning; return this.RetrievePrimitives(); @@ -117,7 +117,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(TypeWithNameAttributes.Pocos.Motor plain, TypeWithNameAttributes.Pocos.Motor latest = null) + public async Task DetectsAnyChangeAsync(Pocos.TypeWithNameAttributes.Motor plain, Pocos.TypeWithNameAttributes.Motor latest = null) { var somethingChanged = false; if (latest == null) @@ -136,9 +136,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public TypeWithNameAttributes.Pocos.Motor CreateEmptyPoco() + public Pocos.TypeWithNameAttributes.Motor CreateEmptyPoco() { - return new TypeWithNameAttributes.Pocos.Motor(); + return new Pocos.TypeWithNameAttributes.Motor(); } private IList Children { get; } = new List(); @@ -244,9 +244,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - TypeWithNameAttributes.Pocos.Vehicle plain = new TypeWithNameAttributes.Pocos.Vehicle(); + Pocos.TypeWithNameAttributes.Vehicle plain = new Pocos.TypeWithNameAttributes.Vehicle(); await this.ReadAsync(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -257,9 +257,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - TypeWithNameAttributes.Pocos.Vehicle plain = new TypeWithNameAttributes.Pocos.Vehicle(); + Pocos.TypeWithNameAttributes.Vehicle plain = new Pocos.TypeWithNameAttributes.Vehicle(); #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); #pragma warning restore CS0612 @@ -267,7 +267,7 @@ public async virtual Task OnlineToPlain() return plain; } - protected async Task OnlineToPlainAsync(TypeWithNameAttributes.Pocos.Vehicle plain) + protected async Task OnlineToPlainAsync(Pocos.TypeWithNameAttributes.Vehicle plain) { #pragma warning disable CS0612 plain.m = await m._OnlineToPlainNoacAsync(); @@ -281,7 +281,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(TypeWithNameAttributes.Pocos.Vehicle plain) + public async Task> PlainToOnlineAsync(Pocos.TypeWithNameAttributes.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -294,7 +294,7 @@ public async Task> PlainToOnlineAsync(TypeWithNameAt [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(TypeWithNameAttributes.Pocos.Vehicle plain) + public async Task _PlainToOnlineNoacAsync(Pocos.TypeWithNameAttributes.Vehicle plain) { #pragma warning disable CS0612 await this.m._PlainToOnlineNoacAsync(plain.m); @@ -309,15 +309,15 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - TypeWithNameAttributes.Pocos.Vehicle plain = new TypeWithNameAttributes.Pocos.Vehicle(); + Pocos.TypeWithNameAttributes.Vehicle plain = new Pocos.TypeWithNameAttributes.Vehicle(); plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; return plain; } - protected async Task ShadowToPlainAsync(TypeWithNameAttributes.Pocos.Vehicle plain) + protected async Task ShadowToPlainAsync(Pocos.TypeWithNameAttributes.Vehicle plain) { plain.m = await m.ShadowToPlainAsync(); plain.displacement = displacement.Shadow; @@ -329,7 +329,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(TypeWithNameAttributes.Pocos.Vehicle plain) + public async Task> PlainToShadowAsync(Pocos.TypeWithNameAttributes.Vehicle plain) { await this.m.PlainToShadowAsync(plain.m); displacement.Shadow = plain.displacement; @@ -346,7 +346,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(TypeWithNameAttributes.Pocos.Vehicle plain, TypeWithNameAttributes.Pocos.Vehicle latest = null) + public async Task DetectsAnyChangeAsync(Pocos.TypeWithNameAttributes.Vehicle plain, Pocos.TypeWithNameAttributes.Vehicle latest = null) { var somethingChanged = false; if (latest == null) @@ -367,9 +367,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public TypeWithNameAttributes.Pocos.Vehicle CreateEmptyPoco() + public Pocos.TypeWithNameAttributes.Vehicle CreateEmptyPoco() { - return new TypeWithNameAttributes.Pocos.Vehicle(); + return new Pocos.TypeWithNameAttributes.Vehicle(); } private IList Children { get; } = new List(); @@ -481,9 +481,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - TypeWithNameAttributes.Pocos.NoAccessModifierClass plain = new TypeWithNameAttributes.Pocos.NoAccessModifierClass(); + Pocos.TypeWithNameAttributes.NoAccessModifierClass plain = new Pocos.TypeWithNameAttributes.NoAccessModifierClass(); await this.ReadAsync(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -491,16 +491,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - TypeWithNameAttributes.Pocos.NoAccessModifierClass plain = new TypeWithNameAttributes.Pocos.NoAccessModifierClass(); + Pocos.TypeWithNameAttributes.NoAccessModifierClass plain = new Pocos.TypeWithNameAttributes.NoAccessModifierClass(); plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { plain.SomeClassVariable = SomeClassVariable.LastValue; return plain; @@ -511,7 +511,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain) + public async Task> PlainToOnlineAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -521,7 +521,7 @@ public async Task> PlainToOnlineAsync(TypeWithNameAt [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain) + public async Task _PlainToOnlineNoacAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { #pragma warning disable CS0612 SomeClassVariable.LethargicWrite(plain.SomeClassVariable); @@ -533,14 +533,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - TypeWithNameAttributes.Pocos.NoAccessModifierClass plain = new TypeWithNameAttributes.Pocos.NoAccessModifierClass(); + Pocos.TypeWithNameAttributes.NoAccessModifierClass plain = new Pocos.TypeWithNameAttributes.NoAccessModifierClass(); plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; } - protected async Task ShadowToPlainAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain) + protected async Task ShadowToPlainAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { plain.SomeClassVariable = SomeClassVariable.Shadow; return plain; @@ -551,7 +551,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain) + public async Task> PlainToShadowAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain) { SomeClassVariable.Shadow = plain.SomeClassVariable; return this.RetrievePrimitives(); @@ -567,7 +567,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(TypeWithNameAttributes.Pocos.NoAccessModifierClass plain, TypeWithNameAttributes.Pocos.NoAccessModifierClass latest = null) + public async Task DetectsAnyChangeAsync(Pocos.TypeWithNameAttributes.NoAccessModifierClass plain, Pocos.TypeWithNameAttributes.NoAccessModifierClass latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -586,9 +586,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public TypeWithNameAttributes.Pocos.NoAccessModifierClass CreateEmptyPoco() + public Pocos.TypeWithNameAttributes.NoAccessModifierClass CreateEmptyPoco() { - return new TypeWithNameAttributes.Pocos.NoAccessModifierClass(); + return new Pocos.TypeWithNameAttributes.NoAccessModifierClass(); } private IList Children { get; } = new List(); 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 fba421dce..300b6ce00 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 @@ -42,9 +42,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain = new TypesWithPropertyAttributes.Pocos.SomeAddedProperties(); + Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain = new Pocos.TypesWithPropertyAttributes.SomeAddedProperties(); await this.ReadAsync(); plain.Counter = Counter.LastValue; return plain; @@ -52,16 +52,16 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain = new TypesWithPropertyAttributes.Pocos.SomeAddedProperties(); + Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain = new Pocos.TypesWithPropertyAttributes.SomeAddedProperties(); plain.Counter = Counter.LastValue; return plain; } [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { plain.Counter = Counter.LastValue; return plain; @@ -72,7 +72,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain) + public async Task> PlainToOnlineAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { #pragma warning disable CS0612 Counter.LethargicWrite(plain.Counter); @@ -82,7 +82,7 @@ public async Task> PlainToOnlineAsync(TypesWithPrope [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain) + public async Task _PlainToOnlineNoacAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { #pragma warning disable CS0612 Counter.LethargicWrite(plain.Counter); @@ -94,14 +94,14 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain = new TypesWithPropertyAttributes.Pocos.SomeAddedProperties(); + Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain = new Pocos.TypesWithPropertyAttributes.SomeAddedProperties(); plain.Counter = Counter.Shadow; return plain; } - protected async Task ShadowToPlainAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain) + protected async Task ShadowToPlainAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { plain.Counter = Counter.Shadow; return plain; @@ -112,7 +112,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain) + public async Task> PlainToShadowAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain) { Counter.Shadow = plain.Counter; return this.RetrievePrimitives(); @@ -128,7 +128,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(TypesWithPropertyAttributes.Pocos.SomeAddedProperties plain, TypesWithPropertyAttributes.Pocos.SomeAddedProperties latest = null) + public async Task DetectsAnyChangeAsync(Pocos.TypesWithPropertyAttributes.SomeAddedProperties plain, Pocos.TypesWithPropertyAttributes.SomeAddedProperties latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -147,9 +147,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public TypesWithPropertyAttributes.Pocos.SomeAddedProperties CreateEmptyPoco() + public Pocos.TypesWithPropertyAttributes.SomeAddedProperties CreateEmptyPoco() { - return new TypesWithPropertyAttributes.Pocos.SomeAddedProperties(); + return new Pocos.TypesWithPropertyAttributes.SomeAddedProperties(); } private IList Children { get; } = new List(); diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs index f6fa692e1..76f115550 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs @@ -2,26 +2,23 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace ArrayDeclarationSimpleNamespace +namespace Pocos { - namespace Pocos + namespace ArrayDeclarationSimpleNamespace { public partial class array_declaration_class : AXSharp.Connector.IPlain { public array_declaration_class() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(complex, () => new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type(), new[] { (1, 100) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(complex, () => new Pocos.ArrayDeclarationSimpleNamespace.some_complex_type(), new[] { (1, 100) }); #pragma warning restore CS0612 } public Int16[] primitive { get; set; } = new Int16[100]; - public ArrayDeclarationSimpleNamespace.Pocos.some_complex_type[] complex { get; set; } = new ArrayDeclarationSimpleNamespace.Pocos.some_complex_type[100]; + public ArrayDeclarationSimpleNamespace.some_complex_type[] complex { get; set; } = new ArrayDeclarationSimpleNamespace.some_complex_type[100]; } - } - namespace Pocos - { public partial class some_complex_type : AXSharp.Connector.IPlain { public some_complex_type() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs index cbd2bd155..221f97ee3 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs @@ -2,22 +2,19 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Simatic.Ax.StateFramework +namespace Pocos { - namespace Pocos + namespace Simatic.Ax.StateFramework { - public partial class State1Transition : Simatic.Ax.StateFramework.Pocos.AbstractState, AXSharp.Connector.IPlain + public partial class State1Transition : Simatic.Ax.StateFramework.AbstractState, AXSharp.Connector.IPlain { public State1Transition() : base() { } } } -} -namespace Simatic.Ax.StateFramework -{ - namespace Pocos + namespace Simatic.Ax.StateFramework { public partial class AbstractState : AXSharp.Connector.IPlain, IState, IStateMuteable { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs index d52dd7eef..4ce871c91 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs @@ -4,16 +4,13 @@ namespace Pocos { - public partial class Extended : global::Pocos.Extendee, AXSharp.Connector.IPlain + public partial class Extended : Extendee, AXSharp.Connector.IPlain { public Extended() : base() { } } -} -namespace Pocos -{ public partial class Extendee : AXSharp.Connector.IPlain { public Extendee() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs index 599ef8e51..91481513b 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs @@ -4,28 +4,25 @@ namespace Pocos { - public partial class ExtendsAndImplements : global::Pocos.ExtendeeExtendsAndImplements, AXSharp.Connector.IPlain, IImplementation1, IImplementation2 + public partial class ExtendsAndImplements : ExtendeeExtendsAndImplements, AXSharp.Connector.IPlain, IImplementation1, IImplementation2 { public ExtendsAndImplements() : base() { } } -} -namespace Pocos -{ public partial class ExtendeeExtendsAndImplements : AXSharp.Connector.IPlain { public ExtendeeExtendsAndImplements() { } } -} -public partial interface IImplementation1 -{ -} + public partial interface IImplementation1 + { + } -public partial interface IImplementation2 -{ + public partial interface IImplementation2 + { + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs index e2b834c26..906b0bc07 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_generic_extension.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Generics +namespace Pocos { - namespace Pocos + namespace Generics { public partial class Extender : AXSharp.Connector.IPlain { @@ -12,35 +12,26 @@ public Extender() { } } - } - namespace Pocos - { - public partial class Extendee : Generics.Pocos.Extender, AXSharp.Connector.IPlain + public partial class Extendee : Generics.Extender, AXSharp.Connector.IPlain { public Extendee() : base() { } - public Generics.Pocos.SomeType SomeType { get; set; } = new Generics.Pocos.SomeType(); - public Generics.Pocos.SomeType SomeTypeAsPoco { get; set; } = new Generics.Pocos.SomeType(); + public Generics.SomeType SomeType { get; set; } = new Generics.SomeType(); + public Generics.SomeType SomeTypeAsPoco { get; set; } = new Generics.SomeType(); } - } - namespace Pocos - { - public partial class Extendee2 : Generics.Pocos.Extender, AXSharp.Connector.IPlain + public partial class Extendee2 : Generics.Extender, AXSharp.Connector.IPlain { public Extendee2() : base() { } - public Generics.Pocos.SomeType SomeType { get; set; } = new Generics.Pocos.SomeType(); + public Generics.SomeType SomeType { get; set; } = new Generics.SomeType(); } - } - namespace Pocos - { public partial class SomeType : AXSharp.Connector.IPlain { public SomeType() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs index d5e22e3ad..5eb39ed0d 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs @@ -10,8 +10,8 @@ public _NULL_CONTEXT() { } } -} -public partial interface IContext -{ + public partial interface IContext + { + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs index 948849eb5..aca3704d2 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs @@ -10,12 +10,12 @@ public _NULL_CONTEXT_MULTIPLE() { } } -} -public partial interface IContext_Multiple -{ -} + public partial interface IContext_Multiple + { + } -public partial interface IObject_Multiple -{ + public partial interface IObject_Multiple + { + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs index 8e81b9e42..27f5f1d89 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace ClassWithComplexTypesNamespace +namespace Pocos { - namespace Pocos + namespace ClassWithComplexTypesNamespace { public partial class ClassWithComplexTypes : AXSharp.Connector.IPlain { @@ -12,12 +12,9 @@ public ClassWithComplexTypes() { } - public ClassWithComplexTypesNamespace.Pocos.ComplexType1 myComplexType { get; set; } = new ClassWithComplexTypesNamespace.Pocos.ComplexType1(); + public ClassWithComplexTypesNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithComplexTypesNamespace.ComplexType1(); } - } - namespace Pocos - { public partial class ComplexType1 : AXSharp.Connector.IPlain { public ComplexType1() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs index f0bd08a34..7f96b8734 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace ClassWithNonTraspilableMemberssNamespace +namespace Pocos { - namespace Pocos + namespace ClassWithNonTraspilableMemberssNamespace { public partial class ClassWithNonTraspilableMembers : AXSharp.Connector.IPlain { @@ -12,12 +12,9 @@ public ClassWithNonTraspilableMembers() { } - public ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1 myComplexType { get; set; } = new ClassWithNonTraspilableMemberssNamespace.Pocos.ComplexType1(); + public ClassWithNonTraspilableMemberssNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithNonTraspilableMemberssNamespace.ComplexType1(); } - } - namespace Pocos - { public partial class ComplexType1 : AXSharp.Connector.IPlain { public ComplexType1() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs index f86e93fa7..874c95304 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace ClassWithPragmasNamespace +namespace Pocos { - namespace Pocos + namespace ClassWithPragmasNamespace { public partial class ClassWithPragmas : AXSharp.Connector.IPlain { @@ -13,12 +13,9 @@ public ClassWithPragmas() } [Container(Layout.Wrap)] - public ClassWithPragmasNamespace.Pocos.ComplexType1 myComplexType { get; set; } = new ClassWithPragmasNamespace.Pocos.ComplexType1(); + public ClassWithPragmasNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithPragmasNamespace.ComplexType1(); } - } - namespace Pocos - { public partial class ComplexType1 : AXSharp.Connector.IPlain { public ComplexType1() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs index 41e42dcdf..9073f398c 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace ClassWithPrimitiveTypesNamespace +namespace Pocos { - namespace Pocos + namespace ClassWithPrimitiveTypesNamespace { public partial class ClassWithPrimitiveTypes : AXSharp.Connector.IPlain { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs index ccc0bd7cd..ca595c931 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs @@ -16,7 +16,8 @@ public ClassWithUsingDirectives() using SimpleFirstLevelNamespace ; using SimpleQualifiedNamespace . Qualified ; using HelloLevelOne . HelloLevelTwo ; -} } +} + namespace SimpleFirstLevelNamespace { } @@ -30,4 +31,4 @@ namespace HelloLevelOne namespace HelloLevelTwo { } -} \ No newline at end of file +} } diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs index 338ccb41d..3b6b4daf9 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace CompilerOmmits +namespace Pocos { - namespace Pocos + namespace CompilerOmmits { public partial class ClassWithArrays : AXSharp.Connector.IPlain { @@ -13,13 +13,10 @@ public ClassWithArrays() } [CompilerOmitsAttribute("Onliner")] - public CompilerOmmits.Pocos.Complex _must_be_omitted_in_onliner { get; set; } = new CompilerOmmits.Pocos.Complex(); + public CompilerOmmits.Complex _must_be_omitted_in_onliner { get; set; } = new CompilerOmmits.Complex(); public Byte[] _primitive { get; set; } = new Byte[11]; } - } - namespace Pocos - { public partial class Complex : AXSharp.Connector.IPlain { public Complex() @@ -30,11 +27,8 @@ public Complex() public UInt64 Id { get; set; } } } -} -namespace Enums -{ - namespace Pocos + namespace Enums { public partial class ClassWithEnums : AXSharp.Connector.IPlain { @@ -46,11 +40,8 @@ public ClassWithEnums() public String NamedValuesColors { get; set; } } } -} -namespace misc -{ - namespace Pocos + namespace misc { public partial class VariousMembers : AXSharp.Connector.IPlain { @@ -58,13 +49,10 @@ public VariousMembers() { } - public misc.Pocos.SomeClass _SomeClass { get; set; } = new misc.Pocos.SomeClass(); - public misc.Pocos.Motor _Motor { get; set; } = new misc.Pocos.Motor(); + public misc.SomeClass _SomeClass { get; set; } = new misc.SomeClass(); + public misc.Motor _Motor { get; set; } = new misc.Motor(); } - } - namespace Pocos - { public partial class SomeClass : AXSharp.Connector.IPlain { public SomeClass() @@ -73,10 +61,7 @@ public SomeClass() public string SomeClassVariable { get; set; } = string.Empty; } - } - namespace Pocos - { public partial class Motor : AXSharp.Connector.IPlain { public Motor() @@ -85,42 +70,33 @@ public Motor() public Boolean isRunning { get; set; } } - } - namespace Pocos - { public partial class Vehicle : AXSharp.Connector.IPlain { public Vehicle() { } - public misc.Pocos.Motor m { get; set; } = new misc.Pocos.Motor(); + public misc.Motor m { get; set; } = new misc.Motor(); public Int16 displacement { get; set; } } } -} -namespace UnknownArraysShouldNotBeTraspiled -{ - namespace Pocos + namespace UnknownArraysShouldNotBeTraspiled { public partial class ClassWithArrays : AXSharp.Connector.IPlain { public ClassWithArrays() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(_complexKnown, () => new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(), new[] { (0, 10) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(_complexKnown, () => new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(), new[] { (0, 10) }); #pragma warning restore CS0612 } - public UnknownArraysShouldNotBeTraspiled.Pocos.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex[11]; + public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Complex[11]; public Byte[] _primitive { get; set; } = new Byte[11]; } - } - namespace Pocos - { public partial class Complex : AXSharp.Connector.IPlain { public Complex() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs index 63db40273..68008a92a 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs @@ -6,7 +6,7 @@ namespace Pocos { public partial class unitsTwinController { - public global::Pocos.ComplexForConfig Complex { get; set; } = new global::Pocos.ComplexForConfig(); + public ComplexForConfig Complex { get; set; } = new ComplexForConfig(); public Boolean myBOOL { get; set; } public Byte myBYTE { get; set; } public UInt16 myWORD { get; set; } @@ -42,20 +42,17 @@ public partial class unitsTwinController public string myWSTRING_readOnly { get; set; } = string.Empty; [ReadOnce()] - public global::Pocos.ComplexForConfig cReadOnce { get; set; } = new global::Pocos.ComplexForConfig(); + public ComplexForConfig cReadOnce { get; set; } = new ComplexForConfig(); [ReadOnly()] - public global::Pocos.ComplexForConfig cReadOnly { get; set; } = new global::Pocos.ComplexForConfig(); + public ComplexForConfig cReadOnly { get; set; } = new ComplexForConfig(); public global::Colorss Colorss { get; set; } public UInt64 Colorsss { get; set; } [CompilerOmitsAttribute("Onliner")] public Boolean _must_be_omitted_in_onliner { get; set; } } -} -namespace Pocos -{ public partial class ComplexForConfig : AXSharp.Connector.IPlain { public ComplexForConfig() @@ -89,12 +86,9 @@ public ComplexForConfig() public Char myWCHAR { get; set; } public string mySTRING { get; set; } = string.Empty; public string myWSTRING { get; set; } = string.Empty; - public global::Pocos.Motor myMotor { get; set; } = new global::Pocos.Motor(); + public Motor myMotor { get; set; } = new Motor(); } -} -namespace Pocos -{ public partial class Motor : AXSharp.Connector.IPlain { public Motor() @@ -103,17 +97,14 @@ public Motor() public Boolean isRunning { get; set; } } -} -namespace Pocos -{ public partial class Vehicle : AXSharp.Connector.IPlain { public Vehicle() { } - public global::Pocos.Motor m { get; set; } = new global::Pocos.Motor(); + public Motor m { get; set; } = new Motor(); public Int16 displacement { get; set; } } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs index da1480552..e23d372b9 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/enum_simple.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs index a5813f10c..56cacaa1e 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_unsupported.g.cs @@ -2,6 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Unsupported +namespace Pocos { + namespace Unsupported + { + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs index 531988641..1fecb9332 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/file_with_usings.g.cs @@ -1,13 +1,13 @@ using System; using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -using FileWithUsingsSimpleFirstLevelNamespace.Pocos; -using FileWithUsingsSimpleQualifiedNamespace.Qualified.Pocos; -using FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo.Pocos; +using Pocos.FileWithUsingsSimpleFirstLevelNamespace; +using Pocos.FileWithUsingsSimpleQualifiedNamespace.Qualified; +using Pocos.FileWithUsingsHelloLevelOne.FileWithUsingsHelloLevelTwo; -namespace FileWithUsingsSimpleFirstLevelNamespace +namespace Pocos { - namespace Pocos + namespace FileWithUsingsSimpleFirstLevelNamespace { public partial class Hello : AXSharp.Connector.IPlain { @@ -16,11 +16,8 @@ public Hello() } } } -} -namespace FileWithUsingsSimpleQualifiedNamespace.Qualified -{ - namespace Pocos + namespace FileWithUsingsSimpleQualifiedNamespace.Qualified { public partial class Hello : AXSharp.Connector.IPlain { @@ -29,13 +26,10 @@ public Hello() } } } -} -namespace FileWithUsingsHelloLevelOne -{ - namespace FileWithUsingsHelloLevelTwo + namespace FileWithUsingsHelloLevelOne { - namespace Pocos + namespace FileWithUsingsHelloLevelTwo { public partial class Hello : AXSharp.Connector.IPlain { @@ -45,11 +39,8 @@ public Hello() } } } -} -namespace ExampleNamespace -{ - namespace Pocos + namespace ExampleNamespace { public partial class Hello : AXSharp.Connector.IPlain { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs index 9e56f3177..e3ddf1edb 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/generics.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace GenericsTests +namespace Pocos { - namespace Pocos + namespace GenericsTests { public partial class Extender : AXSharp.Connector.IPlain { @@ -12,10 +12,7 @@ public Extender() { } } - } - namespace Pocos - { public partial class SomeTypeToBeGeneric : AXSharp.Connector.IPlain { public SomeTypeToBeGeneric() @@ -25,11 +22,8 @@ public SomeTypeToBeGeneric() public Boolean Boolean { get; set; } public Int16 Cele { get; set; } } - } - namespace Pocos - { - public partial class Extendee2 : GenericsTests.Pocos.Extender, AXSharp.Connector.IPlain + public partial class Extendee2 : GenericsTests.Extender, AXSharp.Connector.IPlain { public Extendee2() : base() { @@ -38,7 +32,7 @@ public Extendee2() : base() [AXOpen.Data.AxoDataEntityAttribute] [Container(Layout.Stack)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Shared Header")] - public GenericsTests.Pocos.SomeTypeToBeGeneric SomeData { get; set; } = new GenericsTests.Pocos.SomeTypeToBeGeneric(); + public GenericsTests.SomeTypeToBeGeneric SomeData { get; set; } = new GenericsTests.SomeTypeToBeGeneric(); } } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs index 0b7fa1cdf..b6af387e5 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace makereadonce +namespace Pocos { - namespace Pocos + namespace makereadonce { public partial class MembersWithMakeReadOnce : AXSharp.Connector.IPlain { @@ -17,13 +17,10 @@ public MembersWithMakeReadOnce() public string someOtherMember { get; set; } = string.Empty; [ReadOnce()] - public makereadonce.Pocos.ComplexMember makeReadComplexMember { get; set; } = new makereadonce.Pocos.ComplexMember(); - public makereadonce.Pocos.ComplexMember someotherComplexMember { get; set; } = new makereadonce.Pocos.ComplexMember(); + public makereadonce.ComplexMember makeReadComplexMember { get; set; } = new makereadonce.ComplexMember(); + public makereadonce.ComplexMember someotherComplexMember { get; set; } = new makereadonce.ComplexMember(); } - } - namespace Pocos - { public partial class ComplexMember : AXSharp.Connector.IPlain { public ComplexMember() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs index accfa07d7..2317d6021 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace makereadonly +namespace Pocos { - namespace Pocos + namespace makereadonly { public partial class MembersWithMakeReadOnly : AXSharp.Connector.IPlain { @@ -17,13 +17,10 @@ public MembersWithMakeReadOnly() public string someOtherMember { get; set; } = string.Empty; [ReadOnly()] - public makereadonly.Pocos.ComplexMember makeReadComplexMember { get; set; } = new makereadonly.Pocos.ComplexMember(); - public makereadonly.Pocos.ComplexMember someotherComplexMember { get; set; } = new makereadonly.Pocos.ComplexMember(); + public makereadonly.ComplexMember makeReadComplexMember { get; set; } = new makereadonly.ComplexMember(); + public makereadonly.ComplexMember someotherComplexMember { get; set; } = new makereadonly.ComplexMember(); } - } - namespace Pocos - { public partial class ComplexMember : AXSharp.Connector.IPlain { public ComplexMember() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs index 5a02e1b13..0130d56ff 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Enums +namespace Pocos { - namespace Pocos + namespace Enums { public partial class ClassWithEnums : AXSharp.Connector.IPlain { @@ -16,11 +16,8 @@ public ClassWithEnums() public String NamedValuesColors { get; set; } } } -} -namespace misc -{ - namespace Pocos + namespace misc { public partial class VariousMembers : AXSharp.Connector.IPlain { @@ -28,13 +25,10 @@ public VariousMembers() { } - public misc.Pocos.SomeClass _SomeClass { get; set; } = new misc.Pocos.SomeClass(); - public misc.Pocos.Motor _Motor { get; set; } = new misc.Pocos.Motor(); + public misc.SomeClass _SomeClass { get; set; } = new misc.SomeClass(); + public misc.Motor _Motor { get; set; } = new misc.Motor(); } - } - namespace Pocos - { public partial class SomeClass : AXSharp.Connector.IPlain { public SomeClass() @@ -43,10 +37,7 @@ public SomeClass() public string SomeClassVariable { get; set; } = string.Empty; } - } - namespace Pocos - { public partial class Motor : AXSharp.Connector.IPlain { public Motor() @@ -55,42 +46,33 @@ public Motor() public Boolean isRunning { get; set; } } - } - namespace Pocos - { public partial class Vehicle : AXSharp.Connector.IPlain { public Vehicle() { } - public misc.Pocos.Motor m { get; set; } = new misc.Pocos.Motor(); + public misc.Motor m { get; set; } = new misc.Motor(); public Int16 displacement { get; set; } } } -} -namespace UnknownArraysShouldNotBeTraspiled -{ - namespace Pocos + namespace UnknownArraysShouldNotBeTraspiled { public partial class ClassWithArrays : AXSharp.Connector.IPlain { public ClassWithArrays() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(_complexKnown, () => new UnknownArraysShouldNotBeTraspiled.Pocos.Complex(), new[] { (0, 10) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(_complexKnown, () => new Pocos.UnknownArraysShouldNotBeTraspiled.Complex(), new[] { (0, 10) }); #pragma warning restore CS0612 } - public UnknownArraysShouldNotBeTraspiled.Pocos.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Pocos.Complex[11]; + public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Complex[11]; public Byte[] _primitive { get; set; } = new Byte[11]; } - } - namespace Pocos - { public partial class Complex : AXSharp.Connector.IPlain { public Complex() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs index 8a60e2631..ac9344f50 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/mixed_access.g.cs @@ -8,16 +8,13 @@ public partial class unitsTwinController { public Boolean MotorOn { get; set; } public Int16 MotorState { get; set; } - public global::Pocos.Motor Motor1 { get; set; } = new global::Pocos.Motor(); - public global::Pocos.Motor Motor2 { get; set; } = new global::Pocos.Motor(); - public global::Pocos.struct1 s1 { get; set; } = new global::Pocos.struct1(); - public global::Pocos.struct4 s4 { get; set; } = new global::Pocos.struct4(); - public global::Pocos.SpecificMotorA mot1 { get; set; } = new global::Pocos.SpecificMotorA(); + public Motor Motor1 { get; set; } = new Motor(); + public Motor Motor2 { get; set; } = new Motor(); + public struct1 s1 { get; set; } = new struct1(); + public struct4 s4 { get; set; } = new struct4(); + public SpecificMotorA mot1 { get; set; } = new SpecificMotorA(); } -} -namespace Pocos -{ public partial class Motor : AXSharp.Connector.IPlain { public Motor() @@ -26,46 +23,34 @@ public Motor() public Boolean Run { get; set; } } -} -namespace Pocos -{ public partial class struct1 : AXSharp.Connector.IPlain { public struct1() { } - public global::Pocos.struct2 s2 { get; set; } = new global::Pocos.struct2(); + public struct2 s2 { get; set; } = new struct2(); } -} -namespace Pocos -{ public partial class struct2 : AXSharp.Connector.IPlain { public struct2() { } - public global::Pocos.struct3 s3 { get; set; } = new global::Pocos.struct3(); + public struct3 s3 { get; set; } = new struct3(); } -} -namespace Pocos -{ public partial class struct3 : AXSharp.Connector.IPlain { public struct3() { } - public global::Pocos.struct4 s4 { get; set; } = new global::Pocos.struct4(); + public struct4 s4 { get; set; } = new struct4(); } -} -namespace Pocos -{ public partial class struct4 : AXSharp.Connector.IPlain { public struct4() @@ -74,10 +59,7 @@ public struct4() public Int16 s5 { get; set; } } -} -namespace Pocos -{ public partial class AbstractMotor : AXSharp.Connector.IPlain { public AbstractMotor() @@ -87,21 +69,15 @@ public AbstractMotor() public Boolean Run { get; set; } public Boolean ReverseDirection { get; set; } } -} -namespace Pocos -{ - public partial class GenericMotor : global::Pocos.AbstractMotor, AXSharp.Connector.IPlain + public partial class GenericMotor : AbstractMotor, AXSharp.Connector.IPlain { public GenericMotor() : base() { } } -} -namespace Pocos -{ - public partial class SpecificMotorA : global::Pocos.GenericMotor, AXSharp.Connector.IPlain + public partial class SpecificMotorA : GenericMotor, AXSharp.Connector.IPlain { public SpecificMotorA() : base() { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs index da1480552..e23d372b9 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/program.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs index 61341c517..22248e832 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace RefToSimple +namespace Pocos { - namespace Pocos + namespace RefToSimple { public partial class ref_to_simple : AXSharp.Connector.IPlain { @@ -12,10 +12,7 @@ public ref_to_simple() { } } - } - namespace Pocos - { public partial class referenced : AXSharp.Connector.IPlain { public referenced() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs index 1a44a5d90..3cf279ae8 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace sampleNamespace +namespace Pocos { - namespace Pocos + namespace sampleNamespace { public partial class simple_empty_class_within_namespace : AXSharp.Connector.IPlain { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs index c8379bf3c..0c0b4d7c5 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/struct_simple.g.cs @@ -12,17 +12,14 @@ public Motor() public Boolean isRunning { get; set; } } -} -namespace Pocos -{ public partial class Vehicle : AXSharp.Connector.IPlain { public Vehicle() { } - public global::Pocos.Motor m { get; set; } = new global::Pocos.Motor(); + public Motor m { get; set; } = new Motor(); public Int16 displacement { get; set; } } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs index 686775c2c..a5e6936b1 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace NamedValuesNamespace +namespace Pocos { - namespace Pocos + namespace NamedValuesNamespace { public partial class using_type_named_values : AXSharp.Connector.IPlain { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs index 7d364e2fa..14b4df591 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Simatic.Ax.StateFramework +namespace Pocos { - namespace Pocos + namespace Simatic.Ax.StateFramework { public partial class using_type_named_values : AXSharp.Connector.IPlain { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs index 5ba94fd35..14b709141 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_with_enum.g.cs @@ -2,16 +2,16 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Simatic.Ax.StateFramework +namespace Pocos { - public partial interface IGuard + namespace Simatic.Ax.StateFramework { + public partial interface IGuard + { + } } -} -namespace Simatic.Ax.StateFramework -{ - namespace Pocos + namespace Simatic.Ax.StateFramework { public partial class CompareGuardLint : AXSharp.Connector.IPlain, IGuard { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs index 945a50ce2..2c9aba9fb 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_name_attributes.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace TypeWithNameAttributes +namespace Pocos { - namespace Pocos + namespace TypeWithNameAttributes { public partial class Motor : AXSharp.Connector.IPlain { @@ -14,23 +14,17 @@ public Motor() public Boolean isRunning { get; set; } } - } - namespace Pocos - { public partial class Vehicle : AXSharp.Connector.IPlain { public Vehicle() { } - public TypeWithNameAttributes.Pocos.Motor m { get; set; } = new TypeWithNameAttributes.Pocos.Motor(); + public TypeWithNameAttributes.Motor m { get; set; } = new TypeWithNameAttributes.Motor(); public Int16 displacement { get; set; } } - } - namespace Pocos - { public partial class NoAccessModifierClass : AXSharp.Connector.IPlain { public NoAccessModifierClass() diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs index 22cf8a9e7..85e0d82b0 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/types_with_property_attributes.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace TypesWithPropertyAttributes +namespace Pocos { - namespace Pocos + namespace TypesWithPropertyAttributes { [AXSharp.Connector.AddedPropertiesAttribute("Description", "Some added property name value")] public partial class SomeAddedProperties : AXSharp.Connector.IPlain diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj index 480959d2e..d219f2ad8 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/units.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs index 762b4ddad..842fa3b13 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/configuration.g.cs @@ -6,7 +6,7 @@ namespace Pocos { public partial class appTwinController { - public lib1.Pocos.MyClass lib1_MyClass { get; set; } = new lib1.Pocos.MyClass(); - public lib2.Pocos.MyClass lib2_MyClass { get; set; } = new lib2.Pocos.MyClass(); + public lib1.MyClass lib1_MyClass { get; set; } = new lib1.MyClass(); + public lib2.MyClass lib2_MyClass { get; set; } = new lib2.MyClass(); } } \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs index da1480552..e23d372b9 100644 --- a/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs +++ b/src/AXSharp.compiler/tests/integration/expected/app/ix/.g/POCO/program.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/TestConnector.cs b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/TestConnector.cs index f496ac131..c26442400 100644 --- a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/TestConnector.cs +++ b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/TestConnector.cs @@ -11,10 +11,18 @@ namespace AXSharp.Connector.S71500.WebAPITests; public static class TestConnector { private static string TargetIp { get; } = Environment.GetEnvironmentVariable("AXTARGET") ?? "10.222.6.1"; + private static string UserName { get; } = Environment.GetEnvironmentVariable("AX_USERNAME") ?? "adm"; + private static string Password { get; } = Environment.GetEnvironmentVariable("AX_TARGET_PWD"); + + + public static WebApiConnector TestApiConnector + { + get + { + return SecurePlc.Connector as WebApiConnector; + } + } - public static WebApiConnector TestApiConnector { get; } - = new WebApiConnector(TargetIp, Environment.GetEnvironmentVariable("AX_USER_NAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"),CertificateValidation, true).BuildAndStart() as WebApiConnector; - private static string CertificatePath = "certs\\Communication.cer"; static string GetCertPath() @@ -29,10 +37,28 @@ private static bool CertificateValidation(HttpRequestMessage requestMessage, X50 { return certificate.Thumbprint == Certificate.Thumbprint; } - - public static ax_test_projectTwinController SecurePlc { get; } - = new(ConnectorAdapterBuilder.Build() - .CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USER_NAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true)); - - + + private static ax_test_projectTwinController securePlc; + private static object mutex = new object(); + public static ax_test_projectTwinController SecurePlc + { + get + { + lock (mutex) + { + if (securePlc == null) + { + securePlc = new(ConnectorAdapterBuilder.Build() + .CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USERNAME"), + Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true)); + + SecurePlc.Connector.BuildAndStart(); + } + return securePlc; + } + } + } + + + } \ 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 a8e79e7df..f7e4bf291 100644 --- a/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json +++ b/src/AXSharp.connectors/tests/ax-test-project/apax-lock.json @@ -41,9 +41,9 @@ }, "@ax/sld": { "name": "@ax/sld", - "version": "3.0.6", - "integrity": "sha512-j90GJh1jMIpvB521EIxvTq6rhr8OO+6qqwsXn2Of7GxQrzwWi+NEXe9ss/ccFAKL0I7aEGD+SIW8jVHUgMAvow==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.6.tgz", + "version": "3.0.8", + "integrity": "sha512-4YSQf0eXLTGN0LmBBKFYUyhuhZAxH11W+kZfHAjXy5cIkJhhf5g50d/GDZHj5q5hcY/GEIerKLL+B3RUBejHgg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.8.tgz", "cpu": [ "x64" ], @@ -617,6 +617,13 @@ ], "dependencies": {} }, + "@ax/st-docs": { + "name": "@ax/st-docs", + "version": "7.1.87", + "integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz", + "dependencies": {} + }, "@ax/system-strings": { "name": "@ax/system-strings", "version": "7.1.47", @@ -679,13 +686,6 @@ ], "dependencies": {} }, - "@ax/st-docs": { - "name": "@ax/st-docs", - "version": "7.1.87", - "integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz", - "dependencies": {} - }, "@ax/system-math": { "name": "@ax/system-math", "version": "7.1.47", diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs index 7fd2149b5..08f96aeec 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/configuration.g.cs @@ -1,35 +1,35 @@ using System; using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -using MonsterData.Pocos; +using Pocos.MonsterData; namespace Pocos { public partial class ix_integration_plcTwinController { - public global::Pocos.all_primitives all_primitives { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.weather weather { get; set; } = new global::Pocos.weather(); - public global::Pocos.weathers weathers { get; set; } = new global::Pocos.weathers(); + public all_primitives all_primitives { get; set; } = new all_primitives(); + public weather weather { get; set; } = new weather(); + public weathers weathers { get; set; } = new weathers(); [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a stack pannel and grouped in group box")] - public Layouts.Stacked.Pocos.weather weather_stacked { get; set; } = new Layouts.Stacked.Pocos.weather(); + public Layouts.Stacked.weather weather_stacked { get; set; } = new Layouts.Stacked.weather(); [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a wrap pannel and grouped in group box")] - public Layouts.Wrapped.Pocos.weather weather_wrapped { get; set; } = new Layouts.Wrapped.Pocos.weather(); + public Layouts.Wrapped.weather weather_wrapped { get; set; } = new Layouts.Wrapped.weather(); [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather in a tabs and grouped in group box")] - public Layouts.Tabbed.Pocos.weather weather_tabbed { get; set; } = new Layouts.Tabbed.Pocos.weather(); + public Layouts.Tabbed.weather weather_tabbed { get; set; } = new Layouts.Tabbed.weather(); [ReadOnce()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read once")] - public Layouts.Stacked.Pocos.weather weather_readOnce { get; set; } = new Layouts.Stacked.Pocos.weather(); + public Layouts.Stacked.weather weather_readOnce { get; set; } = new Layouts.Stacked.weather(); [ReadOnly()] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Weather structure set to read only")] - public Layouts.Stacked.Pocos.weather weather_readOnly { get; set; } = new Layouts.Stacked.Pocos.weather(); - public global::Pocos.example test_example { get; set; } = new global::Pocos.example(); - public MeasurementExample.Pocos.Measurements measurements { get; set; } = new MeasurementExample.Pocos.Measurements(); - public global::Pocos.ixcomponent ixcomponent { get; set; } = new global::Pocos.ixcomponent(); - public MonsterData.Pocos.Monster monster { get; set; } = new MonsterData.Pocos.Monster(); + public Layouts.Stacked.weather weather_readOnly { get; set; } = new Layouts.Stacked.weather(); + public example test_example { get; set; } = new example(); + public MeasurementExample.Measurements measurements { get; set; } = new MeasurementExample.Measurements(); + public ixcomponent ixcomponent { get; set; } = new ixcomponent(); + public MonsterData.Monster monster { get; set; } = new MonsterData.Monster(); } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs index 46178f896..7811defa0 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/example.g.cs @@ -11,43 +11,43 @@ public example() } [Container(Layout.Stack)] - public global::Pocos.test_primitive primitives_stack { get; set; } = new global::Pocos.test_primitive(); + public test_primitive primitives_stack { get; set; } = new test_primitive(); [Container(Layout.Wrap)] - public global::Pocos.test_primitive primitives_wrap { get; set; } = new global::Pocos.test_primitive(); + public test_primitive primitives_wrap { get; set; } = new test_primitive(); [Container(Layout.Tabs)] - public global::Pocos.test_primitive primitives_tabs { get; set; } = new global::Pocos.test_primitive(); + public test_primitive primitives_tabs { get; set; } = new test_primitive(); [Container(Layout.UniformGrid)] - public global::Pocos.test_primitive primitives_uniform { get; set; } = new global::Pocos.test_primitive(); + public test_primitive primitives_uniform { get; set; } = new test_primitive(); [Container(Layout.Stack)] [Group(GroupLayout.GroupBox)] - public global::Pocos.test_primitive test_groupbox { get; set; } = new global::Pocos.test_primitive(); + public test_primitive test_groupbox { get; set; } = new test_primitive(); [Container(Layout.Stack)] [Group(GroupLayout.Border)] - public global::Pocos.test_primitive test_border { get; set; } = new global::Pocos.test_primitive(); + public test_primitive test_border { get; set; } = new test_primitive(); [Container(Layout.Tabs)] [Group(GroupLayout.GroupBox)] - public global::Pocos.groupbox testgroupbox { get; set; } = new global::Pocos.groupbox(); - public global::Pocos.border testborder { get; set; } = new global::Pocos.border(); - public global::Pocos.ixcomponent ixcomponent_instance { get; set; } = new global::Pocos.ixcomponent(); - public MySecondNamespace.Pocos.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.Pocos.ixcomponent(); - public ThirdNamespace.Pocos.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.Pocos.ixcomponent(); + public groupbox testgroupbox { get; set; } = new groupbox(); + public border testborder { get; set; } = new border(); + public ixcomponent ixcomponent_instance { get; set; } = new ixcomponent(); + public MySecondNamespace.ixcomponent ixcomponent_instance2 { get; set; } = new MySecondNamespace.ixcomponent(); + public ThirdNamespace.ixcomponent ixcomponent_instance3 { get; set; } = new ThirdNamespace.ixcomponent(); [Container(Layout.Stack)] - public global::Pocos.compositeLayout compositeStack { get; set; } = new global::Pocos.compositeLayout(); + public compositeLayout compositeStack { get; set; } = new compositeLayout(); [Container(Layout.Wrap)] - public global::Pocos.compositeLayout compositeWrap { get; set; } = new global::Pocos.compositeLayout(); + public compositeLayout compositeWrap { get; set; } = new compositeLayout(); [Container(Layout.UniformGrid)] - public global::Pocos.compositeLayout compositeUniform { get; set; } = new global::Pocos.compositeLayout(); + public compositeLayout compositeUniform { get; set; } = new compositeLayout(); [Container(Layout.Tabs)] - public global::Pocos.compositeLayout compositeTabs { get; set; } = new global::Pocos.compositeLayout(); + public compositeLayout compositeTabs { get; set; } = new compositeLayout(); } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs index e57b1d6b7..b35ab6dfc 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs @@ -19,11 +19,8 @@ public ixcomponent() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")] public Boolean my_bool { get; set; } } -} -namespace MySecondNamespace -{ - namespace Pocos + namespace MySecondNamespace { public partial class ixcomponent : AXSharp.Connector.IPlain { @@ -41,11 +38,8 @@ public ixcomponent() public Boolean my_bool { get; set; } } } -} -namespace ThirdNamespace -{ - namespace Pocos + namespace ThirdNamespace { public partial class ixcomponent : AXSharp.Connector.IPlain { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs index cb5c3804d..3b290e928 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs @@ -2,9 +2,9 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace MeasurementExample +namespace Pocos { - namespace Pocos + namespace MeasurementExample { public partial class Measurement : AXSharp.Connector.IPlain { @@ -25,10 +25,7 @@ public Measurement() [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measurement Result")] public Int16 Result { get; set; } } - } - namespace Pocos - { public partial class Measurements : AXSharp.Connector.IPlain { public Measurements() @@ -38,22 +35,22 @@ public Measurements() [Container(Layout.Stack)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Stack panel")] - public MeasurementExample.Pocos.Measurement measurement_stack { get; set; } = new MeasurementExample.Pocos.Measurement(); + public MeasurementExample.Measurement measurement_stack { get; set; } = new MeasurementExample.Measurement(); [Container(Layout.Wrap)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Wrap panel")] - public MeasurementExample.Pocos.Measurement measurement_wrap { get; set; } = new MeasurementExample.Pocos.Measurement(); + public MeasurementExample.Measurement measurement_wrap { get; set; } = new MeasurementExample.Measurement(); [Container(Layout.UniformGrid)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Grid")] - public MeasurementExample.Pocos.Measurement measurement_grid { get; set; } = new MeasurementExample.Pocos.Measurement(); + public MeasurementExample.Measurement measurement_grid { get; set; } = new MeasurementExample.Measurement(); [Container(Layout.Tabs)] [Group(GroupLayout.GroupBox)] [AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")] - public MeasurementExample.Pocos.Measurement measurement_tabs { get; set; } = new MeasurementExample.Pocos.Measurement(); + public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement(); } } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs index d898cbee0..f3e320827 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs @@ -2,16 +2,16 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace MonsterData +namespace Pocos { - namespace Pocos + namespace MonsterData { public partial class MonsterBase : AXSharp.Connector.IPlain { public MonsterBase() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new MonsterData.Pocos.DriveBase(), new[] { (0, 3) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new Pocos.MonsterData.DriveBase(), new[] { (0, 3) }); #pragma warning restore CS0612 #pragma warning disable CS0612 AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfIxComponent, () => new global::Pocos.ixcomponent(), new[] { (0, 3) }); @@ -19,25 +19,19 @@ public MonsterBase() } public Byte[] ArrayOfBytes { get; set; } = new Byte[4]; - public MonsterData.Pocos.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.Pocos.DriveBase[4]; - public global::Pocos.ixcomponent[] ArrayOfIxComponent { get; set; } = new global::Pocos.ixcomponent[4]; + public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4]; + public ixcomponent[] ArrayOfIxComponent { get; set; } = new ixcomponent[4]; } - } - namespace Pocos - { - public partial class Monster : MonsterData.Pocos.MonsterBase, AXSharp.Connector.IPlain + public partial class Monster : MonsterData.MonsterBase, AXSharp.Connector.IPlain { public Monster() : base() { } - public MonsterData.Pocos.DriveBase DriveA { get; set; } = new MonsterData.Pocos.DriveBase(); + public MonsterData.DriveBase DriveA { get; set; } = new MonsterData.DriveBase(); } - } - namespace Pocos - { public partial class DriveBase : AXSharp.Connector.IPlain { public DriveBase() diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs index da1480552..e23d372b9 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/program.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs index ceaa0cf9f..9f5f7a0b6 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/stacked/weather.g.cs @@ -2,11 +2,11 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Layouts.Stacked +namespace Pocos { - namespace Pocos + namespace Layouts.Stacked { - public partial class weather : global::Pocos.weatherBase, AXSharp.Connector.IPlain + public partial class weather : weatherBase, AXSharp.Connector.IPlain { public weather() : base() { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs index 4c963ac7e..fd02cdd14 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/tabbed/weather.g.cs @@ -2,11 +2,11 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Layouts.Tabbed +namespace Pocos { - namespace Pocos + namespace Layouts.Tabbed { - public partial class weather : global::Pocos.weatherBase, AXSharp.Connector.IPlain + public partial class weather : weatherBase, AXSharp.Connector.IPlain { public weather() : base() { diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs index da1480552..e23d372b9 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/enumStationStatus.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs index 8c60358ed..8c3db9b6b 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/weather.g.cs @@ -10,17 +10,14 @@ public weather() { } - public global::Pocos.GeoLocation GeoLocation { get; set; } = new global::Pocos.GeoLocation(); + public GeoLocation GeoLocation { get; set; } = new GeoLocation(); public Single Temperature { get; set; } public Single Humidity { get; set; } public string Location { get; set; } = string.Empty; public Single ChillFactor { get; set; } public global::Feeling Feeling { get; set; } } -} -namespace Pocos -{ public partial class weathers : AXSharp.Connector.IPlain { public weathers() @@ -30,6 +27,6 @@ public weathers() #pragma warning restore CS0612 } - public global::Pocos.weatherBase[] i { get; set; } = new global::Pocos.weatherBase[51]; + public weatherBase[] i { get; set; } = new weatherBase[51]; } } \ No newline at end of file diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs index 8e5eba84d..0236c8dd1 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/wrapped/weather.g.cs @@ -2,11 +2,11 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace Layouts.Wrapped +namespace Pocos { - namespace Pocos + namespace Layouts.Wrapped { - public partial class weather : global::Pocos.weatherBase, AXSharp.Connector.IPlain + public partial class weather : weatherBase, AXSharp.Connector.IPlain { public weather() : base() { diff --git a/src/tests.integrations/integrated/src/ax/apax-lock.json b/src/tests.integrations/integrated/src/ax/apax-lock.json index bc167ce5a..dba2d3644 100644 --- a/src/tests.integrations/integrated/src/ax/apax-lock.json +++ b/src/tests.integrations/integrated/src/ax/apax-lock.json @@ -41,9 +41,9 @@ }, "@ax/sld": { "name": "@ax/sld", - "version": "3.0.6", - "integrity": "sha512-j90GJh1jMIpvB521EIxvTq6rhr8OO+6qqwsXn2Of7GxQrzwWi+NEXe9ss/ccFAKL0I7aEGD+SIW8jVHUgMAvow==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.6.tgz", + "version": "3.0.8", + "integrity": "sha512-4YSQf0eXLTGN0LmBBKFYUyhuhZAxH11W+kZfHAjXy5cIkJhhf5g50d/GDZHj5q5hcY/GEIerKLL+B3RUBejHgg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.8.tgz", "cpu": [ "x64" ], @@ -617,6 +617,13 @@ ], "dependencies": {} }, + "@ax/st-docs": { + "name": "@ax/st-docs", + "version": "7.1.87", + "integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz", + "dependencies": {} + }, "@ax/system-strings": { "name": "@ax/system-strings", "version": "7.1.47", @@ -679,13 +686,6 @@ ], "dependencies": {} }, - "@ax/st-docs": { - "name": "@ax/st-docs", - "version": "7.1.87", - "integrity": "sha512-J5BthD1BR0fu1dkqQFyW3yOByC14TxhG+b/NUl2zXkSqjnsAQQbNtdheZquZ225x0qkJAR8wRrBx9Kr3QdYg8w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.1.87.tgz", - "dependencies": {} - }, "@ax/system-math": { "name": "@ax/system-math", "version": "7.1.47", diff --git a/src/tests.integrations/integrated/src/integrated.app/Pages/OnlineShadowPlain/OnlineShadowPlain.razor b/src/tests.integrations/integrated/src/integrated.app/Pages/OnlineShadowPlain/OnlineShadowPlain.razor index c61bff939..d356cdd28 100644 --- a/src/tests.integrations/integrated/src/integrated.app/Pages/OnlineShadowPlain/OnlineShadowPlain.razor +++ b/src/tests.integrations/integrated/src/integrated.app/Pages/OnlineShadowPlain/OnlineShadowPlain.razor @@ -38,26 +38,26 @@ private void OnlinerToPlain() { - var plain = Entry.Plc.RealMonster.OnlineToPlain(); + var plain = Entry.Plc.RealMonster.OnlineToPlain(); Console.WriteLine(plain); } private void PlainToOnline() { - var plainMonster = new RealMonsterData.Pocos.RealMonster(); + var plainMonster = new Pocos.RealMonsterData.RealMonster(); plainMonster.Description = "This comes from plain to online"; Entry.Plc.RealMonster.PlainToOnline(plainMonster); } private void ShadowToPlain() { - var plain = Entry.Plc.RealMonster.ShadowToPlain(); + var plain = Entry.Plc.RealMonster.ShadowToPlain(); Console.WriteLine(plain); } private void PlainToShadow() { - var plainMonster = new RealMonsterData.Pocos.RealMonster(); + var plainMonster = new Pocos.RealMonsterData.RealMonster(); plainMonster.Description = "This comes from plain to shadow"; Entry.Plc.RealMonster.PlainToShadow(plainMonster); } 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 7375a042b..612510bbc 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 @@ -48,9 +48,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - MonsterData.Pocos.MonsterBase plain = new MonsterData.Pocos.MonsterBase(); + Pocos.MonsterData.MonsterBase plain = new Pocos.MonsterData.MonsterBase(); await this.ReadAsync(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; @@ -67,9 +67,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - MonsterData.Pocos.MonsterBase plain = new MonsterData.Pocos.MonsterBase(); + Pocos.MonsterData.MonsterBase plain = new Pocos.MonsterData.MonsterBase(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; plain.ArrayOfBytes = ArrayOfBytes.Select(p => p.LastValue).ToArray(); @@ -85,7 +85,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(MonsterData.Pocos.MonsterBase plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.MonsterData.MonsterBase plain) { plain.Description = Description.LastValue; plain.Id = Id.LastValue; @@ -105,7 +105,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(MonsterData.Pocos.MonsterBase plain) + public async Task> PlainToOnlineAsync(Pocos.MonsterData.MonsterBase plain) { #pragma warning disable CS0612 Description.LethargicWrite(plain.Description); @@ -132,7 +132,7 @@ public async Task> PlainToOnlineAsync(MonsterData.Po [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(MonsterData.Pocos.MonsterBase plain) + public async Task _PlainToOnlineNoacAsync(Pocos.MonsterData.MonsterBase plain) { #pragma warning disable CS0612 Description.LethargicWrite(plain.Description); @@ -161,9 +161,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - MonsterData.Pocos.MonsterBase plain = new MonsterData.Pocos.MonsterBase(); + Pocos.MonsterData.MonsterBase plain = new Pocos.MonsterData.MonsterBase(); plain.Description = Description.Shadow; plain.Id = Id.Shadow; plain.ArrayOfBytes = ArrayOfBytes.Select(p => p.Shadow).ToArray(); @@ -173,7 +173,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(MonsterData.Pocos.MonsterBase plain) + protected async Task ShadowToPlainAsync(Pocos.MonsterData.MonsterBase plain) { plain.Description = Description.Shadow; plain.Id = Id.Shadow; @@ -189,7 +189,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(MonsterData.Pocos.MonsterBase plain) + public async Task> PlainToShadowAsync(Pocos.MonsterData.MonsterBase plain) { Description.Shadow = plain.Description; Id.Shadow = plain.Id; @@ -212,7 +212,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(MonsterData.Pocos.MonsterBase plain, MonsterData.Pocos.MonsterBase latest = null) + public async Task DetectsAnyChangeAsync(Pocos.MonsterData.MonsterBase plain, Pocos.MonsterData.MonsterBase latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -249,9 +249,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public MonsterData.Pocos.MonsterBase CreateEmptyPoco() + public Pocos.MonsterData.MonsterBase CreateEmptyPoco() { - return new MonsterData.Pocos.MonsterBase(); + return new Pocos.MonsterData.MonsterBase(); } private IList Children { get; } = new List(); @@ -349,9 +349,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - MonsterData.Pocos.Monster plain = new MonsterData.Pocos.Monster(); + Pocos.MonsterData.Monster plain = new Pocos.MonsterData.Monster(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -364,9 +364,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - MonsterData.Pocos.Monster plain = new MonsterData.Pocos.Monster(); + Pocos.MonsterData.Monster plain = new Pocos.MonsterData.Monster(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -378,7 +378,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(MonsterData.Pocos.Monster plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.MonsterData.Monster plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -394,7 +394,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(MonsterData.Pocos.Monster plain) + public async Task> PlainToOnlineAsync(Pocos.MonsterData.Monster plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -405,7 +405,7 @@ public async Task> PlainToOnlineAsync(MonsterData.Po [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(MonsterData.Pocos.Monster plain) + public async Task _PlainToOnlineNoacAsync(Pocos.MonsterData.Monster plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -418,15 +418,15 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - MonsterData.Pocos.Monster plain = new MonsterData.Pocos.Monster(); + Pocos.MonsterData.Monster plain = new Pocos.MonsterData.Monster(); await base.ShadowToPlainAsync(plain); plain.DriveA = await DriveA.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(MonsterData.Pocos.Monster plain) + protected async Task ShadowToPlainAsync(Pocos.MonsterData.Monster plain) { await base.ShadowToPlainAsync(plain); plain.DriveA = await DriveA.ShadowToPlainAsync(); @@ -438,7 +438,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(MonsterData.Pocos.Monster plain) + public async Task> PlainToShadowAsync(Pocos.MonsterData.Monster plain) { await base.PlainToShadowAsync(plain); await this.DriveA.PlainToShadowAsync(plain.DriveA); @@ -455,7 +455,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(MonsterData.Pocos.Monster plain, MonsterData.Pocos.Monster latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.MonsterData.Monster plain, Pocos.MonsterData.Monster latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -476,9 +476,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new MonsterData.Pocos.Monster CreateEmptyPoco() + public new Pocos.MonsterData.Monster CreateEmptyPoco() { - return new MonsterData.Pocos.Monster(); + return new Pocos.MonsterData.Monster(); } } @@ -513,9 +513,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - MonsterData.Pocos.DriveBase plain = new MonsterData.Pocos.DriveBase(); + Pocos.MonsterData.DriveBase plain = new Pocos.MonsterData.DriveBase(); await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -526,9 +526,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - MonsterData.Pocos.DriveBase plain = new MonsterData.Pocos.DriveBase(); + Pocos.MonsterData.DriveBase plain = new Pocos.MonsterData.DriveBase(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -538,7 +538,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(MonsterData.Pocos.DriveBase plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.MonsterData.DriveBase plain) { plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -552,7 +552,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(MonsterData.Pocos.DriveBase plain) + public async Task> PlainToOnlineAsync(Pocos.MonsterData.DriveBase plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -571,7 +571,7 @@ public async Task> PlainToOnlineAsync(MonsterData.Po [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(MonsterData.Pocos.DriveBase plain) + public async Task _PlainToOnlineNoacAsync(Pocos.MonsterData.DriveBase plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -592,9 +592,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - MonsterData.Pocos.DriveBase plain = new MonsterData.Pocos.DriveBase(); + Pocos.MonsterData.DriveBase plain = new Pocos.MonsterData.DriveBase(); plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; plain.Acc = Acc.Shadow; @@ -602,7 +602,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(MonsterData.Pocos.DriveBase plain) + protected async Task ShadowToPlainAsync(Pocos.MonsterData.DriveBase plain) { plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; @@ -616,7 +616,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(MonsterData.Pocos.DriveBase plain) + public async Task> PlainToShadowAsync(Pocos.MonsterData.DriveBase plain) { Position.Shadow = plain.Position; Velo.Shadow = plain.Velo; @@ -635,7 +635,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(MonsterData.Pocos.DriveBase plain, MonsterData.Pocos.DriveBase latest = null) + public async Task DetectsAnyChangeAsync(Pocos.MonsterData.DriveBase plain, Pocos.MonsterData.DriveBase latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -660,9 +660,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public MonsterData.Pocos.DriveBase CreateEmptyPoco() + public Pocos.MonsterData.DriveBase CreateEmptyPoco() { - return new MonsterData.Pocos.DriveBase(); + return new Pocos.MonsterData.DriveBase(); } private IList Children { get; } = new List(); 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 df5765669..3a75dffec 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 @@ -46,9 +46,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.RealMonsterBase plain = new RealMonsterData.Pocos.RealMonsterBase(); + Pocos.RealMonsterData.RealMonsterBase plain = new Pocos.RealMonsterData.RealMonsterBase(); await this.ReadAsync(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; @@ -64,9 +64,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.RealMonsterBase plain = new RealMonsterData.Pocos.RealMonsterBase(); + Pocos.RealMonsterData.RealMonsterBase plain = new Pocos.RealMonsterData.RealMonsterBase(); plain.Description = Description.LastValue; plain.Id = Id.LastValue; plain.TestDate = TestDate.LastValue; @@ -81,7 +81,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.RealMonsterBase plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.RealMonsterBase plain) { plain.Description = Description.LastValue; plain.Id = Id.LastValue; @@ -100,7 +100,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.RealMonsterBase plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.RealMonsterBase plain) { #pragma warning disable CS0612 Description.LethargicWrite(plain.Description); @@ -130,7 +130,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.RealMonsterBase plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.RealMonsterBase plain) { #pragma warning disable CS0612 Description.LethargicWrite(plain.Description); @@ -162,9 +162,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.RealMonsterBase plain = new RealMonsterData.Pocos.RealMonsterBase(); + Pocos.RealMonsterData.RealMonsterBase plain = new Pocos.RealMonsterData.RealMonsterBase(); plain.Description = Description.Shadow; plain.Id = Id.Shadow; plain.TestDate = TestDate.Shadow; @@ -175,7 +175,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.RealMonsterBase plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.RealMonsterBase plain) { plain.Description = Description.Shadow; plain.Id = Id.Shadow; @@ -192,7 +192,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.RealMonsterBase plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.RealMonsterBase plain) { Description.Shadow = plain.Description; Id.Shadow = plain.Id; @@ -216,7 +216,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.RealMonsterBase plain, RealMonsterData.Pocos.RealMonsterBase latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.RealMonsterBase plain, Pocos.RealMonsterData.RealMonsterBase latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -255,9 +255,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RealMonsterData.Pocos.RealMonsterBase CreateEmptyPoco() + public Pocos.RealMonsterData.RealMonsterBase CreateEmptyPoco() { - return new RealMonsterData.Pocos.RealMonsterBase(); + return new Pocos.RealMonsterData.RealMonsterBase(); } private IList Children { get; } = new List(); @@ -355,9 +355,9 @@ public async override Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public new async Task OnlineToPlainAsync() + public new async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.RealMonster plain = new RealMonsterData.Pocos.RealMonster(); + Pocos.RealMonsterData.RealMonster plain = new Pocos.RealMonsterData.RealMonster(); await this.ReadAsync(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -370,9 +370,9 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new async Task _OnlineToPlainNoacAsync() + public new async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.RealMonster plain = new RealMonsterData.Pocos.RealMonster(); + Pocos.RealMonsterData.RealMonster plain = new Pocos.RealMonsterData.RealMonster(); #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); #pragma warning restore CS0612 @@ -384,7 +384,7 @@ public async override Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.RealMonster plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.RealMonster plain) { #pragma warning disable CS0612 await base._OnlineToPlainNoacAsync(plain); @@ -400,7 +400,7 @@ public async override Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.RealMonster plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.RealMonster plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -411,7 +411,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.RealMonster plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.RealMonster plain) { await base._PlainToOnlineNoacAsync(plain); #pragma warning disable CS0612 @@ -424,15 +424,15 @@ public async override Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public new async Task ShadowToPlainAsync() + public new async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.RealMonster plain = new RealMonsterData.Pocos.RealMonster(); + Pocos.RealMonsterData.RealMonster plain = new Pocos.RealMonsterData.RealMonster(); await base.ShadowToPlainAsync(plain); plain.DriveA = await DriveA.ShadowToPlainAsync(); return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.RealMonster plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.RealMonster plain) { await base.ShadowToPlainAsync(plain); plain.DriveA = await DriveA.ShadowToPlainAsync(); @@ -444,7 +444,7 @@ public async override Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.RealMonster plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.RealMonster plain) { await base.PlainToShadowAsync(plain); await this.DriveA.PlainToShadowAsync(plain.DriveA); @@ -461,7 +461,7 @@ public async override Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public new async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.RealMonster plain, RealMonsterData.Pocos.RealMonster latest = null) + public new async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.RealMonster plain, Pocos.RealMonsterData.RealMonster latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -482,9 +482,9 @@ public async override Task AnyChangeAsync(T plain) this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public new RealMonsterData.Pocos.RealMonster CreateEmptyPoco() + public new Pocos.RealMonsterData.RealMonster CreateEmptyPoco() { - return new RealMonsterData.Pocos.RealMonster(); + return new Pocos.RealMonsterData.RealMonster(); } } @@ -521,9 +521,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.DriveBaseNested plain = new RealMonsterData.Pocos.DriveBaseNested(); + Pocos.RealMonsterData.DriveBaseNested plain = new Pocos.RealMonsterData.DriveBaseNested(); await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -537,9 +537,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.DriveBaseNested plain = new RealMonsterData.Pocos.DriveBaseNested(); + Pocos.RealMonsterData.DriveBaseNested plain = new Pocos.RealMonsterData.DriveBaseNested(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -552,7 +552,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.DriveBaseNested plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.DriveBaseNested plain) { plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -569,7 +569,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.DriveBaseNested plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.DriveBaseNested plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -591,7 +591,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.DriveBaseNested plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.DriveBaseNested plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -615,9 +615,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.DriveBaseNested plain = new RealMonsterData.Pocos.DriveBaseNested(); + Pocos.RealMonsterData.DriveBaseNested plain = new Pocos.RealMonsterData.DriveBaseNested(); plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; plain.Acc = Acc.Shadow; @@ -626,7 +626,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.DriveBaseNested plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.DriveBaseNested plain) { plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; @@ -641,7 +641,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.DriveBaseNested plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.DriveBaseNested plain) { Position.Shadow = plain.Position; Velo.Shadow = plain.Velo; @@ -661,7 +661,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.DriveBaseNested plain, RealMonsterData.Pocos.DriveBaseNested latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.DriveBaseNested plain, Pocos.RealMonsterData.DriveBaseNested latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -688,9 +688,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RealMonsterData.Pocos.DriveBaseNested CreateEmptyPoco() + public Pocos.RealMonsterData.DriveBaseNested CreateEmptyPoco() { - return new RealMonsterData.Pocos.DriveBaseNested(); + return new Pocos.RealMonsterData.DriveBaseNested(); } private IList Children { get; } = new List(); @@ -802,9 +802,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.NestedLevelOne plain = new RealMonsterData.Pocos.NestedLevelOne(); + Pocos.RealMonsterData.NestedLevelOne plain = new Pocos.RealMonsterData.NestedLevelOne(); await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -818,9 +818,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.NestedLevelOne plain = new RealMonsterData.Pocos.NestedLevelOne(); + Pocos.RealMonsterData.NestedLevelOne plain = new Pocos.RealMonsterData.NestedLevelOne(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -833,7 +833,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.NestedLevelOne plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.NestedLevelOne plain) { plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -850,7 +850,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.NestedLevelOne plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.NestedLevelOne plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -872,7 +872,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.NestedLevelOne plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.NestedLevelOne plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -896,9 +896,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.NestedLevelOne plain = new RealMonsterData.Pocos.NestedLevelOne(); + Pocos.RealMonsterData.NestedLevelOne plain = new Pocos.RealMonsterData.NestedLevelOne(); plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; plain.Acc = Acc.Shadow; @@ -907,7 +907,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.NestedLevelOne plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.NestedLevelOne plain) { plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; @@ -922,7 +922,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.NestedLevelOne plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.NestedLevelOne plain) { Position.Shadow = plain.Position; Velo.Shadow = plain.Velo; @@ -942,7 +942,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.NestedLevelOne plain, RealMonsterData.Pocos.NestedLevelOne latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.NestedLevelOne plain, Pocos.RealMonsterData.NestedLevelOne latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -969,9 +969,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RealMonsterData.Pocos.NestedLevelOne CreateEmptyPoco() + public Pocos.RealMonsterData.NestedLevelOne CreateEmptyPoco() { - return new RealMonsterData.Pocos.NestedLevelOne(); + return new Pocos.RealMonsterData.NestedLevelOne(); } private IList Children { get; } = new List(); @@ -1083,9 +1083,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.NestedLevelTwo plain = new RealMonsterData.Pocos.NestedLevelTwo(); + Pocos.RealMonsterData.NestedLevelTwo plain = new Pocos.RealMonsterData.NestedLevelTwo(); await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -1099,9 +1099,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.NestedLevelTwo plain = new RealMonsterData.Pocos.NestedLevelTwo(); + Pocos.RealMonsterData.NestedLevelTwo plain = new Pocos.RealMonsterData.NestedLevelTwo(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -1114,7 +1114,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.NestedLevelTwo plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.NestedLevelTwo plain) { plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -1131,7 +1131,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.NestedLevelTwo plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.NestedLevelTwo plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -1153,7 +1153,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.NestedLevelTwo plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.NestedLevelTwo plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -1177,9 +1177,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.NestedLevelTwo plain = new RealMonsterData.Pocos.NestedLevelTwo(); + Pocos.RealMonsterData.NestedLevelTwo plain = new Pocos.RealMonsterData.NestedLevelTwo(); plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; plain.Acc = Acc.Shadow; @@ -1188,7 +1188,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.NestedLevelTwo plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.NestedLevelTwo plain) { plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; @@ -1203,7 +1203,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.NestedLevelTwo plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.NestedLevelTwo plain) { Position.Shadow = plain.Position; Velo.Shadow = plain.Velo; @@ -1223,7 +1223,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.NestedLevelTwo plain, RealMonsterData.Pocos.NestedLevelTwo latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.NestedLevelTwo plain, Pocos.RealMonsterData.NestedLevelTwo latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1250,9 +1250,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RealMonsterData.Pocos.NestedLevelTwo CreateEmptyPoco() + public Pocos.RealMonsterData.NestedLevelTwo CreateEmptyPoco() { - return new RealMonsterData.Pocos.NestedLevelTwo(); + return new Pocos.RealMonsterData.NestedLevelTwo(); } private IList Children { get; } = new List(); @@ -1362,9 +1362,9 @@ public async virtual Task OnlineToPlain() return await (dynamic)this.OnlineToPlainAsync(); } - public async Task OnlineToPlainAsync() + public async Task OnlineToPlainAsync() { - RealMonsterData.Pocos.NestedLevelThree plain = new RealMonsterData.Pocos.NestedLevelThree(); + Pocos.RealMonsterData.NestedLevelThree plain = new Pocos.RealMonsterData.NestedLevelThree(); await this.ReadAsync(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -1375,9 +1375,9 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _OnlineToPlainNoacAsync() + public async Task _OnlineToPlainNoacAsync() { - RealMonsterData.Pocos.NestedLevelThree plain = new RealMonsterData.Pocos.NestedLevelThree(); + Pocos.RealMonsterData.NestedLevelThree plain = new Pocos.RealMonsterData.NestedLevelThree(); plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; plain.Acc = Acc.LastValue; @@ -1387,7 +1387,7 @@ public async virtual Task OnlineToPlain() [Obsolete("This method should not be used if you indent to access the controllers data. Use `OnlineToPlain` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - protected async Task _OnlineToPlainNoacAsync(RealMonsterData.Pocos.NestedLevelThree plain) + protected async Task _OnlineToPlainNoacAsync(Pocos.RealMonsterData.NestedLevelThree plain) { plain.Position = Position.LastValue; plain.Velo = Velo.LastValue; @@ -1401,7 +1401,7 @@ public async virtual Task PlainToOnline(T plain) await this.PlainToOnlineAsync((dynamic)plain); } - public async Task> PlainToOnlineAsync(RealMonsterData.Pocos.NestedLevelThree plain) + public async Task> PlainToOnlineAsync(Pocos.RealMonsterData.NestedLevelThree plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -1420,7 +1420,7 @@ public async Task> PlainToOnlineAsync(RealMonsterDat [Obsolete("This method should not be used if you indent to access the controllers data. Use `PlainToOnline` instead.")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public async Task _PlainToOnlineNoacAsync(RealMonsterData.Pocos.NestedLevelThree plain) + public async Task _PlainToOnlineNoacAsync(Pocos.RealMonsterData.NestedLevelThree plain) { #pragma warning disable CS0612 Position.LethargicWrite(plain.Position); @@ -1441,9 +1441,9 @@ public async virtual Task ShadowToPlain() return await (dynamic)this.ShadowToPlainAsync(); } - public async Task ShadowToPlainAsync() + public async Task ShadowToPlainAsync() { - RealMonsterData.Pocos.NestedLevelThree plain = new RealMonsterData.Pocos.NestedLevelThree(); + Pocos.RealMonsterData.NestedLevelThree plain = new Pocos.RealMonsterData.NestedLevelThree(); plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; plain.Acc = Acc.Shadow; @@ -1451,7 +1451,7 @@ public async virtual Task ShadowToPlain() return plain; } - protected async Task ShadowToPlainAsync(RealMonsterData.Pocos.NestedLevelThree plain) + protected async Task ShadowToPlainAsync(Pocos.RealMonsterData.NestedLevelThree plain) { plain.Position = Position.Shadow; plain.Velo = Velo.Shadow; @@ -1465,7 +1465,7 @@ public async virtual Task PlainToShadow(T plain) await this.PlainToShadowAsync((dynamic)plain); } - public async Task> PlainToShadowAsync(RealMonsterData.Pocos.NestedLevelThree plain) + public async Task> PlainToShadowAsync(Pocos.RealMonsterData.NestedLevelThree plain) { Position.Shadow = plain.Position; Velo.Shadow = plain.Velo; @@ -1484,7 +1484,7 @@ public async virtual Task AnyChangeAsync(T plain) ///Compares if the current plain object has changed from the previous object.This method is used by the framework to determine if the object has changed and needs to be updated. ///[!NOTE] Any member in the hierarchy that is ignored by the compilers (e.g. when CompilerOmitAttribute is used) will not be compared, and therefore will not be detected as changed. /// - public async Task DetectsAnyChangeAsync(RealMonsterData.Pocos.NestedLevelThree plain, RealMonsterData.Pocos.NestedLevelThree latest = null) + public async Task DetectsAnyChangeAsync(Pocos.RealMonsterData.NestedLevelThree plain, Pocos.RealMonsterData.NestedLevelThree latest = null) { if (latest == null) latest = await this._OnlineToPlainNoacAsync(); @@ -1509,9 +1509,9 @@ public void Poll() this.RetrievePrimitives().ToList().ForEach(x => x.Poll()); } - public RealMonsterData.Pocos.NestedLevelThree CreateEmptyPoco() + public Pocos.RealMonsterData.NestedLevelThree CreateEmptyPoco() { - return new RealMonsterData.Pocos.NestedLevelThree(); + return new Pocos.RealMonsterData.NestedLevelThree(); } private IList Children { get; } = new List(); diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs index c4acf59d3..b3d4996be 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/configuration.g.cs @@ -1,60 +1,54 @@ using System; using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -using RealMonsterData.Pocos; +using Pocos.RealMonsterData; namespace Pocos { public partial class integratedTwinController { - public MonsterData.Pocos.Monster Monster { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster OnlineToPlain_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster PlainToOnline_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster OnlineToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ShadowToOnlineAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectOnlineToPlain_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectPlainToOnline_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectOnlineToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectShadowToOnlineAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ShadowToPlainAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster PlainToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectShadowToPlainAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public MonsterData.Pocos.Monster ITwinObjectPlainToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Pocos.Monster(); - public global::Pocos.Pokus Pokus { get; set; } = new global::Pocos.Pokus(); - public RealMonsterData.Pocos.RealMonster RealMonster { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster OnlineToShadow_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ShadowToOnline_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster OnlineToPlain_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster PlainToOnline_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ITwinObjectOnlineToShadow_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ITwinObjectShadowToOnline_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ITwinObjectOnlineToPlain_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ITwinObjectPlainToOnline_should_copy { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public global::Pocos.all_primitives p_online_shadow { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.all_primitives p_shadow_online { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.all_primitives p_online_plain { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.all_primitives p_plain_online { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.all_primitives p_shadow_plain { get; set; } = new global::Pocos.all_primitives(); - public global::Pocos.all_primitives p_plain_shadow { get; set; } = new global::Pocos.all_primitives(); - public RealMonsterData.Pocos.RealMonster StartPolling_should_update_cyclic_property { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster StartPolling_ConcurentOverload { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public RealMonsterData.Pocos.RealMonster ChangeDetections { get; set; } = new RealMonsterData.Pocos.RealMonster(); - public GH_ISSUE_183.Pocos.GH_ISSUE_183_1 GH_ISSUE_183 { get; set; } = new GH_ISSUE_183.Pocos.GH_ISSUE_183_1(); + public MonsterData.Monster Monster { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster OnlineToPlain_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster PlainToOnline_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster OnlineToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ShadowToOnlineAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectOnlineToPlain_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectPlainToOnline_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectOnlineToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectShadowToOnlineAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ShadowToPlainAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster PlainToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectShadowToPlainAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public MonsterData.Monster ITwinObjectPlainToShadowAsync_should_copy_entire_structure { get; set; } = new MonsterData.Monster(); + public Pokus Pokus { get; set; } = new Pokus(); + public RealMonsterData.RealMonster RealMonster { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster OnlineToShadow_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ShadowToOnline_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster OnlineToPlain_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster PlainToOnline_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ITwinObjectOnlineToShadow_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ITwinObjectShadowToOnline_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ITwinObjectOnlineToPlain_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ITwinObjectPlainToOnline_should_copy { get; set; } = new RealMonsterData.RealMonster(); + public all_primitives p_online_shadow { get; set; } = new all_primitives(); + public all_primitives p_shadow_online { get; set; } = new all_primitives(); + public all_primitives p_online_plain { get; set; } = new all_primitives(); + public all_primitives p_plain_online { get; set; } = new all_primitives(); + public all_primitives p_shadow_plain { get; set; } = new all_primitives(); + public all_primitives p_plain_shadow { get; set; } = new all_primitives(); + public RealMonsterData.RealMonster StartPolling_should_update_cyclic_property { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster StartPolling_ConcurentOverload { get; set; } = new RealMonsterData.RealMonster(); + public RealMonsterData.RealMonster ChangeDetections { get; set; } = new RealMonsterData.RealMonster(); + public GH_ISSUE_183.GH_ISSUE_183_1 GH_ISSUE_183 { get; set; } = new GH_ISSUE_183.GH_ISSUE_183_1(); } -} -namespace Pocos -{ public partial class Pokus : AXSharp.Connector.IPlain { public Pokus() { } } -} -namespace Pocos -{ public partial class Nested : AXSharp.Connector.IPlain { public Nested() diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs index 9a7007ec2..4db2980d0 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs @@ -2,46 +2,40 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace MonsterData +namespace Pocos { - namespace Pocos + namespace MonsterData { public partial class MonsterBase : AXSharp.Connector.IPlain { public MonsterBase() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new MonsterData.Pocos.DriveBase(), new[] { (0, 3) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new Pocos.MonsterData.DriveBase(), new[] { (0, 3) }); #pragma warning restore CS0612 } public string Description { get; set; } = string.Empty; public UInt64 Id { get; set; } public Byte[] ArrayOfBytes { get; set; } = new Byte[4]; - public MonsterData.Pocos.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.Pocos.DriveBase[4]; + public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4]; [IgnoreOnPocoOperation()] - public MonsterData.Pocos.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.Pocos.DriveBase(); + public MonsterData.DriveBase DriveBase_tobeignoredbypocooperations { get; set; } = new MonsterData.DriveBase(); [IgnoreOnPocoOperation()] public string Description_tobeignoredbypocooperations { get; set; } = string.Empty; } - } - namespace Pocos - { - public partial class Monster : MonsterData.Pocos.MonsterBase, AXSharp.Connector.IPlain + public partial class Monster : MonsterData.MonsterBase, AXSharp.Connector.IPlain { public Monster() : base() { } - public MonsterData.Pocos.DriveBase DriveA { get; set; } = new MonsterData.Pocos.DriveBase(); + public MonsterData.DriveBase DriveA { get; set; } = new MonsterData.DriveBase(); } - } - namespace Pocos - { public partial class DriveBase : AXSharp.Connector.IPlain { public DriveBase() diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs index da1480552..e23d372b9 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/myEnum.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs index 26c716514..b2897aa98 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs @@ -2,16 +2,16 @@ using AXSharp.Abstractions.Presentation; using AXSharp.Connector; -namespace RealMonsterData +namespace Pocos { - namespace Pocos + namespace RealMonsterData { public partial class RealMonsterBase : AXSharp.Connector.IPlain { public RealMonsterBase() { #pragma warning disable CS0612 - AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new RealMonsterData.Pocos.DriveBaseNested(), new[] { (0, 3) }); + AXSharp.Connector.BuilderHelpers.Arrays.InstantiateArray(ArrayOfDrives, () => new Pocos.RealMonsterData.DriveBaseNested(), new[] { (0, 3) }); #pragma warning restore CS0612 } @@ -21,24 +21,18 @@ public RealMonsterBase() public DateTime TestDateTime { get; set; } = default(DateTime); public TimeSpan TestTimeSpan { get; set; } = default(TimeSpan); public Byte[] ArrayOfBytes { get; set; } = new Byte[4]; - public RealMonsterData.Pocos.DriveBaseNested[] ArrayOfDrives { get; set; } = new RealMonsterData.Pocos.DriveBaseNested[4]; + public RealMonsterData.DriveBaseNested[] ArrayOfDrives { get; set; } = new RealMonsterData.DriveBaseNested[4]; } - } - namespace Pocos - { - public partial class RealMonster : RealMonsterData.Pocos.RealMonsterBase, AXSharp.Connector.IPlain + public partial class RealMonster : RealMonsterData.RealMonsterBase, AXSharp.Connector.IPlain { public RealMonster() : base() { } - public RealMonsterData.Pocos.DriveBaseNested DriveA { get; set; } = new RealMonsterData.Pocos.DriveBaseNested(); + public RealMonsterData.DriveBaseNested DriveA { get; set; } = new RealMonsterData.DriveBaseNested(); } - } - namespace Pocos - { public partial class DriveBaseNested : AXSharp.Connector.IPlain { public DriveBaseNested() @@ -49,12 +43,9 @@ public DriveBaseNested() public Double Velo { get; set; } public Double Acc { get; set; } public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelOne NestedLevelOne { get; set; } = new RealMonsterData.Pocos.NestedLevelOne(); + public RealMonsterData.NestedLevelOne NestedLevelOne { get; set; } = new RealMonsterData.NestedLevelOne(); } - } - namespace Pocos - { public partial class NestedLevelOne : AXSharp.Connector.IPlain { public NestedLevelOne() @@ -65,12 +56,9 @@ public NestedLevelOne() public Double Velo { get; set; } public Double Acc { get; set; } public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelTwo NestedLevelTwo { get; set; } = new RealMonsterData.Pocos.NestedLevelTwo(); + public RealMonsterData.NestedLevelTwo NestedLevelTwo { get; set; } = new RealMonsterData.NestedLevelTwo(); } - } - namespace Pocos - { public partial class NestedLevelTwo : AXSharp.Connector.IPlain { public NestedLevelTwo() @@ -81,12 +69,9 @@ public NestedLevelTwo() public Double Velo { get; set; } public Double Acc { get; set; } public Double Dcc { get; set; } - public RealMonsterData.Pocos.NestedLevelThree NestedLevelThree { get; set; } = new RealMonsterData.Pocos.NestedLevelThree(); + public RealMonsterData.NestedLevelThree NestedLevelThree { get; set; } = new RealMonsterData.NestedLevelThree(); } - } - namespace Pocos - { public partial class NestedLevelThree : AXSharp.Connector.IPlain { public NestedLevelThree() diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs index da1480552..e23d372b9 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/program.g.cs @@ -1,3 +1,7 @@ using System; using AXSharp.Abstractions.Presentation; -using AXSharp.Connector; \ No newline at end of file +using AXSharp.Connector; + +namespace Pocos +{ +} \ No newline at end of file diff --git a/src/tests.integrations/integrated/src/integrated.twin/Entry.cs b/src/tests.integrations/integrated/src/integrated.twin/Entry.cs index b37d244f9..d09ce61c5 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/Entry.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/Entry.cs @@ -41,6 +41,6 @@ private static bool CertificateValidation(HttpRequestMessage requestMessage, X50 public static integratedTwinController Plc { get; } = new(ConnectorAdapterBuilder.Build() - .CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USER_NAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true)); + .CreateWebApi(TargetIp, Environment.GetEnvironmentVariable("AX_USERNAME"), Environment.GetEnvironmentVariable("AX_TARGET_PWD"), CertificateValidation, true)); } } \ No newline at end of file diff --git a/src/tests.integrations/integrated/tests/integrated.tests/PlainersSwappingTests.cs b/src/tests.integrations/integrated/tests/integrated.tests/PlainersSwappingTests.cs index d8a0b181f..62889d51f 100644 --- a/src/tests.integrations/integrated/tests/integrated.tests/PlainersSwappingTests.cs +++ b/src/tests.integrations/integrated/tests/integrated.tests/PlainersSwappingTests.cs @@ -163,7 +163,7 @@ public async Task ITwinObject_OnlineToPlain_should_copy_entire_structure() await monster.WriteAsync(); - var p = await ((ITwinObject)monster).OnlineToPlain(); + var p = await ((ITwinObject)monster).OnlineToPlain(); Assert.Equal(monster.Description.Cyclic, p.Description); Assert.Equal(monster.Id.Cyclic, p.Id); @@ -189,7 +189,7 @@ public async Task PlainToOnline_should_copy_entire_structure() { var monster = Entry.Plc.PlainToOnline_should_copy_entire_structure; - var p = new MonsterData.Pocos.Monster(); + var p = new Pocos.MonsterData.Monster(); p.Description = "from plain to online"; p.Id = 111222; @@ -248,7 +248,7 @@ public async Task PlainToOnline_should_copy_entire_structure_ignore_on_poco_oper { var monster = Entry.Plc.PlainToOnline_should_copy_entire_structure; - var p = new MonsterData.Pocos.Monster(); + var p = new Pocos.MonsterData.Monster(); p.Description = "from plain to online"; p.Id = 111222; @@ -324,7 +324,7 @@ public async Task ITwinObject_PlainToOnline_should_copy_entire_structure() { var monster = Entry.Plc.ITwinObjectPlainToOnline_should_copy_entire_structure; - var p = new MonsterData.Pocos.Monster(); + var p = new Pocos.MonsterData.Monster(); p.Description = "from plain to online"; p.Id = 111222; @@ -423,7 +423,7 @@ public async Task ITwinObject_OnlineToPlain_RealMonster_should_copy() monster.DriveA.NestedLevelOne.NestedLevelTwo.NestedLevelThree.Acc.Cyclic = 123; await monster.WriteAsync(); - var p = await ((ITwinObject)monster).OnlineToPlain(); + var p = await ((ITwinObject)monster).OnlineToPlain(); Assert.Equal(monster.Description.Cyclic, p.Description); Assert.Equal(monster.DriveA.NestedLevelOne.NestedLevelTwo.NestedLevelThree.Acc.Cyclic, p.DriveA.NestedLevelOne.NestedLevelTwo.NestedLevelThree.Acc); @@ -511,7 +511,7 @@ public async Task ITwinObject_ShadowToPlain_should_copy_entire_structure() //await monster.WriteAsync(); - var p = await ((ITwinObject)monster).ShadowToPlain(); + var p = await ((ITwinObject)monster).ShadowToPlain(); Assert.Equal(monster.Description.Shadow, p.Description); Assert.Equal(monster.Id.Shadow, p.Id); @@ -537,7 +537,7 @@ public async Task PlainToShadow_should_copy_entire_structure() { var monster = Entry.Plc.PlainToShadowAsync_should_copy_entire_structure; - var p = new MonsterData.Pocos.Monster(); + var p = new Pocos.MonsterData.Monster(); p.Description = "from plain to shadow"; p.Id = 111222; @@ -594,7 +594,7 @@ public async Task ITwinObject_PlainToShadow_should_copy_entire_structure() { var monster = Entry.Plc.ITwinObjectPlainToShadowAsync_should_copy_entire_structure; - var p = new MonsterData.Pocos.Monster(); + var p = new Pocos.MonsterData.Monster(); p.Description = "from plain to shadow"; p.Id = 111222;