Fixes and updates to enable courtesy push for locakpackage config (#20608)

merlynomsft · web-flow · commit 871f0e787d18 · 2024-10-31T22:11:18.000Z
Fixes and updates to enable courtesy push for locakpackage config 
LocalPackage - write and consume build modified package-lock.json to _generated_buildConfigs so we avoid filtertasks over-selection to LocalPackage updates
LocalPackage - Temporarily pull in mock fix
BuildConfigGen Fix: writes to non-copied files were not validated
LocalPackage - Fix for automatically bumping globalversion.txt when needed
Increase build timeouts (to support build all = true parameter)
Fix for 'build all' parameter not working when courtesy push enabled (filterTasks fix)
Parameterized test options for courtesy push (skip tests, use test feed
diff --git a/BuildConfigGen/EnsureUpdateModeVerifier.cs b/BuildConfigGen/EnsureUpdateModeVerifier.cs
@@ -33,6 +33,25 @@ public IEnumerable<string> GetVerifyErrors(bool skipContentCheck)
 
             if (!skipContentCheck)
             {
+                foreach(var r in RedirectedToTempl)
+                {
+                    string? sourceFile;
+                    string procesed = "";
+
+                    string? tempToKeep = null;
+                    sourceFile = r.Value;
+                    procesed = $"(processed temp={sourceFile}) ";
+                    tempToKeep = sourceFile;
+
+                    string? contentError = null;
+                    contentError = CompareFile(r, sourceFile, procesed, tempToKeep, contentError);
+
+                    if (contentError is not null)
+                    {
+                        yield return contentError;
+                    }
+                }
+
                 foreach (var r in CopiedFilesToCheck)
                 {
                     string? sourceFile;
@@ -49,30 +68,44 @@ public IEnumerable<string> GetVerifyErrors(bool skipContentCheck)
                         sourceFile = r.Value;
                     }
 
-                    FileInfo fi = new FileInfo(r.Key);
+                    string? contentError = null;
+                    contentError = CompareFile(r, sourceFile, procesed, tempToKeep, contentError);
 
-                    if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase))
+                    if (contentError is not null)
                     {
-                        // resources.resjson is generated by make.js and does not need to be verified
-                        // it can differ between configs if configs have different inputs (causes verifier to fail);
+                        yield return contentError;
                     }
-                    else
+                }
+            }
+        }
+
+        private string? CompareFile(KeyValuePair<string, string> r, string sourceFile, string procesed, string? tempToKeep, string? contentError)
+        {
+            FileInfo fi = new FileInfo(r.Key);
+
+            if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase))
+            {
+                // resources.resjson is generated by make.js and does not need to be verified
+                // it can differ between configs if configs have different inputs (causes verifier to fail);
+            }
+            else
+            {
+                if (Helpers.FilesEqual(sourceFile, r.Key))
+                {
+                    // if overwrite and content match, everything is good!  Verification passed.
+                }
+                else
+                {
+                    if (tempToKeep != null)
                     {
-                        if (Helpers.FilesEqual(sourceFile, r.Key))
-                        {
-                            // if overwrite and content match, everything is good!  Verification passed.
-                        }
-                        else
-                        {
-                            if (tempToKeep != null)
-                            {
-                                this.tempsToKeep.Add(tempToKeep!);
-                            }
-                            yield return $"Content doesn't match {r.Value} {procesed}to {r.Key} (overwrite=true).  Dest file doesn't match source.";
-                        }
+                        this.tempsToKeep.Add(tempToKeep!);
                     }
+
+                    contentError = $"Content doesn't match {r.Value} {procesed}to {r.Key} (overwrite=true).  Dest file doesn't match source.";
                 }
             }
+
+            return contentError;
         }
 
         public void CleanupTempFiles()
diff --git a/BuildConfigGen/Program.cs b/BuildConfigGen/Program.cs
@@ -192,7 +192,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN
                         }
 
                         UpdateMaxPatchForSprint(taskVersionInfo[t.Value.Name], currentSprint, ref maxPatchForCurrentSprint);
-                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);
+                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: false);
                     }
 
                     if (tasksNeedingUpdates.Count > 0)
@@ -201,11 +201,14 @@ private static void MainInner(string? task, string? configs, int? currentSprintN
                     }
 
                     // bump patch number for global if any tasks invalidated or if there is no existing global version
-                    if (taskVersionInfo.Values.Any(x => x.versionsUpdated.Any()) || globalVersion is null)
+                    bool anyTaskVersionUpdated = taskVersionInfo.Values.Any(x => x.versionsUpdated.Any());
+                    bool noCurrentGlobalVersion = globalVersion is null;
+                    bool maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch = globalVersion is not null && maxPatchForCurrentSprint >= globalVersion.Patch;
+                    if (anyTaskVersionUpdated || noCurrentGlobalVersion || maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch)
                     {
                         maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1;
 
-                        Console.WriteLine($"Global version: maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1");
+                        Console.WriteLine($"Global version: maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1 anyTaskVersionUpdated={anyTaskVersionUpdated} noCurrentGlobalVersion={noCurrentGlobalVersion} maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch={maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch}");
                     }
 
                     Console.WriteLine($"Global version update: globalVersion = {globalVersion} maxPatchForCurrentSprint={maxPatchForCurrentSprint}");
@@ -218,7 +221,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN
                         IEnumerable<string> configsList = FilterConfigsForTask(configs, t);
                         HashSet<Config.ConfigRecord> targetConfigs = GetConfigRecords(configsList, writeUpdates);
                         UpdateVersionsForTask(t.Value.Name, taskVersionInfo[t.Value.Name], targetConfigs, currentSprint, globalVersionPath, globalVersion, generatedFolder);
-                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);
+                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: true);
                     }
                 }
 
@@ -264,7 +267,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN
                         HashSet<Config.ConfigRecord> targetConfigs = GetConfigRecords(configsList, writeUpdates);
 
                         UpdateVersionsGlobal(t.Value.Name, taskVersionInfo[t.Value.Name], targetConfigs, globalVersion);
-                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);
+                        CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: true);
                     }
                 }
 
@@ -335,15 +338,25 @@ private static IEnumerable<string> FilterConfigsForTask(string? configs, KeyValu
             return configsList;
         }
 
-        private static void CheckForDuplicates(string task, Dictionary<Config.ConfigRecord, TaskVersion> configTaskVersionMapping)
+        private static void CheckForDuplicates(string task, Dictionary<Config.ConfigRecord, TaskVersion> configTaskVersionMapping, bool checkGlobalVersion)
         {
-            var duplicateVersions = configTaskVersionMapping.GroupBy(x => x.Value).Select(x => new { version = x.Key, configName = String.Join(",", x.Select(x => x.Key.name)), count = x.Count() }).Where(x => x.count > 1);
+            var duplicateVersions = configTaskVersionMapping
+                .Where(x => checkGlobalVersion || !x.Key.useGlobalVersion)
+                .GroupBy(x => x.Value)
+                .Select(x => new { version = x.Key, hasGlobal = x.Where(x => x.Key.useGlobalVersion).Any(), configName = String.Join(",", x.Select(x => x.Key.name)), count = x.Count() }).Where(x => x.count > 1);
             if (duplicateVersions.Any())
             {
                 StringBuilder dupConfigsStr = new StringBuilder();
                 foreach (var x in duplicateVersions)
                 {
-                    dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}");
+                    if (x.hasGlobal)
+                    {
+                        dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}.  To fix, check-in globalversion.txt change generated by running 'node make.js build --task {task}   --includeLocalPackagesBuildConfig'");
+                    }
+                    else
+                    {
+                        dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}");
+                    }
                 }
 
                 throw new Exception(dupConfigsStr.ToString());
@@ -549,7 +562,7 @@ private static void MainUpdateTask(
 
                         if (config.enableBuildConfigOverrides)
                         {
-                            EnsureBuildConfigFileOverrides(config, taskTargetPath);
+                            EnsureBuildConfigFileOverrides(config, taskTargetPath, generatedFolder, task);
                         }
 
                         try
@@ -600,7 +613,7 @@ private static void MainUpdateTask(
 
                                 if (config.enableBuildConfigOverrides)
                                 {
-                                    CopyConfigOverrides(gitRootPath, taskTargetPath, taskOutput, config);
+                                    CopyConfigOverrides(gitRootPath, taskTargetPath, taskOutput, config, generatedFolder, task);
                                 }
 
                                 // if some files aren't present in destination, stop as following code assumes they're present and we'll just get a FileNotFoundException
@@ -620,7 +633,7 @@ private static void MainUpdateTask(
 
                             if (config.isNode)
                             {
-                                GetBuildConfigFileOverridePaths(config, taskTargetPath, out string configTaskPath, out string readmePath);
+                                GetBuildConfigFileOverridePaths(config, taskTargetPath, out string configTaskPath, out string readmePath, generatedFolder, task);
 
                                 string buildConfigPackageJsonPath = Path.Combine(taskTargetPath, buildConfigs, configTaskPath, "package.json");
 
@@ -781,15 +794,15 @@ private static bool HasTaskInputContainsPreprocessorInstructions(string gitRootP
             return hasPreprocessorDirectives;
         }
 
-        private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, string taskTargetPath)
+        private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, string taskTargetPath, string generatedFolder, string taskName)
         {
             if (!config.enableBuildConfigOverrides)
             {
                 throw new Exception("BUG: should not get here: !config.enableBuildConfigOverrides");
             }
 
             string path, readmeFile;
-            GetBuildConfigFileOverridePaths(config, taskTargetPath, out path, out readmeFile);
+            GetBuildConfigFileOverridePaths(config, taskTargetPath, out path, out readmeFile, generatedFolder, taskName);
 
             if (!Directory.Exists(path))
             {
@@ -799,7 +812,7 @@ private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, s
             ensureUpdateModeVerifier!.WriteAllText(readmeFile, "Place files overridden for this config in this directory", suppressValidationErrorIfTargetPathDoesntExist: !Knob.Default.SourceDirectoriesMustContainPlaceHolders);
         }
 
-        private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config, string taskTargetPath, out string path, out string readmeFile)
+        private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config, string taskTargetPath, out string path, out string readmeFile, string generatedFolder, string taskName)
         {
             string directoryName = config.name;
 
@@ -813,19 +826,28 @@ private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config,
                 directoryName = config.overriddenDirectoryName;
             }
 
-            path = Path.Combine(taskTargetPath, buildConfigs, directoryName);
-            readmeFile = Path.Combine(taskTargetPath, buildConfigs, directoryName, filesOverriddenForConfigGoHereReadmeTxt);
+            if (config.useGlobalVersion)
+            {
+                // for global version, place artifacts in _generated (such as package-lock)
+                path = Path.Combine(generatedFolder, buildConfigs, taskName, directoryName);
+                readmeFile = Path.Combine(generatedFolder, buildConfigs, taskName, directoryName, filesOverriddenForConfigGoHereReadmeTxt);
+            }
+            else
+            {
+                path = Path.Combine(taskTargetPath, buildConfigs, directoryName);
+                readmeFile = Path.Combine(taskTargetPath, buildConfigs, directoryName, filesOverriddenForConfigGoHereReadmeTxt);
+            }
         }
 
-        private static void CopyConfigOverrides(string gitRootPath, string taskTargetPath, string taskOutput, Config.ConfigRecord config)
+        private static void CopyConfigOverrides(string gitRootPath, string taskTargetPath, string taskOutput, Config.ConfigRecord config, string generatedFolder, string taskName)
         {
             if (!config.enableBuildConfigOverrides)
             {
                 throw new Exception("BUG: should not get here: !config.enableBuildConfigOverrides");
             }
 
             string overridePathForBuildConfig;
-            GetBuildConfigFileOverridePaths(config, taskTargetPath, out overridePathForBuildConfig, out _);
+            GetBuildConfigFileOverridePaths(config, taskTargetPath, out overridePathForBuildConfig, out _, generatedFolder, taskName);
 
             bool doCopy;
             if (Knob.Default.SourceDirectoriesMustContainPlaceHolders)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,6 +33,14 @@ parameters:
   displayName: Flag to update LocalPackages buildconfig (for testing, this will be made  default later)
   type: boolean
   default: false # note: keep in sync with ci\ci-test-tasks\canary-tests-v2.yml
+- name: skip_tests
+  displayName: skipTests (Not for production use)
+  type: boolean
+  default: false
+- name: publishToDistributedTaskTest
+  displayName: Publish to test feed (DistributedTasks-test), for infrastucture testing
+  type: boolean
+  default: false  
 
 variables:
 - name: currentDate
@@ -55,6 +63,16 @@ variables:
     value: '1'
   ${{ else }}:
     value: ''
+- name: tasksSkipTests
+  ${{ if eq(parameters.skip_tests, true) }}:
+    value: 'true'
+  ${{ else }}:
+    value: 'false'
+- name: DEPLOY_ALL_TASKSVAR
+  ${{ if eq(parameters.deploy_all_tasks, true) }}:
+    value: 'true'
+  ${{ else }}:
+    value: 'false'
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
@@ -86,7 +104,7 @@ extends:
       - job: build_all_windows
         displayName: Build all tasks (Windows)
         condition: eq(variables.os, 'Windows_NT')
-        timeoutInMinutes: 360
+        timeoutInMinutes: 1440 # AntiMalware takes 3 hours to scan tasks.zip
         pool:
           name: 1ES-ABTT-Shared-Pool
           image: abtt-windows-2022
@@ -111,6 +129,7 @@ extends:
       # Publish
       - job: publish
         displayName: Publish
+        timeoutInMinutes: 360
         dependsOn:
         - build_all_windows
         condition: and(succeeded(), ne(variables['build.reason'], 'PullRequest'))
@@ -154,7 +173,10 @@ extends:
           - output: nuget
             packagesToPush:  '$(Build.SourcesDirectory)/IndividualNugetPackagesDownloaded/IndividualNugetPackages/*/*.nupkg'
             packageParentPath: '$(Build.SourcesDirectory)'
-            publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/e10d0795-57cd-4d7f-904e-5f39703cb096'
+            ${{ if eq(parameters.publishToDistributedTaskTest, true) }}:
+              publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/9d34d871-8032-4e10-a34a-c7a01e125865'
+            ${{ else }}:
+              publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/e10d0795-57cd-4d7f-904e-5f39703cb096'
             nuGetFeedType: internal
             displayName: Push Nuget package
             allowPackageConflicts: $(COURTESY_PUSH)
diff --git a/ci/build-all-steps.yml b/ci/build-all-steps.yml
@@ -161,10 +161,10 @@ steps:
 # Test
 - script: node make.js test
   displayName: Run tests
-  condition: and(succeeded(), ne(variables['numTasks'], 0))
+  condition: and(succeeded(), ne(variables['numTasks'], 0), ne(variables['tasksSkipTests'], 'true'))
 - script: node make.js testLegacy --task "$(getTaskPattern.task_pattern)"
   displayName: Legacy tests with node 6
-  condition: and(succeeded(), ne(variables['numTasks'], 0))
+  condition: and(succeeded(), ne(variables['numTasks'], 0), ne(variables['tasksSkipTests'], 'true'))
 
 # Publish code coverage result
 - task: PublishCodeCoverageResults@1
diff --git a/ci/build-single-jobs.yml b/ci/build-single-jobs.yml
@@ -9,6 +9,10 @@ parameters:
   displayName: Enable CodeQL for run
   type: boolean
   default: false
+- name: publishToDistributedTaskTest
+  displayName: Publish to test feed (DistributedTasks-test), for infrastucture testing
+  type: boolean
+  default: false
 
 jobs:
 # Build Single Task and stage hotfix
@@ -32,7 +36,10 @@ jobs:
       - output: nuget
         packagesToPush:  '$(Build.SourcesDirectory)/nuget-packages/*/*.nupkg'
         packageParentPath: '$(Build.SourcesDirectory)'
-        publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/e10d0795-57cd-4d7f-904e-5f39703cb096'
+        ${{ if eq(parameters.publishToDistributedTaskTest, true) }}:
+          publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/9d34d871-8032-4e10-a34a-c7a01e125865'
+        ${{ else }}:
+          publishVstsFeed: 'c86767d8-af79-4303-a7e6-21da0ba435e2/e10d0795-57cd-4d7f-904e-5f39703cb096'
         nuGetFeedType: internal
         displayName: Push Nuget package
         allowPackageConflicts: $(COURTESY_PUSH)
diff --git a/ci/filter-tasks.js b/ci/filter-tasks.js
@@ -222,6 +222,7 @@ var setTaskVariables = function(tasks, tasksForDowngradingCheck) {
 var buildReason = process.env['BUILD_REASON'].toLowerCase();
 var forceCourtesyPush = process.env['FORCE_COURTESY_PUSH'] && process.env['FORCE_COURTESY_PUSH'].toLowerCase() === 'true';
 var taskNameIsSet = process.env['TASKNAMEISSET'] && process.env['TASKNAMEISSET'].toLowerCase() === 'true';
+var deployAllTasks = process.env['DEPLOY_ALL_TASKSVAR'] && process.env['DEPLOY_ALL_TASKSVAR'].toLowerCase() === 'true';
 
 if (taskNameIsSet) {
     var taskName = process.env['TASKNAME'];
@@ -240,7 +241,9 @@ const ciBuildReasonList = [AzpBuildReason.Individualci, AzpBuildReason.Batchedci
 
 async function filterTasks () {
     try {
-        if (ciBuildReasonList.includes(buildReason) || (forceCourtesyPush && !taskNameIsSet)) {
+        if (deployAllTasks) {
+            setTaskVariables(makeOptions.tasks, makeOptions.tasks);
+        } else if (ciBuildReasonList.includes(buildReason) || (forceCourtesyPush && !taskNameIsSet)) {
             // If CI, we will compare any tasks that have updated versions.
             const tasks = await getTasksToBuildForCI();
             setTaskVariables(tasks, tasks);
diff --git a/make-util.js b/make-util.js
diff --git a/make.js b/make.js

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`UpdateMaxPatchForSprint(taskVersionInfo[t.Value.Name], currentSprint, ref maxPatchForCurrentSprint);`
`195`		`- CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);`
	`195`	`+ CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: false);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`if (tasksNeedingUpdates.Count > 0)`
`@@ -201,11 +201,14 @@ private static void MainInner(string? task, string? configs, int? currentSprintN`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// bump patch number for global if any tasks invalidated or if there is no existing global version`
`204`		`- if (taskVersionInfo.Values.Any(x => x.versionsUpdated.Any()) \|\| globalVersion is null)`
	`204`	`+ bool anyTaskVersionUpdated = taskVersionInfo.Values.Any(x => x.versionsUpdated.Any());`
	`205`	`+ bool noCurrentGlobalVersion = globalVersion is null;`
	`206`	`+ bool maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch = globalVersion is not null && maxPatchForCurrentSprint >= globalVersion.Patch;`
	`207`	`+ if (anyTaskVersionUpdated \|\| noCurrentGlobalVersion \|\| maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch)`
`205`	`208`	`{`
`206`	`209`	`maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1;`
`207`	`210`
`208`		`- Console.WriteLine($"Global version: maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1");`
	`211`	`+ Console.WriteLine($"Global version: maxPatchForCurrentSprint = maxPatchForCurrentSprint + 1 anyTaskVersionUpdated={anyTaskVersionUpdated} noCurrentGlobalVersion={noCurrentGlobalVersion} maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch={maxPatchForCurrentSprintGreaterOrEqualToGlobalPatch}");`
`209`	`212`	`}`
`210`	`213`
`211`	`214`	`Console.WriteLine($"Global version update: globalVersion = {globalVersion} maxPatchForCurrentSprint={maxPatchForCurrentSprint}");`
`@@ -218,7 +221,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN`
`218`	`221`	`IEnumerable<string> configsList = FilterConfigsForTask(configs, t);`
`219`	`222`	`HashSet<Config.ConfigRecord> targetConfigs = GetConfigRecords(configsList, writeUpdates);`
`220`	`223`	`UpdateVersionsForTask(t.Value.Name, taskVersionInfo[t.Value.Name], targetConfigs, currentSprint, globalVersionPath, globalVersion, generatedFolder);`
`221`		`- CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);`
	`224`	`+ CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: true);`
`222`	`225`	`}`
`223`	`226`	`}`
`224`	`227`
`@@ -264,7 +267,7 @@ private static void MainInner(string? task, string? configs, int? currentSprintN`
`264`	`267`	`HashSet<Config.ConfigRecord> targetConfigs = GetConfigRecords(configsList, writeUpdates);`
`265`	`268`
`266`	`269`	`UpdateVersionsGlobal(t.Value.Name, taskVersionInfo[t.Value.Name], targetConfigs, globalVersion);`
`267`		`- CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping);`
	`270`	`+ CheckForDuplicates(t.Value.Name, taskVersionInfo[t.Value.Name].configTaskVersionMapping, checkGlobalVersion: true);`
`268`	`271`	`}`
`269`	`272`	`}`
`270`	`273`
`@@ -335,15 +338,25 @@ private static IEnumerable<string> FilterConfigsForTask(string? configs, KeyValu`
`335`	`338`	`return configsList;`
`336`	`339`	`}`
`337`	`340`
`338`		`- private static void CheckForDuplicates(string task, Dictionary<Config.ConfigRecord, TaskVersion> configTaskVersionMapping)`
	`341`	`+ private static void CheckForDuplicates(string task, Dictionary<Config.ConfigRecord, TaskVersion> configTaskVersionMapping, bool checkGlobalVersion)`
`339`	`342`	`{`
`340`		`- var duplicateVersions = configTaskVersionMapping.GroupBy(x => x.Value).Select(x => new { version = x.Key, configName = String.Join(",", x.Select(x => x.Key.name)), count = x.Count() }).Where(x => x.count > 1);`
	`343`	`+ var duplicateVersions = configTaskVersionMapping`
	`344`	`+ .Where(x => checkGlobalVersion \|\| !x.Key.useGlobalVersion)`
	`345`	`+ .GroupBy(x => x.Value)`
	`346`	`+ .Select(x => new { version = x.Key, hasGlobal = x.Where(x => x.Key.useGlobalVersion).Any(), configName = String.Join(",", x.Select(x => x.Key.name)), count = x.Count() }).Where(x => x.count > 1);`
`341`	`347`	`if (duplicateVersions.Any())`
`342`	`348`	`{`
`343`	`349`	`StringBuilder dupConfigsStr = new StringBuilder();`
`344`	`350`	`foreach (var x in duplicateVersions)`
`345`	`351`	`{`
`346`		`- dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}");`
	`352`	`+ if (x.hasGlobal)`
	`353`	`+ {`
	`354`	`+ dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}. To fix, check-in globalversion.txt change generated by running 'node make.js build --task {task} --includeLocalPackagesBuildConfig'");`
	`355`	`+ }`
	`356`	`+ else`
	`357`	`+ {`
	`358`	`+ dupConfigsStr.AppendLine($"task={task} version={x.version} specified in multiple configName={x.configName} config count={x.count}");`
	`359`	`+ }`
`347`	`360`	`}`
`348`	`361`
`349`	`362`	`throw new Exception(dupConfigsStr.ToString());`
`@@ -549,7 +562,7 @@ private static void MainUpdateTask(`
`549`	`562`
`550`	`563`	`if (config.enableBuildConfigOverrides)`
`551`	`564`	`{`
`552`		`- EnsureBuildConfigFileOverrides(config, taskTargetPath);`
	`565`	`+ EnsureBuildConfigFileOverrides(config, taskTargetPath, generatedFolder, task);`
`553`	`566`	`}`
`554`	`567`
`555`	`568`	`try`
`@@ -600,7 +613,7 @@ private static void MainUpdateTask(`
`600`	`613`
`601`	`614`	`if (config.enableBuildConfigOverrides)`
`602`	`615`	`{`
`603`		`- CopyConfigOverrides(gitRootPath, taskTargetPath, taskOutput, config);`
	`616`	`+ CopyConfigOverrides(gitRootPath, taskTargetPath, taskOutput, config, generatedFolder, task);`
`604`	`617`	`}`
`605`	`618`
`606`	`619`	`// if some files aren't present in destination, stop as following code assumes they're present and we'll just get a FileNotFoundException`
`@@ -620,7 +633,7 @@ private static void MainUpdateTask(`
`620`	`633`
`621`	`634`	`if (config.isNode)`
`622`	`635`	`{`
`623`		`- GetBuildConfigFileOverridePaths(config, taskTargetPath, out string configTaskPath, out string readmePath);`
	`636`	`+ GetBuildConfigFileOverridePaths(config, taskTargetPath, out string configTaskPath, out string readmePath, generatedFolder, task);`
`624`	`637`
`625`	`638`	`string buildConfigPackageJsonPath = Path.Combine(taskTargetPath, buildConfigs, configTaskPath, "package.json");`
`626`	`639`
`@@ -781,15 +794,15 @@ private static bool HasTaskInputContainsPreprocessorInstructions(string gitRootP`
`781`	`794`	`return hasPreprocessorDirectives;`
`782`	`795`	`}`
`783`	`796`
`784`		`- private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, string taskTargetPath)`
	`797`	`+ private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, string taskTargetPath, string generatedFolder, string taskName)`
`785`	`798`	`{`
`786`	`799`	`if (!config.enableBuildConfigOverrides)`
`787`	`800`	`{`
`788`	`801`	`throw new Exception("BUG: should not get here: !config.enableBuildConfigOverrides");`
`789`	`802`	`}`
`790`	`803`
`791`	`804`	`string path, readmeFile;`
`792`		`- GetBuildConfigFileOverridePaths(config, taskTargetPath, out path, out readmeFile);`
	`805`	`+ GetBuildConfigFileOverridePaths(config, taskTargetPath, out path, out readmeFile, generatedFolder, taskName);`
`793`	`806`
`794`	`807`	`if (!Directory.Exists(path))`
`795`	`808`	`{`
`@@ -799,7 +812,7 @@ private static void EnsureBuildConfigFileOverrides(Config.ConfigRecord config, s`
`799`	`812`	`ensureUpdateModeVerifier!.WriteAllText(readmeFile, "Place files overridden for this config in this directory", suppressValidationErrorIfTargetPathDoesntExist: !Knob.Default.SourceDirectoriesMustContainPlaceHolders);`
`800`	`813`	`}`
`801`	`814`
`802`		`- private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config, string taskTargetPath, out string path, out string readmeFile)`
	`815`	`+ private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config, string taskTargetPath, out string path, out string readmeFile, string generatedFolder, string taskName)`
`803`	`816`	`{`
`804`	`817`	`string directoryName = config.name;`
`805`	`818`
`@@ -813,19 +826,28 @@ private static void GetBuildConfigFileOverridePaths(Config.ConfigRecord config,`
`813`	`826`	`directoryName = config.overriddenDirectoryName;`
`814`	`827`	`}`
`815`	`828`
`816`		`- path = Path.Combine(taskTargetPath, buildConfigs, directoryName);`
`817`		`- readmeFile = Path.Combine(taskTargetPath, buildConfigs, directoryName, filesOverriddenForConfigGoHereReadmeTxt);`
	`829`	`+ if (config.useGlobalVersion)`
	`830`	`+ {`
	`831`	`+ // for global version, place artifacts in _generated (such as package-lock)`
	`832`	`+ path = Path.Combine(generatedFolder, buildConfigs, taskName, directoryName);`
	`833`	`+ readmeFile = Path.Combine(generatedFolder, buildConfigs, taskName, directoryName, filesOverriddenForConfigGoHereReadmeTxt);`
	`834`	`+ }`
	`835`	`+ else`
	`836`	`+ {`
	`837`	`+ path = Path.Combine(taskTargetPath, buildConfigs, directoryName);`
	`838`	`+ readmeFile = Path.Combine(taskTargetPath, buildConfigs, directoryName, filesOverriddenForConfigGoHereReadmeTxt);`
	`839`	`+ }`
`818`	`840`	`}`
`819`	`841`
`820`		`- private static void CopyConfigOverrides(string gitRootPath, string taskTargetPath, string taskOutput, Config.ConfigRecord config)`
	`842`	`+ private static void CopyConfigOverrides(string gitRootPath, string taskTargetPath, string taskOutput, Config.ConfigRecord config, string generatedFolder, string taskName)`
`821`	`843`	`{`
`822`	`844`	`if (!config.enableBuildConfigOverrides)`
`823`	`845`	`{`
`824`	`846`	`throw new Exception("BUG: should not get here: !config.enableBuildConfigOverrides");`
`825`	`847`	`}`
`826`	`848`
`827`	`849`	`string overridePathForBuildConfig;`
`828`		`- GetBuildConfigFileOverridePaths(config, taskTargetPath, out overridePathForBuildConfig, out _);`
	`850`	`+ GetBuildConfigFileOverridePaths(config, taskTargetPath, out overridePathForBuildConfig, out _, generatedFolder, taskName);`
`829`	`851`
`830`	`852`	`bool doCopy;`
`831`	`853`	`if (Knob.Default.SourceDirectoriesMustContainPlaceHolders)`