Code review fixes - semantic fixes

Author: Sanju Yadav

BuildConfigGen/Program.cs

@@ -494,6 +494,7 @@ private static void GetVersions(string task, string configsString, out List<(str
             string gitRootPath = GetTasksRootPath(currentDir);
 
             string taskTargetPath = Path.Combine(gitRootPath, "Tasks", task);
+
             if (!Directory.Exists(taskTargetPath))
             {
                 throw new Exception($"expected {taskTargetPath} to exist!");
@@ -646,9 +647,6 @@ private static void MainUpdateTask(
                 // we need to ensure merges occur first, as the changes may cascade to other configs (e.g. Default), if there are multiple
                 var targetConfigsWithMergeToBaseOrderedFirst = targetConfigs.OrderBy(x => x.mergeToBase ? 0 : 1);
 
-                var defaultConfig = targetConfigs.FirstOrDefault(x => x.isDefault)
-                ?? throw new Exception($"There is no default config for task {task}");
-
                 foreach (var config in targetConfigsWithMergeToBaseOrderedFirst)
                 {
                     if (config.useGlobalVersion && !includeLocalPackagesBuildConfig)
@@ -753,6 +751,12 @@ private static void MainUpdateTask(
 
                                     if (useSemverBuildConfig && !config.mergeToBase)
                                     {
+                                        var defaultConfig = targetConfigs.FirstOrDefault(x => x.isDefault);
+                                        if (defaultConfig == null)
+                                        {
+                                            throw new Exception($"There is no default config for task {task}");
+                                        }
+                                        
                                         WriteTaskJson(taskOutput, taskVersionState, config, "task.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
                                         WriteTaskJson(taskOutput, taskVersionState, config, "task.loc.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
                                     }
@@ -1403,6 +1407,7 @@ private static void UpdateVersionsForTask(string task, TaskStateStruct taskState
                         {
                             throw new Exception($"Multiple configs for task being merged.  This is not supported.  task={task} mergingConfig.name={mergingConfig.name}");
                         }
+
                         // versionMap contains a version that needs to be merged to base
                         allConfigsMappedAndValid = false;
                         mergingConfig = config;
@@ -1521,6 +1526,7 @@ private static void UpdateVersionsForTask(string task, TaskStateStruct taskState
                         else
                         {
                             TaskVersion targetVersion;
+
                             do
                             {
                                 targetVersion = baseVersion.CloneWithPatch(baseVersion.Patch + offset);
@@ -1532,7 +1538,7 @@ private static void UpdateVersionsForTask(string task, TaskStateStruct taskState
                             {
                                 // In the first stage of refactoring, we keep different version numbers to retain the ability to rollback.
                                 // In the second stage of refactoring, we are going to use the same version, which is going to significantly reduce complexity of all this.
-                                targetVersion.Build = config.constMappingKey;
+                                targetVersion = targetVersion.CloneWithBuild(config.constMappingKey);
                             }
 
                             taskState.configTaskVersionMapping.Add(config, targetVersion);
@@ -1609,11 +1615,20 @@ private static void UpdateVersionsGlobal(string task, TaskStateStruct taskState,
             {
                 if (config.useGlobalVersion)
                 {
+                    TaskVersion versionToUse = globalVersion;
+                    
+                    if (config.abTaskReleases)
+                    {
+                        // In the first stage of refactoring, we keep different version numbers to retain the ability to rollback.
+                        // In the second stage of refactoring, we are going to use the same version, which is going to significantly reduce complexity of all this.
+                        versionToUse = globalVersion.CloneWithBuild(config.constMappingKey);
+                    }
+
                     if (taskState.configTaskVersionMapping.ContainsKey(config))
                     {
-                        if (taskState.configTaskVersionMapping[config] != globalVersion)
+                        if (taskState.configTaskVersionMapping[config] != versionToUse)
                         {
-                            taskState.configTaskVersionMapping[config] = globalVersion;
+                            taskState.configTaskVersionMapping[config] = versionToUse;
 
                             if (!taskState.versionsUpdated.Contains(config))
                             {
@@ -1623,7 +1638,7 @@ private static void UpdateVersionsGlobal(string task, TaskStateStruct taskState,
                     }
                     else
                     {
-                        taskState.configTaskVersionMapping.Add(config, globalVersion);
+                        taskState.configTaskVersionMapping.Add(config, versionToUse);
 
                         if (!taskState.versionsUpdated.Contains(config))
                         {

BuildConfigGen/TaskVersion.cs

@@ -3,10 +3,6 @@
 
 public class TaskVersion : IComparable<TaskVersion>, IEquatable<TaskVersion>
 {
-    public TaskVersion()
-    {
-    }
-
     public TaskVersion(string version)
     {
         VersionParser.ParseVersion(
@@ -56,35 +52,15 @@ private TaskVersion(TaskVersion taskVersionToClone)
         IsTest = taskVersionToClone.IsTest;
     }
 
-    public int Major
-    {
-        get;
-        set;
-    }
+    public int Major { get; }
 
-    public int Minor
-    {
-        get;
-        set;
-    }
+    public int Minor { get; }
 
-    public int Patch
-    {
-        get;
-        set;
-    }
+    public int Patch { get; }
 
-    public string? Build
-    {
-        get;
-        set;
-    }
+    public string? Build { get; }
 
-    public bool IsTest
-    {
-        get;
-        set;
-    }
+    public bool IsTest { get; }
 
     public TaskVersion Clone()
     {
@@ -106,6 +82,11 @@ public TaskVersion CloneWithMajor(int major)
         return new TaskVersion(major, Minor, Patch, Build);
     }
 
+    public TaskVersion CloneWithBuild(string? build)
+    {
+        return new TaskVersion(Major, Minor, Patch, build);
+    }
+
     public static implicit operator String(TaskVersion version)
     {
         return version.ToString();