microsoft
/
powerplatform-actions
зеркало из https://github.com/microsoft/powerplatform-actions.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use separate nuget file to ensure nuget.org is not present in the config used when overriding the feed

This commit is contained in:
Crash Collison 2023-09-08 18:28:26 -07:00
Родитель 8fe5c8db79
Коммит db79152712
2 изменённых файлов: 95 добавлений и 62 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

75
dist/actions/actions-install/index.js поставляемый
Просмотреть файл

@ -3541,25 +3541,12 @@ function nugetInstall(packageName, packageVersion, nugetFeedOverride, nugetFeedU
core.info(`Installing ${packageName}.${packageVersion} via nuget.exe`);
yield checkForInstallationTool("nuget");
const toolpath = yield fs.mkdtemp(path.join(os.tmpdir(), "powerplatform-actions-"));
let wroteNugetConfig = false;
let nugetConfigFile = void 0;
try {
if (nugetFeedOverride && nugetFeedOverride !== "https://api.nuget.org/v3/index.json") {
core.info(`Adding nuget feed ${nugetFeedOverride} to nuget sources`);
yield exec.getExecOutput("nuget", [
"sources",
"add",
"-name",
"pacNugetFeed",
"-source",
nugetFeedOverride,
"-username",
nugetFeedUsername,
"-password",
nugetFeedPassword
]);
wroteNugetConfig = true;
nugetConfigFile = yield createNugetConfigViaNuget(toolpath, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword);
}
yield exec.getExecOutput("nuget", [
const installArgs = [
"install",
packageName,
"-Version",
@ -3569,13 +3556,15 @@ function nugetInstall(packageName, packageVersion, nugetFeedOverride, nugetFeedU
"-NonInteractive",
"-OutputDirectory",
toolpath
]);
];
nugetConfigFile && installArgs.push("-ConfigFile", nugetConfigFile);
yield exec.getExecOutput("nuget", installArgs);
const pacPath = (0, node_path_1.resolve)(toolpath, packageName + "." + packageVersion, "tools", "pac.exe");
core.exportVariable(runnerParameters_1.PacInstalledEnvVarName, "true");
core.exportVariable(runnerParameters_1.PacPathEnvVarName, pacPath);
} finally {
if (wroteNugetConfig) {
yield exec.getExecOutput("nuget", ["sources", "remove", "-name", "pacNugetFeed"]);
if (nugetConfigFile) {
yield fs.rm(nugetConfigFile);
}
}
});
@ -3585,30 +3574,52 @@ function dotnetInstall(packageName, packageVersion, nugetFeedOverride, nugetFeed
core.info(`Installing ${packageName}.${packageVersion} via dotnet tool install`);
yield checkForInstallationTool("dotnet");
const toolpath = yield fs.mkdtemp(path.join(os.tmpdir(), "powerplatform-actions-"));
let wroteNugetConfig = false;
let nugetConfigFile = void 0;
try {
if (nugetFeedOverride && nugetFeedOverride !== "https://api.nuget.org/v3/index.json") {
core.info(`Adding nuget feed ${nugetFeedOverride} to dotnet nuget sources`);
const nugetSourceArgs = ["nuget", "add", "source", nugetFeedOverride, "--name", "pacNugetFeed"];
nugetFeedUsername && nugetSourceArgs.push("--username", nugetFeedUsername);
nugetFeedPassword && nugetSourceArgs.push("--password", nugetFeedPassword);
if (os.platform() !== "win32") {
nugetSourceArgs.push("--store-password-in-clear-text");
}
yield exec.getExecOutput("dotnet", nugetSourceArgs);
wroteNugetConfig = true;
nugetConfigFile = yield createNugetConfigViaDotnet(toolpath, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword);
}
yield exec.getExecOutput("dotnet", ["tool", "install", packageName, "--version", packageVersion, "--tool-path", toolpath]);
const installArgs = ["tool", "install", packageName, "--version", packageVersion, "--tool-path", toolpath];
nugetConfigFile && installArgs.push("--configfile", nugetConfigFile);
yield exec.getExecOutput("dotnet", installArgs);
core.exportVariable(runnerParameters_1.PacInstalledEnvVarName, "true");
core.exportVariable(runnerParameters_1.PacPathEnvVarName, path.join(toolpath, os.platform() === "win32" ? "pac.exe" : "pac"));
core.info(`pac installed to ${process.env[runnerParameters_1.PacPathEnvVarName]}`);
} finally {
if (wroteNugetConfig) {
yield exec.getExecOutput("dotnet", ["nuget", "remove", "source", "pacNugetFeed"]);
if (nugetConfigFile) {
yield fs.rm(nugetConfigFile);
}
}
});
}
function createNugetConfigViaNuget(toolDirectory, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword) {
return __awaiter(this, void 0, void 0, function* () {
core.info(`Adding nuget feed ${nugetFeedOverride} to nuget sources`);
const filename = path.resolve(toolDirectory, "nuget.config");
yield fs.writeFile(filename, `<?xml version="1.0" encoding="utf-8"?><configuration></configuration>`);
const configArgs = ["sources", "add", "-name", "pacNugetFeed", "-source", nugetFeedOverride, `-ConfigFile`, filename];
nugetFeedUsername && configArgs.push("-username", nugetFeedUsername);
nugetFeedPassword && configArgs.push("-password", nugetFeedPassword);
yield exec.getExecOutput("nuget", configArgs);
return filename;
});
}
function createNugetConfigViaDotnet(toolDirectory, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword) {
return __awaiter(this, void 0, void 0, function* () {
core.info(`Adding nuget feed ${nugetFeedOverride} to dotnet nuget sources`);
const filename = path.resolve(toolDirectory, "nuget.config");
yield exec.getExecOutput("dotnet", ["new", "nugetconfig", "-o", toolDirectory]);
yield exec.getExecOutput("dotnet", ["nuget", "remove", "source", "nuget", "--configfile", filename]);
const nugetSourceArgs = ["nuget", "add", "source", nugetFeedOverride, "--name", "pacNugetFeed", "--configfile", filename];
nugetFeedUsername && nugetSourceArgs.push("--username", nugetFeedUsername);
nugetFeedPassword && nugetSourceArgs.push("--password", nugetFeedPassword);
if (os.platform() !== "win32") {
nugetSourceArgs.push("--store-password-in-clear-text");
}
yield exec.getExecOutput("dotnet", nugetSourceArgs);
return filename;
});
}
function checkForInstallationTool(toolName) {
return __awaiter(this, void 0, void 0, function* () {
try {

82
src/actions/actions-install/index.ts
Просмотреть файл

@ -109,31 +109,28 @@ async function nugetInstall(packageName: string, packageVersion: string, nugetFe
await checkForInstallationTool('nuget');
const toolpath = await fs.mkdtemp(path.join(os.tmpdir(), 'powerplatform-actions-'));
let wroteNugetConfig = false;
let nugetConfigFile: string | undefined = undefined;
try {
if (nugetFeedOverride && nugetFeedOverride !== 'https://api.nuget.org/v3/index.json') {
core.info(`Adding nuget feed ${nugetFeedOverride} to nuget sources`);
await exec.getExecOutput('nuget', ['sources', 'add', '-name', 'pacNugetFeed', '-source', nugetFeedOverride,
'-username', nugetFeedUsername, '-password', nugetFeedPassword]);
wroteNugetConfig = true;
nugetConfigFile = await createNugetConfigViaNuget(toolpath, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword);
}
await exec.getExecOutput('nuget', ['install', packageName,
const installArgs = ['install', packageName,
'-Version', packageVersion,
'-DependencyVersion', 'ignore', // There are no dependencies, so don't waste that time checking
'-NonInteractive',
'-OutputDirectory', toolpath]);
'-OutputDirectory', toolpath];
nugetConfigFile && installArgs.push('-ConfigFile', nugetConfigFile);
await exec.getExecOutput('nuget', installArgs);
const pacPath = resolve(toolpath, packageName + '.' + packageVersion, 'tools', 'pac.exe');
core.exportVariable(PacInstalledEnvVarName, 'true');
core.exportVariable(PacPathEnvVarName, pacPath);
} finally {
if (wroteNugetConfig) {
// Clean up the nuget config we wrote
await exec.getExecOutput('nuget', ['sources', 'remove', '-name', 'pacNugetFeed']);
if (nugetConfigFile) {
await fs.rm(nugetConfigFile);
}
}
}
@ -144,39 +141,64 @@ async function dotnetInstall(packageName: string, packageVersion: string, nugetF
await checkForInstallationTool('dotnet');
const toolpath = await fs.mkdtemp(path.join(os.tmpdir(), 'powerplatform-actions-'));
let wroteNugetConfig = false;
let nugetConfigFile: string | undefined = undefined;
try {
if (nugetFeedOverride && nugetFeedOverride !== 'https://api.nuget.org/v3/index.json') {
core.info(`Adding nuget feed ${nugetFeedOverride} to dotnet nuget sources`);
const nugetSourceArgs = ['nuget', 'add', 'source', nugetFeedOverride, '--name', 'pacNugetFeed' ];
nugetFeedUsername && nugetSourceArgs.push('--username', nugetFeedUsername);
nugetFeedPassword && nugetSourceArgs.push('--password', nugetFeedPassword);
if (os.platform() !== 'win32') {
// Encrypted credentials are not supported on Linux or macOS
nugetSourceArgs.push('--store-password-in-clear-text');
}
await exec.getExecOutput('dotnet', nugetSourceArgs);
wroteNugetConfig = true;
nugetConfigFile = await createNugetConfigViaDotnet(toolpath, nugetFeedOverride, nugetFeedUsername, nugetFeedPassword);
}
await exec.getExecOutput('dotnet',
['tool', 'install', packageName, '--version', packageVersion, '--tool-path', toolpath]);
const installArgs = ['tool', 'install', packageName, '--version', packageVersion, '--tool-path', toolpath];
nugetConfigFile && installArgs.push('--configfile', nugetConfigFile);
await exec.getExecOutput('dotnet', installArgs);
core.exportVariable(PacInstalledEnvVarName, 'true');
core.exportVariable(PacPathEnvVarName, path.join(toolpath, os.platform() === 'win32' ? 'pac.exe' : 'pac'));
core.info(`pac installed to ${process.env[PacPathEnvVarName]}`);
} finally {
if (wroteNugetConfig) {
if (nugetConfigFile) {
// Clean up the nuget config we wrote, as Linux and macOS don't support encrypted credentials,
await exec.getExecOutput('dotnet', ['nuget', 'remove', 'source', 'pacNugetFeed']);
await fs.rm(nugetConfigFile);
}
}
}
async function createNugetConfigViaNuget(toolDirectory: string, nugetFeedOverride: string, nugetFeedUsername: string, nugetFeedPassword: string): Promise<string> {
core.info(`Adding nuget feed ${nugetFeedOverride} to nuget sources`);
const filename = path.resolve(toolDirectory, 'nuget.config');
await fs.writeFile(filename, `<?xml version="1.0" encoding="utf-8"?><configuration></configuration>`);
const configArgs = ['sources', 'add', '-name', 'pacNugetFeed', '-source', nugetFeedOverride, `-ConfigFile`, filename];
nugetFeedUsername && configArgs.push('-username', nugetFeedUsername);
nugetFeedPassword && configArgs.push('-password', nugetFeedPassword);
await exec.getExecOutput('nuget', configArgs);
return filename;
}
async function createNugetConfigViaDotnet(toolDirectory: string, nugetFeedOverride: string, nugetFeedUsername: string, nugetFeedPassword: string): Promise<string> {
core.info(`Adding nuget feed ${nugetFeedOverride} to dotnet nuget sources`);
const filename = path.resolve(toolDirectory, 'nuget.config');
await exec.getExecOutput('dotnet', ['new', 'nugetconfig', '-o', toolDirectory]);
await exec.getExecOutput('dotnet', ['nuget', 'remove', 'source', 'nuget', '--configfile', filename]);
const nugetSourceArgs = ['nuget', 'add', 'source', nugetFeedOverride, '--name', 'pacNugetFeed', '--configfile', filename ];
nugetFeedUsername && nugetSourceArgs.push('--username', nugetFeedUsername);
nugetFeedPassword && nugetSourceArgs.push('--password', nugetFeedPassword);
if (os.platform() !== 'win32') {
// Encrypted credentials are not supported on Linux or macOS. Clean up file in Finally block.
nugetSourceArgs.push('--store-password-in-clear-text');
}
await exec.getExecOutput('dotnet', nugetSourceArgs);
return filename;
}
async function checkForInstallationTool(toolName: string): Promise<void> {
try {
await io.which(toolName, true);