Merge branch 'dev' into dev-flux

Author: PTKu

GitVersion.yml

@@ -1,5 +1,5 @@
 mode: ContinuousDeployment
-next-version: 0.43.1
+next-version: 0.44.1
 branches:
   main:
     regex: ^master$|^main$

src/AXSharp.compiler/src/AXSharp.Compiler/AXSharpProject.cs

@@ -101,8 +101,7 @@ public AXSharpProject(AxProject axProject, IEnumerable<Type> builderTypes, Type
     public void Generate()
     {
         Log.Logger.Information($"Compilation of project '{AxProject.SrcFolder}' started");
-
-        var projectSources = AxProject.Sources.Select(p => (parseTree: STParser.ParseTextAsync(p).Result, source: p));
+        var projectSources = AxProject.Sources.Select(p => (parseTree: STParser.ParseTextAsync(p, SyntaxTreeOptions.Default, this.AxProject.ProjectInfo.Variables?.DefinedPreprocessorSymbols).Result, source: p));
 
         TargetProject.ProvisionProjectStructure();
 

src/AXSharp.compiler/src/AXSharp.Compiler/Apax.cs

@@ -61,6 +61,12 @@ public Apax()
     /// </summary>
     public IDictionary<string, string>? Dependencies { get; set; }
 
+    /// <summary>
+    ///  Gets or sets variables section.
+    ///  This maps to the `variables` node in apax.yml.
+    /// </summary>
+    public ApaxVariables? Variables { get; set; }
+
     /// <summary>
     /// Creates new instance of <see cref="Apax"/>.
     /// </summary>
@@ -103,6 +109,10 @@ public static Apax TryCreateApaxDto(string projectFile)
         {
             throw new FileNotFoundException(
                 "'apax.yml' file was not found in the working directory. Make sure your current directory is simatic-ax project directory or provide source directory argument (for details see ixc --help)");
+        }        
+        catch(YamlDotNet.Core.YamlException ex) 
+        {
+            throw new InvalidDataException($"Failed to process apax file: '{projectFile}' {ex.ToString()}");            
         }
     }
 
@@ -135,4 +145,22 @@ public static void UpdateVersion(string apaxFile, string version)
                 "'apax.yml' file was not found in the working directory. Make sure your current directory is simatic-ax project directory or provide source directory argument (for details see ixc --help)");
         }
     }
+}
+
+/// <summary>
+/// Represents the `variables` section of apax.yml.
+/// </summary>
+public class ApaxVariables
+{
+    /// <summary>
+    /// Values for APAX build arguments. Maps to the YAML key `APAX_BUILD_ARGS`.
+    /// </summary>
+    [YamlMember(Alias = "APAX_BUILD_ARGS", ApplyNamingConventions = false)]
+    public IEnumerable<string>? ApaxBuildArgs { get; set; }
+
+    /// <summary>
+    /// Values for defined preprocessor symbols. Maps to the YAML key `DEFINED_PREPROCESSOR_SYMBOLS`.
+    /// </summary>
+    [YamlMember(Alias = "DEFINED_PREPROCESSOR_SYMBOLS", ApplyNamingConventions = false)]
+    public IEnumerable<string>? DefinedPreprocessorSymbols { get; set; }
 }

src/AXSharp.compiler/src/AXSharp.Compiler/AxProject.cs

@@ -244,7 +244,7 @@ private IEnumerable<object> GetProjectDependencies()
 
         nearByProjects = SearchForApaxFiles(GetStartDirectory(this.ProjectFolder, 4), 0, 4)
             .Select(p => new FileInfo(p))
-            .Where(p => !p.Directory.FullName.Contains(".apax"))
+            .Where(p => !(p.Directory.FullName.Contains(".apax") || p.Directory.FullName.Contains("bin") || p.Directory.FullName.Contains("obj")))            
             .Select(a => new NearByProjects() { Apax = Apax.TryCreateApaxDto(a.FullName), ApaxFile = a })
             .ToList(); ;
 

src/AXSharp.compiler/src/ixc/Properties/launchSettings.json

@@ -4,6 +4,10 @@
       "commandName": "Project",
       "workingDirectory": "c:\\W\\Develop\\gh\\inxton\\statemachine\\"
     },
+    "ixc-tom": {
+      "commandName": "Project",
+      "workingDirectory": "D:\\github\\Inxton\\axopen\\src\\components.elements\\app"
+    },    
     "integration_plc": {
       "commandName": "Project",
       "workingDirectory": "c:\\W\\Develop\\gh\\inxton\\axopen\\src\\integrations\\ctrl\\"