[DockerComposeV0] - Merged generated task to source task (#19117)

- Removed generated task - Updated task.json - Updated task.loc.json - Updated make-options.json
microsoft · Oct 16, 2023 · 262e072 · 262e072
1 parent b4a68c7
commit 262e072
Show file tree

Hide file tree

Showing 81 changed files with 89 additions and 11,054 deletions.
diff --git a/Tasks/DockerComposeV0/_buildConfigs/Node16/FilesOverriddenForConfigGoHereREADME.txt b/Tasks/DockerComposeV0/_buildConfigs/Node16/FilesOverriddenForConfigGoHereREADME.txt
diff --git a/Tasks/DockerComposeV0/_buildConfigs/Node16/make.json b/Tasks/DockerComposeV0/_buildConfigs/Node16/make.json
diff --git a/Tasks/DockerComposeV0/_buildConfigs/Node16/package-lock.json b/Tasks/DockerComposeV0/_buildConfigs/Node16/package-lock.json
diff --git a/Tasks/DockerComposeV0/_buildConfigs/Node16/package.json b/Tasks/DockerComposeV0/_buildConfigs/Node16/package.json
diff --git a/Tasks/DockerComposeV0/dockercomposeconnection.ts b/Tasks/DockerComposeV0/dockercomposeconnection.ts
@@ -85,11 +85,7 @@ export default class DockerComposeConnection extends ContainerConnection {
         command.on("stderr", data => {
             output += data;
         });
-#if NODE16
         await this.execCommand(command, options);
-#else
-        await this.execCommand(command as unknown as tr.ToolRunner, options);
-#endif
         return output || '\n';
     }
 

diff --git a/Tasks/DockerComposeV0/make.json b/Tasks/DockerComposeV0/make.json
@@ -3,7 +3,8 @@
         {
             "items": [
                 "node_modules/azure-pipelines-tasks-docker-common/node_modules/azure-pipelines-task-lib",
-                "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib"
+                "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib",
+                "node_modules/https-proxy-agent/node_modules/agent-base"
             ],
             "options": "-Rf"
         }

diff --git a/Tasks/DockerComposeV0/package-lock.json b/Tasks/DockerComposeV0/package-lock.json
diff --git a/Tasks/DockerComposeV0/package.json b/Tasks/DockerComposeV0/package.json
@@ -1,11 +1,12 @@
 {
   "dependencies": {
-    "@types/node": "^10.17.0",
     "@types/mocha": "^5.2.7",
+    "@types/node": "^16.11.39",
     "@types/q": "^1.5.0",
-    "del": "2.2.0",
-    "azure-pipelines-task-lib": "3.3.1",
+    "agent-base": "^6.0.2",
+    "azure-pipelines-task-lib": "4.4.0",
     "azure-pipelines-tasks-docker-common": "2.225.0",
+    "del": "2.2.0",
     "esprima": "2.7.1",
     "js-yaml": "3.13.1"
   },

diff --git a/Tasks/DockerComposeV0/task.json b/Tasks/DockerComposeV0/task.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 227,
-    "Patch": 1
+    "Minor": 230,
+    "Patch": 0
   },
   "demands": [],
   "preview": "false",
@@ -338,6 +338,10 @@
     "Node10": {
       "target": "dockercompose.js",
       "argumentFormat": ""
+    },
+    "Node16": {
+      "target": "dockercompose.js",
+      "argumentFormat": ""
     }
   },
   "messages": {

diff --git a/Tasks/DockerComposeV0/task.loc.json b/Tasks/DockerComposeV0/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 227,
-    "Patch": 1
+    "Minor": 230,
+    "Patch": 0
   },
   "demands": [],
   "preview": "false",
@@ -338,6 +338,10 @@
     "Node10": {
       "target": "dockercompose.js",
       "argumentFormat": ""
+    },
+    "Node16": {
+      "target": "dockercompose.js",
+      "argumentFormat": ""
     }
   },
   "messages": {

diff --git a/Tasks/DockerComposeV0/utils.ts b/Tasks/DockerComposeV0/utils.ts
@@ -9,15 +9,9 @@ export function getFinalComposeFileName(): string {
     return ".docker-compose." + Date.now() + ".yml"
 }
 
-#if NODE16
 export function writeFileSync(filename: string, data: any, options?: { encoding?: BufferEncoding; mode?: number; flag?: string; }): void {
     fs.writeFileSync(filename, data, options);
 }
-#else
-export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void {
-    fs.writeFileSync(filename, data, options);
-}
-#endif
 
 function getTaskOutputDir(command: string): string {
     let tempDirectory = tl.getVariable('agent.tempDirectory') || os.tmpdir();
@@ -39,4 +33,4 @@ export function writeTaskOutput(commandName: string, output: string): string {
     }
 
     return taskOutputPath;
-}
+}
diff --git a/_generated/DockerComposeV0.versionmap.txt b/_generated/DockerComposeV0.versionmap.txt