Skip to content
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

Update NugetToolInstaller to add nuget script for unix system to get the correct version #16397

Merged
merged 12 commits into from
Jun 6, 2022
Merged

Update NugetToolInstaller to add nuget script for unix system to get the correct version #16397

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f8fa41e
Add nuget script for non windows systems to pick up the correct versi…
jiaw37 Jun 1, 2022
e5dfaa3
Merge branch 'master' into users/jiahongwen/bug-1952905-nuget-tool-in…
jiaw37 Jun 1, 2022
8b5be72
update permissions to 500
jiaw37 Jun 1, 2022
3438152
Merge branch 'users/jiahongwen/bug-1952905-nuget-tool-installer-unix-…
jiaw37 Jun 1, 2022
857e01b
update version for common dependent tasks
jiaw37 Jun 2, 2022
48905dd
add fs.exist to not overwrite file
jiaw37 Jun 2, 2022
9299b16
Merge branch 'master' into users/jiahongwen/bug-1952905-nuget-tool-in…
jiaw37 Jun 2, 2022
0d1d93b
bump pipAuth to patch 1
jiaw37 Jun 2, 2022
058777b
Merge branch 'master' into users/jiahongwen/bug-1952905-nuget-tool-in…
jiaw37 Jun 3, 2022
db79d55
move nuget string as const
jiaw37 Jun 3, 2022
a3a8c8f
Merge branch 'master' into users/jiahongwen/bug-1952905-nuget-tool-in…
jiaw37 Jun 6, 2022
cc86e6b
bumping DownloadGitHubNugetPackageV1 version
jiaw37 Jun 6, 2022
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
27 changes: 27 additions & 0 deletions Tasks/Common/packaging-common/nuget/NuGetToolGetter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
}
Expand Down Expand Up @@ -96,9 +99,33 @@ 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") {
jiaw37 marked this conversation as resolved.
Show resolved Hide resolved
generateNugetScript(toolPath, fullNuGetPath);
}

return fullNuGetPath;
}

function generateNugetScript(nugetToolPath: string, nugetExePath: string) {
var nugetScriptPath = path.join(nugetToolPath, "nuget");
taskLib.debug(`create nugetScriptPath ${nugetScriptPath}`);

fs.writeFile(
jiaw37 marked this conversation as resolved.
Show resolved Hide resolved
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, "555");
jiaw37 marked this conversation as resolved.
Show resolved Hide resolved
taskLib.debug("Writing nuget script succeeded");
}
}
);
}

function pathExistsAsFile(path: string) {
try {
return taskLib.stats(path).isFile();
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 202,
"Minor": 206,
"Patch": 0
},
"preview": false,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 202,
"Minor": 206,
"Patch": 0
},
"preview": false,
Expand Down