working version

Author: kboom

BuildConfigGen/Debugging/VsCodeLaunchConfigGenerator.cs

@@ -42,8 +42,9 @@ public void AddForTask(string taskConfigPath)
             int major = versionNode["Major"]!.GetValue<int>();
             int minor = versionNode["Minor"]!.GetValue<int>();
             int patch = versionNode["Patch"]!.GetValue<int>();
+            string? build = versionNode["Build"]?.GetValue<string>() ?? null;
 
-            var version = new TaskVersion(major, minor, patch);
+            var version = new TaskVersion(major, minor, patch, build);
 
             LaunchConfig.AddConfigForTask(
                 taskId: taskConfig["id"]!.GetValue<string>(),

BuildConfigGen/Program.cs

@@ -1147,13 +1147,13 @@ private static void WriteTaskJsonWithSemverConfig(string taskPath,
             string outputTaskPath = Path.Combine(taskPath, fileName);
             JsonNode outputTaskNode = JsonNode.Parse(ensureUpdateModeVerifier!.FileReadAllText(outputTaskPath))!;
 
-            outputTaskNode["version"]!["Major"] = taskState.configTaskVersionMapping[defaultConfig].Major;
-            outputTaskNode["version"]!["Minor"] = taskState.configTaskVersionMapping[defaultConfig].Minor;
-            outputTaskNode["version"]!["Patch"] = taskState.configTaskVersionMapping[defaultConfig].Patch;
+            outputTaskNode["version"]!["Major"] = taskState.configTaskVersionMapping[config].Major;
+            outputTaskNode["version"]!["Minor"] = taskState.configTaskVersionMapping[config].Minor;
+            outputTaskNode["version"]!["Patch"] = taskState.configTaskVersionMapping[config].Patch;
 
             if (defaultConfig != config)
             {
-                outputTaskNode["version"]!["Build"] = config.name;
+                outputTaskNode["version"]!["Build"] = config.constMappingKey;
             }
 
             var outputTaskNodeObject = outputTaskNode.AsObject();

BuildConfigGen/TaskVersion.cs

@@ -34,7 +34,7 @@ public TaskVersion(string version)
             throw new ArgumentException("semVer");
         }
     }
-    public TaskVersion(int major, int minor, int overidePatch)
+    public TaskVersion(int major, int minor, int overidePatch, string? build = null)
     {
         if (overidePatch < 0)
         {
@@ -44,6 +44,7 @@ public TaskVersion(int major, int minor, int overidePatch)
         Major = major;
         Minor = minor;
         Patch = overidePatch;
+        Build = build;
     }
 
     private TaskVersion(TaskVersion taskVersionToClone)
@@ -92,17 +93,17 @@ public TaskVersion Clone()
 
     public TaskVersion CloneWithMinorAndPatch(int minor, int overridePatch)
     {
-        return new TaskVersion(Major, minor, overridePatch);
+        return new TaskVersion(Major, minor, overridePatch, Build);
     }
 
     public TaskVersion CloneWithPatch(int overridePatch)
     {
-        return new TaskVersion(Major, Minor, overridePatch);
+        return new TaskVersion(Major, Minor, overridePatch, Build);
     }
 
     public TaskVersion CloneWithMajor(int major)
     {
-        return new TaskVersion(major, Minor, Patch);
+        return new TaskVersion(major, Minor, Patch, Build);
     }
 
     public static implicit operator String(TaskVersion version)

make-util.js

@@ -1840,8 +1840,9 @@ exports.ensureBuildConfigGeneratorPrereqs = ensureBuildConfigGeneratorPrereqs;
  * @param {Number} sprintNumber Sprint number option to pass in the BuildConfigGenerator tool
  * @param {String} debugAgentDir When set to local agent root directory, the BuildConfigGenerator tool will generate launch configurations for the task(s)
  * @param {Boolean} includeLocalPackagesBuildConfig When set to true, generate LocalPackages BuildConfig
+ * @param {Boolean} useSemverBuildConfig When set to true, use semver build config and A/B releases
  */
-var processGeneratedTasks = function(baseConfigToolPath, taskList, makeOptions, writeUpdates, sprintNumber, debugAgentDir, includeLocalPackagesBuildConfig) {
+var processGeneratedTasks = function (baseConfigToolPath, taskList, makeOptions, writeUpdates, sprintNumber, debugAgentDir, includeLocalPackagesBuildConfig, useSemverBuildConfig) {
     if (!makeOptions) fail("makeOptions is not defined");
     if (sprintNumber && !Number.isInteger(sprintNumber)) fail("Sprint is not a number");
 
@@ -1870,6 +1871,10 @@ var processGeneratedTasks = function(baseConfigToolPath, taskList, makeOptions,
         writeUpdateArg += " --include-local-packages-build-config";
     }
 
+    if (useSemverBuildConfig) {
+        writeUpdateArg += " --use-semver-build-config";
+    } 
+
     var debugAgentDirArg = "";
     if(debugAgentDir) {
         debugAgentDirArg += ` --debug-agent-dir ${debugAgentDir}`;

make.js

@@ -256,8 +256,10 @@ CLI.serverBuild = async function(/** @type {{ task: string }} */ argv) {
     {
         const makeOptions = fileToJson(makeOptionsPath);
 
+        console.log("Hello " + argv)
+
         // Verify generated files across tasks are up-to-date
-        util.processGeneratedTasks(baseConfigToolPath, taskList, makeOptions, writeUpdatedsFromGenTasks, argv.sprint, argv['debug-agent-dir'], argv.includeLocalPackagesBuildConfig);
+        util.processGeneratedTasks(baseConfigToolPath, taskList, makeOptions, writeUpdatedsFromGenTasks, argv.sprint, argv['debug-agent-dir'], argv.includeLocalPackagesBuildConfig, argv.useSemverBuildConfig);
     }
 
     if (argv.includeLocalPackagesBuildConfig)