Merge conflict fixes

Sanju Yadav · Sanju Yadav · commit 4a31e8494e84 · 2025-08-04T22:02:53.000+05:30
diff --git a/Tasks/PowerShellV2/package-lock.json b/Tasks/PowerShellV2/package-lock.json
diff --git a/Tasks/PowerShellV2/task.json b/Tasks/PowerShellV2/task.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 247,
-    "Patch": 1
+    "Minor": 259,
+    "Patch": 0
   },
   "releaseNotes": "Script task consistency. Added support for macOS and Linux.",
   "minimumAgentVersion": "2.115.0",
diff --git a/Tasks/PowerShellV2/task.loc.json b/Tasks/PowerShellV2/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 247,
-    "Patch": 1
+    "Minor": 259,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.115.0",
diff --git a/make.js b/make.js
@@ -256,8 +256,6 @@ 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, argv.useSemverBuildConfig);
     }

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,6 @@ CLI.serverBuild = async function(/** @type {{ task: string }} */ argv) {`
`256`	`256`	`{`
`257`	`257`	`const makeOptions = fileToJson(makeOptionsPath);`
`258`	`258`
`259`		`- console.log("Hello " + argv)`
`260`		`-`
`261`	`259`	`// Verify generated files across tasks are up-to-date`
`262`	`260`	`util.processGeneratedTasks(baseConfigToolPath, taskList, makeOptions, writeUpdatedsFromGenTasks, argv.sprint, argv['debug-agent-dir'], argv.includeLocalPackagesBuildConfig, argv.useSemverBuildConfig);`
`263`	`261`	`}`