Skip to content

Fixing NuGetToolInstallerV0 #1793821 #14154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 31, 2020
Merged

Fixing NuGetToolInstallerV0 #1793821 #14154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tasks/Common/packaging-common/Tests/NuGetMockHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
15 changes: 8 additions & 7 deletions Tasks/NuGetToolInstallerV0/nugettoolinstaller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"version": {
"Major": 0,
"Minor": 179,
"Patch": 0
"Patch": 1
},
"preview": false,
"satisfies": [
Expand Down
4 changes: 2 additions & 2 deletions Tasks/NuGetToolInstallerV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"version": {
"Major": 0,
"Minor": 179,
"Patch": 0
"Patch": 1
},
"preview": false,
"satisfies": [
Expand Down Expand Up @@ -74,4 +74,4 @@
"NGCommon_UnableToFindTool": "ms-resource:loc.messages.NGCommon_UnableToFindTool",
"Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion"
}
}
}
4 changes: 2 additions & 2 deletions common-npm-packages/packaging-common/Tests/NuGetMockHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down