Refresh files generated during build (Unblocks CI / courtesy push) + added validation

BuildConfigGen/MakeOptionsReader.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace BuildConfigGen
+{
+    internal static class MakeOptionsReader
+    {
+        internal static Dictionary<string, AgentTask> ReadMakeOptions(string gitRootPath)
+        {
+            Dictionary<string, AgentTask> agentTasks = new Dictionary<string, AgentTask>();
+
+            var r = new Utf8JsonReader(File.ReadAllBytes(Path.Combine(gitRootPath, @"make-options.json")));
+
+            bool inConfig = false;
+            string configName = "";
+
+            while (r.Read())
+            {
+
+                switch (r.TokenType)
+                {
+                    case JsonTokenType.PropertyName:
+                        {
+                            string? text = r.GetString();
+                            //Console.WriteLine(r.TokenType + " " + text);
+
+                            if (text == "taskResources")
+                            {
+                                // skip
+                                inConfig = false;
+                            }
+                            else if (text == "tasks")
+                            {
+                                inConfig = false;
+                            }
+                            else
+                            {
+
+                                inConfig = true;
+                                configName = text!;
+                            }
+
+                            break;
+                        }
+                    case JsonTokenType.String:
+                        {
+                            if (inConfig)
+                            {
+                                string? text = r.GetString();
+                                //Console.WriteLine(r.TokenType + " " + text);
+
+                                AgentTask task;
+                                if (agentTasks.TryGetValue(text!, out task!))
+                                {
+
+                                }
+                                else
+                                {
+                                    task = new AgentTask(text!);
+                                    agentTasks.Add(text!, task);
+                                }
+
+                                if (configName == "")
+                                {
+                                    throw new Exception("expected configName to have value");
+                                }
+
+                                task.Configs.Add(configName);
+                            }
+
+                            break;
+                        }
+                    default:
+                        //Console.WriteLine(r.TokenType);
+                        break;
+                }
+            }
+
+            // startarray, endarray
+
+            return agentTasks;
+        }
+
+
+        internal class AgentTask
+        {
+            public AgentTask(string name)
+            {
+                Name = name;
+            }
+
+            public string Name;
+
+            public HashSet<string> Configs = new HashSet<string>();
+
+        }
+    }
+}

BuildConfigGen/Program.cs

@@ -58,15 +58,57 @@ public record ConfigRecord(string name, string constMappingKey, bool isDefault,
         /// <param name="configs">List of configs to generate seperated by |</param>
         /// <param name="currentSprint">Overide current sprint; omit to get from whatsprintis.it</param>
         /// <param name="writeUpdates">Write updates if true, else validate that the output is up-to-date</param>
-        static void Main(string task, string configs, int? currentSprint, bool writeUpdates = false)
+        /// <param name="allTasks"></param>
+        static void Main(string? task = null, string? configs = null, int? currentSprint = null, bool writeUpdates = false, bool allTasks = false)
         {
-            // error handling strategy:
-            // 1. design: anything goes wrong, try to detect and crash as early as possible to preserve the callstack to make debugging easier.
-            // 2. we allow all exceptions to fall though.  Non-zero exit code will be surfaced
-            // 3. Ideally default windows exception will occur and errors reported to WER/watson.  I'm not sure this is happening, perhaps DragonFruit is handling the exception
-            foreach (var t in task.Split(',', '|'))
+            if (allTasks)
             {
-                Main3(t, configs, writeUpdates, currentSprint);
+                NullOrThrow(task, "If allTasks specified, task must not be supplied");
+                NullOrThrow(configs, "If allTasks specified, configs must not be supplied");
+            }
+            else
+            {
+                NotNullOrThrow(task, "Task is required");
+                NotNullOrThrow(configs, "Configs is required");
+            }
+
+            if (allTasks)
+            {
+                string currentDir = Environment.CurrentDirectory;
+                string gitRootPath = GitUtil.GetGitRootPath(currentDir);
+
+                var tasks = MakeOptionsReader.ReadMakeOptions(gitRootPath);
+                foreach (var t in tasks.Values)
+                {
+                    Main3(t.Name, string.Join('|', t.Configs), writeUpdates, currentSprint);
+                }
+            }
+            else 
+            { 
+                // error handling strategy:
+                // 1. design: anything goes wrong, try to detect and crash as early as possible to preserve the callstack to make debugging easier.
+                // 2. we allow all exceptions to fall though.  Non-zero exit code will be surfaced
+                // 3. Ideally default windows exception will occur and errors reported to WER/watson.  I'm not sure this is happening, perhaps DragonFruit is handling the exception
+                foreach (var t in task!.Split(',', '|'))
+                {
+                    Main3(t, configs!, writeUpdates, currentSprint);
+                }
+            }
+        }
+
+        private static void NullOrThrow<T>(T value, string message)
+        {
+            if(value != null)
+            {
+                throw new Exception(message);
+            }
+        }
+
+        private static void NotNullOrThrow<T>(T value, string message)
+        {
+            if (value == null)
+            {
+                throw new Exception(message);
             }
         }
 

Tasks/AzureAppServiceManageV0/task.json

@@ -18,8 +18,8 @@
   "demands": [],
   "version": {
     "Major": 0,
-    "Minor": 228,
-    "Patch": 1
+    "Minor": 231,
+    "Patch": 0
   },
   "minimumAgentVersion": "1.102.0",
   "instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManageV0/task.loc.json

@@ -18,8 +18,8 @@
   "demands": [],
   "version": {
     "Major": 0,
-    "Minor": 228,
-    "Patch": 1
+    "Minor": 231,
+    "Patch": 0
   },
   "minimumAgentVersion": "1.102.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureFunctionAppContainerV1/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 228,
+    "Minor": 231,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureFunctionAppContainerV1/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 228,
+    "Minor": 231,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",