Fixing NuGetToolInstallerV0 #1793821 (#14154)

Author: phil-hodgson

Tasks/Common/packaging-common/Tests/NuGetMockHelper.ts

@@ -11,7 +11,7 @@ export function registerNugetToolGetterMock(tmr: tmrm.TaskMockRunner) {
             return version;
         },
         getMSBuildVersionString: function() {
-            return "1.0.0";
+            return "1.0.0.0";
         },
         FORCE_NUGET_4_0_0: 'FORCE_NUGET_4_0_0',
         NUGET_VERSION_4_0_0: '4.0.0',
@@ -31,7 +31,7 @@ export function registerNugetToolGetterMockUnix(tmr: tmrm.TaskMockRunner) {
             return version;
         },
         getMSBuildVersionString: function() {
-            return "1.0.0";
+            return "1.0.0.0";
         },
         FORCE_NUGET_4_0_0: 'FORCE_NUGET_4_0_0',
         NUGET_VERSION_4_0_0: '4.0.0',

Tasks/NuGetToolInstallerV0/nugettoolinstaller.ts

@@ -11,13 +11,13 @@ async function run() {
     let nugetVersion: string;
     let checkLatest: boolean;
     let nuGetPath: string;
-    let msbuildSemVer: string;
+    let msbuildSemVer: semver.SemVer;
     try {
         taskLib.setResourcePath(path.join(__dirname, "task.json"));
 
         let versionSpec = taskLib.getInput('versionSpec', false);
         if (!versionSpec) {
-            msbuildSemVer = await nuGetGetter.getMSBuildVersionString();
+            msbuildSemVer = await nuGetGetter.getMSBuildVersion();
             if (msbuildSemVer && semver.gte(msbuildSemVer, '16.8.0')) {
                 taskLib.debug('Defaulting to 5.8.0 for msbuild version: ' + msbuildSemVer);
                 versionSpec = '5.8.0';
@@ -41,22 +41,23 @@ async function run() {
         console.error('ERR:' + error.message);
         taskLib.setResult(taskLib.TaskResult.Failed, "");
     } finally {
-        _logNugetToolInstallerStartupVariables(nugetVersion, checkLatest, nuGetPath, msbuildSemVer)
+        _logNugetToolInstallerStartupVariables(nugetVersion, checkLatest, nuGetPath, msbuildSemVer);
     }
 }
 
-function _logNugetToolInstallerStartupVariables(nugetVersion: string, 
-    checkLatest: boolean, 
+function _logNugetToolInstallerStartupVariables(
+    nugetVersion: string,
+    checkLatest: boolean,
     nuGetPath: string,
-    msBuildSemVer: any) {
+    msbuildSemVer: semver.SemVer) {
     try {
         const telem = {
             "NUGET_EXE_TOOL_PATH_ENV_VAR": taskLib.getVariable(nuGetGetter.NUGET_EXE_TOOL_PATH_ENV_VAR),
             "isCheckLatestEnabled": checkLatest,
             "requestedNuGetVersionSpec": taskLib.getInput('versionSpec', false),
             "nuGetPath": nuGetPath,
             "nugetVersion": nugetVersion,
-            "msBuildVersion": msBuildSemVer
+            "msBuildVersion": msbuildSemVer && msbuildSemVer.toString()
         };
         telemetry.emitTelemetry("Packaging", "NuGetToolInstaller", telem);
     } catch (err) {

Tasks/NuGetToolInstallerV0/task.json

@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 179,
-        "Patch": 0
+        "Patch": 1
     },
     "preview": false,
     "satisfies": [

Tasks/NuGetToolInstallerV0/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 179,
-    "Patch": 0
+    "Patch": 1
   },
   "preview": false,
   "satisfies": [
@@ -74,4 +74,4 @@
     "NGCommon_UnableToFindTool": "ms-resource:loc.messages.NGCommon_UnableToFindTool",
     "Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion"
   }
-}
+}

common-npm-packages/packaging-common/Tests/NuGetMockHelper.ts

@@ -11,7 +11,7 @@ export function registerNugetToolGetterMock(tmr: tmrm.TaskMockRunner) {
             return version;
         },
         getMSBuildVersionString: function() {
-            return "1.0.0";
+            return "1.0.0.0";
         },
         FORCE_NUGET_4_0_0: 'FORCE_NUGET_4_0_0',
         NUGET_VERSION_4_0_0: '4.0.0',
@@ -31,7 +31,7 @@ export function registerNugetToolGetterMockUnix(tmr: tmrm.TaskMockRunner) {
             return version;
         },
         getMSBuildVersionString: function() {
-            return "1.0.0";
+            return "1.0.0.0";
         },
         FORCE_NUGET_4_0_0: 'FORCE_NUGET_4_0_0',
         NUGET_VERSION_4_0_0: '4.0.0',