showcase app consolidation

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "AXSharp.ixc": {
-      "version": "0.47.0-alpha.459",
+      "version": "0.47.0-alpha.472",
       "commands": [
         "ixc"
       ],
@@ -17,14 +17,14 @@
       "rollForward": false
     },
     "AXSharp.ixd": {
-      "version": "0.47.0-alpha.459",
+      "version": "0.47.0-alpha.472",
       "commands": [
         "ixd"
       ],
       "rollForward": false
     },
     "AXSharp.ixr": {
-      "version": "0.47.0-alpha.459",
+      "version": "0.47.0-alpha.472",
       "commands": [
         "ixr"
       ],

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "files.eol": "\n"
+    "http.proxyCertificates": true,
+    "http.proxyStrictSSL": false,
+    "http.systemCertificates": true,
+    "files.eol": "\n",    
 }

Directory.Packages.props

@@ -11,11 +11,11 @@
   <!-- Framework-Agnostic Packages -->
   <ItemGroup>
     <!-- AX# Libraries -->
-    <PackageVersion Include="AXSharp.Abstractions" Version="0.47.0-alpha.459" />
-    <PackageVersion Include="AXSharp.Connector" Version="0.47.0-alpha.459" />
-    <PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.47.0-alpha.459" />
-    <PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.47.0-alpha.459" />
-    <PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.47.0-alpha.459" />
+    <PackageVersion Include="AXSharp.Abstractions" Version="0.47.0-alpha.472" />
+    <PackageVersion Include="AXSharp.Connector" Version="0.47.0-alpha.472" />
+    <PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.47.0-alpha.472" />
+    <PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.47.0-alpha.472" />
+    <PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.47.0-alpha.472" />
     <PackageVersion Include="Inxton.Operon" Version="0.3.0-alpha.138" />
     <!-- Data & Serialization -->
     <PackageVersion Include="ClosedXML" Version="0.105.0" />
@@ -30,6 +30,7 @@
     <!-- UI & Presentation -->
     <PackageVersion Include="AXOpen.KristofferStrube.Blazor.SVGEditor" Version="0.4.4-alpha.298" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageVersion Include="Markdig" Version="0.40.0" />
     <!-- Utilities -->
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Cocona" Version="2.2.0" />

README.md

@@ -73,7 +73,7 @@ END_IF;
 ~~~
 
 ~~~CSharp
-Entry.Plc.AxoRemoteTasks._remoteTask.Initialize(() => Console.WriteLine($"Remote task executed PLC sent this string: '{Entry.Plc.AxoRemoteTasks._remoteTask.Message.GetAsync().Result}'"));
+Entry.Plc.Ctx.AxoRemoteTasks._remoteTask.Initialize(() => Console.WriteLine($"Remote task executed PLC sent this string: '{Entry.Plc.Ctx.AxoRemoteTasks._remoteTask.Message.GetAsync().Result}'"));
 ~~~
 
 ![Remote Task](assets/readme_pics/image-remote-task.png)

cake/BuildContext.cs

@@ -168,38 +168,38 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)
         ("ax.axopen.hwlibrary", "ax.axopen.hwlibrary", true, false, false),
         ("ax.axopen.app", "ax.axopen.app", true, false, false),
         ("sdk-ax", "ax-sdk", true, false, false),
-        ("abstractions", "axopen.abstractions", true, true, true),
+        ("abstractions", "axopen.abstractions", true, false, true),
         ("timers", "axopen.timers", true, false, true),
         ("simatic1500", "axopen.simatic1500", true, false, true),
         ("utils", "axopen.utils", true, false, true),
-        ("core", "axopen.core", true, true, true),
-        ("data", "axopen.data", true, true, true),
-        ("probers", "axopen.probers", true, true, false),
-        ("inspectors", "axopen.inspectors", true, true, true),
-        ("components.abstractions", "axopen.components.abstractions", true, true, true),
-        ("components.elements", "axopen.components.elements", true, true, true),
-        ("io", "axopen.io", true, true, false),
-        ("components.cognex.vision", "axopen.components.cognex.vision", true, true, true),
-        ("components.pneumatics", "axopen.components.pneumatics", true, true, true),
-        ("components.drives", "axopen.components.drives", true, true, true),
-        ("components.rexroth.drives", "axopen.components.rexroth.drives", true, true, true),
-        ("components.rexroth.press", "axopen.components.rexroth.press", true, true, true),
-        ("components.festo.drives", "axopen.components.festo.drives", true, true, true),
-        ("components.desoutter.tightening", "axopen.components.desoutter.tightening", true, true, true),
-        ("components.robotics", "axopen.components.robotics", true, true, true),
-        ("components.abb.robotics", "axopen.components.abb.robotics", true, true, true),
-        ("components.mitsubishi.robotics", "axopen.components.mitsubishi.robotics", true, true, true),
-        ("components.ur.robotics", "axopen.components.ur.robotics", true, true, true),
-        ("components.kuka.robotics", "axopen.components.kuka.robotics", true, true, true),
-        ("components.siem.identification", "axopen.components.siem.identification", true, true, true),
-        ("components.siem.communication", "axopen.components.siem.communication", true, true, true),
-        ("components.balluff.identification", "axopen.components.balluff.identification", true, true, true),
-        ("components.keyence.vision", "axopen.components.keyence.vision", true, true, true),
-        ("components.rexroth.tightening", "axopen.components.rexroth.tightening", true, true, true),
-        ("components.dukane.welders", "axopen.components.dukane.welders", true, true, true),
-        ("components.zebra.vision", "axopen.components.zebra.vision", true, true, true),
-        ("integrations", "ix.integrations", false,false, false),
-        ("template.axolibrary", "template.axolibrary", false, true, false)
+        ("core", "axopen.core", true, false, true),
+        ("data", "axopen.data", true, false, true),
+        ("probers", "axopen.probers", true, false, false),
+        ("inspectors", "axopen.inspectors", true, false, true),
+        ("components.abstractions", "axopen.components.abstractions", true, false, true),
+        ("components.elements", "axopen.components.elements", true, false, true),
+        ("io", "axopen.io", true, false, false),
+        ("components.cognex.vision", "axopen.components.cognex.vision", true, false, true),
+        ("components.pneumatics", "axopen.components.pneumatics", true, false, true),
+        ("components.drives", "axopen.components.drives", true, false, true),
+        ("components.rexroth.drives", "axopen.components.rexroth.drives", true, false, true),
+        ("components.rexroth.press", "axopen.components.rexroth.press", true, false, true),
+        ("components.festo.drives", "axopen.components.festo.drives", true, false, true),
+        ("components.desoutter.tightening", "axopen.components.desoutter.tightening", true, false, true),
+        ("components.robotics", "axopen.components.robotics", true, false, true),
+        ("components.abb.robotics", "axopen.components.abb.robotics", true, false, true),
+        ("components.mitsubishi.robotics", "axopen.components.mitsubishi.robotics", true, false, true),
+        ("components.ur.robotics", "axopen.components.ur.robotics", true, false, true),
+        ("components.kuka.robotics", "axopen.components.kuka.robotics", true, false, true),
+        ("components.siem.identification", "axopen.components.siem.identification", true, false, true),
+        ("components.siem.communication", "axopen.components.siem.communication", true, false, true),
+        ("components.balluff.identification", "axopen.components.balluff.identification", true, false, true),
+        ("components.keyence.vision", "axopen.components.keyence.vision", true, false, true),
+        ("components.rexroth.tightening", "axopen.components.rexroth.tightening", true, false, true),
+        ("components.dukane.welders", "axopen.components.dukane.welders", true, false, true),
+        ("components.zebra.vision", "axopen.components.zebra.vision", true, false, true),
+        ("integrations", "ix.integrations", false, false, false),
+        ("template.axolibrary", "template.axolibrary", false, false, false)
     };
     #endregion
 
@@ -214,8 +214,7 @@ public IEnumerable<string> GetAxFolders((string folder, string name, bool pack,
         var paths = new string[]
         {
             Path.Combine(Path.Combine(RootDir, library.folder), "ctrl"),
-            Path.Combine(Path.Combine(RootDir, library.folder), "app"),
-            Path.Combine(Path.Combine(RootDir, library.folder), "ax")            
+            Path.Combine(Path.Combine(RootDir, library.folder), "ax")
         };
 
         return paths.Where(p => File.Exists(Path.Combine(p, "apax.yml")));
@@ -224,9 +223,8 @@ public IEnumerable<string> GetAxFolders((string folder, string name, bool pack,
     public IEnumerable<string> GetApplicationAxFolders((string folder, string name, bool pack) library)
     {
         var paths = new string[]
-        {            
-            Path.Combine(Path.Combine(RootDir, library.folder), "app"),
-            Path.Combine(Path.Combine(RootDir, library.folder), "ax")            
+        {
+            Path.Combine(Path.Combine(RootDir, library.folder), "ax")
         };
 
         return paths.Where(p => File.Exists(Path.Combine(p, "apax.yml")));
@@ -283,7 +281,6 @@ public IEnumerable<string> GetApaxFiles((string folder, string name, bool pack,
         var paths = new string[]
         {
             Path.Combine(Path.Combine(RootDir, library.folder), "ctrl", "apax.yml"),
-            Path.Combine(Path.Combine(RootDir, library.folder), "app", "apax.yml"),
             Path.Combine(Path.Combine(RootDir, library.folder), "ax", "apax.yml")
         };
 

cake/Program.cs

@@ -371,22 +371,16 @@ public override void Run(BuildContext context)
         {
             foreach (var package in context.Libraries)
             {
-                var app = Path.Combine(context.RootDir, package.folder, "app");
                 var ax = Path.Combine(context.RootDir, package.folder, "ax");
 
-                if (Directory.Exists(app))
-                {
-                    context.ApaxDownload(app);
-                }
-                else if (Directory.Exists(ax))
+                if (Directory.Exists(ax))
                 {
                     context.ApaxDownload(ax);
                 }
                 else
                 {
-                    //throw new Exception($"No app or ax folder found for {package.folder}");
-                    context.Log.Information($"No app or ax folder found for {package.folder}");
-                    break;
+                    context.Log.Information($"No ax folder found for {package.folder}");
+                    continue;
                 }
 
                 context.DotNetTest(Path.Combine(context.RootDir, package.folder, "tmp_L3_.proj"), context.DotNetTestSettings);
@@ -482,7 +476,7 @@ public override void Run(BuildContext context)
                 string logFilePath = createResult.FilePath;
                 AppsRunTaskHelpers.WriteResult(context, "AppName,ApaxInstall,ApaxPlcSim,ApaxGsd,ApaxHwl,ApaxHwcc,ApaxHwid,ApaxHwadr,ApaxHwdo,ApaxBuild,DotnetIxc,ApaxSlfdo,Slngen,DotnetClean,DotnetBuild,DotnetRun", logFilePath);
 
-                string appFolder = Path.Combine(Path.Combine(context.RootDir, context.BuildParameters.AppRunOnlyFolderName), "app");
+                string appFolder = Path.Combine(context.RootDir, context.BuildParameters.AppRunOnlyFolderName);
                 string appFile = context.GetApaxFile(appFolder);
                 string appName = context.GetApplicationName(appFile);
 

src/AXOpen-L1-tests.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{091BFA68-B549-45AF-9857-3932996D7C60}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L1-tests", "AXOpen-L1-tests.proj", "{599D865F-5D22-4892-98CC-FF8DBA6FB2BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}"
 EndProject
@@ -79,9 +79,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Elements"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "components.elements\src", "{FF5426D3-B88B-40DA-A73D-6891039F3441}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Elements.Tests", "components.elements\tests\AXOpen.Components.Elements.Tests", "{66C1EB3D-AD30-4DEE-BD64-A6091690FCB0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Elements.Tests", "components.elements\tests\AXOpen.Components.Elements.Tests", "{5A020CA5-7061-4013-A452-6591C94EB1D3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "components.elements\tests", "{72034142-782D-48DF-846F-1D517F2EB42C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "components.elements\tests", "{E6135F87-804C-4EDF-85CE-E622B909AE84}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.elements", "components.elements", "{07D6DF87-9F92-4C1A-BB00-F8C6E449FF4E}"
 EndProject
@@ -195,10 +195,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{091BFA68-B549-45AF-9857-3932996D7C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{091BFA68-B549-45AF-9857-3932996D7C60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{599D865F-5D22-4892-98CC-FF8DBA6FB2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{599D865F-5D22-4892-98CC-FF8DBA6FB2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{599D865F-5D22-4892-98CC-FF8DBA6FB2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{599D865F-5D22-4892-98CC-FF8DBA6FB2BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02DDDB95-D6BC-4718-BA35-3454EAB5DF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -328,9 +328,9 @@ Global
 		{DD51C869-9708-4AAF-B962-4C13946E86B6} = {750621DC-AFEC-4430-924D-9AE31304AD4F}
 		{750621DC-AFEC-4430-924D-9AE31304AD4F} = {FF5426D3-B88B-40DA-A73D-6891039F3441}
 		{FF5426D3-B88B-40DA-A73D-6891039F3441} = {07D6DF87-9F92-4C1A-BB00-F8C6E449FF4E}
-		{D400DCAB-BF88-4E8D-BFFF-B54F8B5F0FFB} = {66C1EB3D-AD30-4DEE-BD64-A6091690FCB0}
-		{66C1EB3D-AD30-4DEE-BD64-A6091690FCB0} = {72034142-782D-48DF-846F-1D517F2EB42C}
-		{72034142-782D-48DF-846F-1D517F2EB42C} = {07D6DF87-9F92-4C1A-BB00-F8C6E449FF4E}
+		{D400DCAB-BF88-4E8D-BFFF-B54F8B5F0FFB} = {5A020CA5-7061-4013-A452-6591C94EB1D3}
+		{5A020CA5-7061-4013-A452-6591C94EB1D3} = {E6135F87-804C-4EDF-85CE-E622B909AE84}
+		{E6135F87-804C-4EDF-85CE-E622B909AE84} = {07D6DF87-9F92-4C1A-BB00-F8C6E449FF4E}
 		{CDF26EA4-C476-47B3-B8C0-D4A6F0CDED76} = {867300A2-EA3C-4FA1-A32F-3E4013C6E5F8}
 		{867300A2-EA3C-4FA1-A32F-3E4013C6E5F8} = {98DD729F-47A4-4C6A-B2B2-F965EEFA2205}
 		{98DD729F-47A4-4C6A-B2B2-F965EEFA2205} = {04FD4AF9-AE09-441E-81F0-29153120F524}

src/AXOpen-L3-tests.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{6D090A35-7564-4D14-8531-7081D858A4F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen-L3-tests", "AXOpen-L3-tests.proj", "{05913DBF-BEA6-4718-8615-371034B80642}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{64E2240B-1DFE-4939-BB2C-8A40FB81329D}"
 EndProject
@@ -131,9 +131,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Integrations", "inte
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "integrations\src", "{E9DC183D-AA02-494B-9E8F-B157352C491C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Integration.Tests", "integrations\tests\AXOpen.Integration.Tests", "{3BB121A4-6811-4AFC-94E0-1610861F8609}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Integration.Tests", "integrations\tests\AXOpen.Integration.Tests", "{1D08AC05-4610-4557-A0A1-9105FC7E44DF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "integrations\tests", "{3B086955-1E89-472B-A498-FFFFCA961A30}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "integrations\tests", "{A1475F7F-EAE7-46CE-8D8A-E7C8B1327B62}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integrations", "integrations", "{7FCED584-F4FC-4668-88C7-EEC3325AB645}"
 EndProject
@@ -203,10 +203,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D090A35-7564-4D14-8531-7081D858A4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D090A35-7564-4D14-8531-7081D858A4F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05913DBF-BEA6-4718-8615-371034B80642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05913DBF-BEA6-4718-8615-371034B80642}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05913DBF-BEA6-4718-8615-371034B80642}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05913DBF-BEA6-4718-8615-371034B80642}.Release|Any CPU.Build.0 = Release|Any CPU
 		{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64E2240B-1DFE-4939-BB2C-8A40FB81329D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -382,9 +382,9 @@ Global
 		{7F899932-5BBA-4B0C-96C3-6CDEF879CFC2} = {1C83FD5D-2433-4586-B970-853D93461EF7}
 		{1C83FD5D-2433-4586-B970-853D93461EF7} = {E9DC183D-AA02-494B-9E8F-B157352C491C}
 		{E9DC183D-AA02-494B-9E8F-B157352C491C} = {7FCED584-F4FC-4668-88C7-EEC3325AB645}
-		{0B591997-4EB0-490D-B251-B3F20540D87C} = {3BB121A4-6811-4AFC-94E0-1610861F8609}
-		{3BB121A4-6811-4AFC-94E0-1610861F8609} = {3B086955-1E89-472B-A498-FFFFCA961A30}
-		{3B086955-1E89-472B-A498-FFFFCA961A30} = {7FCED584-F4FC-4668-88C7-EEC3325AB645}
+		{0B591997-4EB0-490D-B251-B3F20540D87C} = {1D08AC05-4610-4557-A0A1-9105FC7E44DF}
+		{1D08AC05-4610-4557-A0A1-9105FC7E44DF} = {A1475F7F-EAE7-46CE-8D8A-E7C8B1327B62}
+		{A1475F7F-EAE7-46CE-8D8A-E7C8B1327B62} = {7FCED584-F4FC-4668-88C7-EEC3325AB645}
 		{8B7CB3C9-7420-45AB-A3E6-4E172711CC48} = {57A7408A-1578-4A3A-BA0F-4DE9DB5C30C5}
 		{57A7408A-1578-4A3A-BA0F-4DE9DB5C30C5} = {A963BA2B-63F8-47AF-8BB7-A6C02942DC1A}
 		{389256C4-160A-41CD-858A-ACF342787346} = {6B2053ED-66FE-4553-829F-BBFC88503051}