CP m205 Update NugetToolInstaller to add nuget script for unix system…

… to get the correct version (#16397) (#16421) * Update NugetToolInstaller to add nuget script for unix system to get the correct version (#16397) * Add nuget script for non windows systems to pick up the correct version from bash task * update permissions to 500 * update version for common dependent tasks * add fs.exist to not overwrite file * bump pipAuth to patch 1 * move nuget string as const * bumping DownloadGitHubNugetPackageV1 version * update version 205 patch
microsoft · Jun 7, 2022 · 3048b87 · 3048b87
1 parent 05d604b
commit 3048b87
Show file tree

Hide file tree

Showing 26 changed files with 61 additions and 27 deletions.
diff --git a/Tasks/Common/packaging-common/nuget/NuGetToolGetter.ts b/Tasks/Common/packaging-common/nuget/NuGetToolGetter.ts
@@ -4,6 +4,9 @@ import * as restm from 'typed-rest-client/RestClient';
 import * as path from 'path';
 import * as semver from 'semver';
 import * as commandHelper from './CommandHelper';
+import * as fs from "fs";
+import * as os from "os";
+
 interface INuGetTools {
     nugetexe: INuGetVersionInfo[]
 }
@@ -23,6 +26,7 @@ enum NuGetReleaseStage
 
 const NUGET_TOOL_NAME: string = 'NuGet';
 const NUGET_EXE_FILENAME: string = 'nuget.exe';
+const NUGET_SCRIPT_FILENAME: string = 'nuget';
 
 export const FORCE_NUGET_4_0_0: string  = 'FORCE_NUGET_4_0_0';
 export const NUGET_VERSION_4_0_0: string = '4.0.0';
@@ -96,9 +100,38 @@ export async function getNuGet(versionSpec: string, checkLatest?: boolean, addNu
     let fullNuGetPath: string = path.join(toolPath, NUGET_EXE_FILENAME);
     taskLib.setVariable(NUGET_EXE_TOOL_PATH_ENV_VAR, fullNuGetPath);
 
+    // create a nuget posix script for nuget exe in non-windows agents
+    if (os.platform() !== "win32") {
+        generateNugetScript(toolPath, fullNuGetPath);
+    }
+
     return fullNuGetPath;
 }
 
+function generateNugetScript(nugetToolPath: string, nugetExePath: string) {
+    var nugetScriptPath = path.join(nugetToolPath, NUGET_SCRIPT_FILENAME);
+
+    if (fs.existsSync(nugetScriptPath)) {
+        taskLib.debug(`nugetScriptPath already exist at ${nugetScriptPath}, skipped.`)
+    } else {
+        taskLib.debug(`create nugetScriptPath ${nugetScriptPath}`);
+
+        fs.writeFile(
+            nugetScriptPath,
+            `#!/bin/sh\nmono ${nugetExePath} "$@"\n`,
+            (err) => {
+                if (err) {
+                    taskLib.debug("Writing nuget script failed with error: " + err);
+                } else {
+                    // give read and execute permissions to everyone
+                    fs.chmodSync(nugetScriptPath, "500");
+                    taskLib.debug("Writing nuget script succeeded");
+                }
+            }
+        );
+    }
+}
+
 function pathExistsAsFile(path: string) {
     try {
         return taskLib.stats(path).isFile();

diff --git a/Tasks/DownloadGitHubNpmPackageV1/task.json b/Tasks/DownloadGitHubNpmPackageV1/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 1,
         "Minor": 205,
-        "Patch": 0
+        "Patch": 1
     },
     "runsOn": [
         "Agent",

diff --git a/Tasks/DownloadGitHubNpmPackageV1/task.loc.json b/Tasks/DownloadGitHubNpmPackageV1/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 205,
-    "Patch": 0
+    "Patch": 1
   },
   "runsOn": [
     "Agent",

diff --git a/Tasks/DownloadGitHubNugetPackageV1/task.json b/Tasks/DownloadGitHubNugetPackageV1/task.json
@@ -17,8 +17,8 @@
     "demands": [],
     "version": {
         "Major": 1,
-        "Minor": 200,
-        "Patch": 1
+        "Minor": 205,
+        "Patch": 0
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet restore",

diff --git a/Tasks/DownloadGitHubNugetPackageV1/task.loc.json b/Tasks/DownloadGitHubNugetPackageV1/task.loc.json
@@ -17,8 +17,8 @@
   "demands": [],
   "version": {
     "Major": 1,
-    "Minor": 200,
-    "Patch": 1
+    "Minor": 205,
+    "Patch": 0
   },
   "minimumAgentVersion": "2.115.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/NpmAuthenticateV0/task.json b/Tasks/NpmAuthenticateV0/task.json
@@ -9,7 +9,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NpmAuthenticateV0/task.loc.json b/Tasks/NpmAuthenticateV0/task.loc.json
@@ -9,7 +9,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/NuGetCommandV2/task.json b/Tasks/NuGetCommandV2/task.json
@@ -9,7 +9,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NuGetCommandV2/task.loc.json b/Tasks/NuGetCommandV2/task.loc.json
@@ -9,7 +9,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/NuGetInstallerV0/task.json b/Tasks/NuGetInstallerV0/task.json
@@ -9,7 +9,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NuGetInstallerV0/task.loc.json b/Tasks/NuGetInstallerV0/task.loc.json
@@ -9,7 +9,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/NuGetPublisherV0/task.json b/Tasks/NuGetPublisherV0/task.json
@@ -9,7 +9,7 @@
     "author": "Lawrence Gripper",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NuGetPublisherV0/task.loc.json b/Tasks/NuGetPublisherV0/task.loc.json
@@ -9,7 +9,7 @@
   "author": "Lawrence Gripper",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/NuGetRestoreV1/nugetinstaller.ts b/Tasks/NuGetRestoreV1/nugetinstaller.ts
@@ -67,10 +67,11 @@ async function main(): Promise<void> {
         // Getting NuGet
         tl.debug('Getting NuGet');
         try {
-            nuGetPath = process.env[nuGetGetter.NUGET_EXE_TOOL_PATH_ENV_VAR];
+            nuGetPath = tl.getVariable(nuGetGetter.NUGET_EXE_TOOL_PATH_ENV_VAR);
             if (!nuGetPath){
                 nuGetPath = await nuGetGetter.getNuGet("4.0.0");
             }
+            tl.debug(`Using NuGet in path: ${nuGetPath}`);
         }
         catch (error) {
             tl.setResult(tl.TaskResult.Failed, error.message);

diff --git a/Tasks/NuGetRestoreV1/task.json b/Tasks/NuGetRestoreV1/task.json
@@ -9,7 +9,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 198,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NuGetRestoreV1/task.loc.json b/Tasks/NuGetRestoreV1/task.loc.json
@@ -9,7 +9,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 198,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/NuGetToolInstallerV0/task.json b/Tasks/NuGetToolInstallerV0/task.json
@@ -14,7 +14,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "preview": false,

diff --git a/Tasks/NuGetToolInstallerV0/task.loc.json b/Tasks/NuGetToolInstallerV0/task.loc.json
@@ -14,7 +14,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "preview": false,

diff --git a/Tasks/NuGetToolInstallerV1/task.json b/Tasks/NuGetToolInstallerV1/task.json
@@ -14,7 +14,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "preview": false,

diff --git a/Tasks/NuGetToolInstallerV1/task.loc.json b/Tasks/NuGetToolInstallerV1/task.loc.json
@@ -14,7 +14,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "preview": false,

diff --git a/Tasks/NuGetV0/task.json b/Tasks/NuGetV0/task.json
@@ -10,7 +10,7 @@
     "helpMarkDown": "",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/NuGetV0/task.loc.json b/Tasks/NuGetV0/task.loc.json
@@ -10,7 +10,7 @@
   "helpMarkDown": "ms-resource:loc.helpMarkDown",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/PipAuthenticateV0/task.json b/Tasks/PipAuthenticateV0/task.json
@@ -9,7 +9,7 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/PipAuthenticateV0/task.loc.json b/Tasks/PipAuthenticateV0/task.loc.json
@@ -9,7 +9,7 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [

diff --git a/Tasks/TwineAuthenticateV0/task.json b/Tasks/TwineAuthenticateV0/task.json
@@ -9,7 +9,7 @@
     "category": "Package",
     "version": {
         "Major": 0,
-        "Minor": 202,
+        "Minor": 205,
         "Patch": 0
     },
     "runsOn": [

diff --git a/Tasks/TwineAuthenticateV0/task.loc.json b/Tasks/TwineAuthenticateV0/task.loc.json
@@ -9,7 +9,7 @@
   "category": "Package",
   "version": {
     "Major": 0,
-    "Minor": 202,
+    "Minor": 205,
     "Patch": 0
   },
   "runsOn": [