Skip to content

Commit 66027dc

Browse files
author
ids
committed
Move builder to separate variable
1 parent 1891d98 commit 66027dc

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

dist/tools/libs/tools.mjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,8 @@ class DotnetTool {
334334
return path.normalize(workDir);
335335
}
336336
async getQueryService() {
337-
const result = await this.execute(
338-
"dotnet",
339-
new ArgumentsBuilder().addArgument("nuget").addArgument("list").addArgument("source").addKeyValue("format", "short").build()
340-
);
337+
const builder = new ArgumentsBuilder().addArgument("nuget").addArgument("list").addArgument("source").addKeyValue("format", "short");
338+
const result = await this.execute("dotnet", builder.build());
341339
const defaultNugetSource = /E (?<index>.+)/.exec(result.stdout ?? "")?.groups?.index;
342340
if (!defaultNugetSource) {
343341
this.buildAgent.error("Failed to fetch an enabled package source for dotnet.");

dist/tools/libs/tools.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/tools/common/dotnet-tool.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,10 @@ export abstract class DotnetTool implements IDotnetTool {
228228

229229
private async getQueryService(): Promise<string | null> {
230230
// Use dotnet tool to get the first enabled nuget source.
231-
const result = await this.execute(
232-
'dotnet',
233-
new ArgumentsBuilder().addArgument('nuget').addArgument('list').addArgument('source').addKeyValue('format', 'short').build()
234-
)
231+
const builder = new ArgumentsBuilder().addArgument('nuget').addArgument('list').addArgument('source').addKeyValue('format', 'short')
232+
const result = await this.execute('dotnet', builder.build())
235233

234+
// Each line of the output starts with either E (enabled) or D (disabled), followed by a space and index url.
236235
const defaultNugetSource = /E (?<index>.+)/.exec(result.stdout ?? '')?.groups?.index
237236

238237
if (!defaultNugetSource) {

0 commit comments

Comments
 (0)