Skip to content

Commit 4e2584a

Browse files
Install dotnet-dump first (#22068)
1 parent b277dab commit 4e2584a

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

eng/helix/content/RunTests/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ static async Task Main(string[] args)
1717
var keepGoing = runner.SetupEnvironment();
1818
if (keepGoing)
1919
{
20-
keepGoing = await runner.InstallAspNetAppIfNeededAsync();
20+
keepGoing = await runner.InstallDotnetDump();
2121
}
2222
if (keepGoing)
2323
{
24-
keepGoing = runner.InstallAspNetRefIfNeeded();
24+
keepGoing = await runner.InstallAspNetAppIfNeededAsync();
2525
}
2626
if (keepGoing)
2727
{
28-
keepGoing = await runner.InstallDotnetDump();
28+
keepGoing = runner.InstallAspNetRefIfNeeded();
2929
}
3030

3131
runner.DisplayContents();

eng/helix/content/RunTests/TestRunner.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,29 +123,33 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
123123
environmentVariables: EnvironmentVariables,
124124
outputDataReceived: Console.WriteLine,
125125
errorDataReceived: Console.Error.WriteLine,
126-
throwOnError: false);
126+
throwOnError: false,
127+
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
127128

128129
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
129130
"nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config",
130131
environmentVariables: EnvironmentVariables,
131132
outputDataReceived: Console.WriteLine,
132133
errorDataReceived: Console.Error.WriteLine,
133-
throwOnError: false);
134+
throwOnError: false,
135+
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
134136

135137
// Write nuget sources to console, useful for debugging purposes
136138
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
137139
"nuget list source",
138140
environmentVariables: EnvironmentVariables,
139141
outputDataReceived: Console.WriteLine,
140142
errorDataReceived: Console.Error.WriteLine,
141-
throwOnError: false);
143+
throwOnError: false,
144+
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
142145

143146
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
144147
$"tool install dotnet-ef --version {Options.EfVersion} --tool-path {Options.HELIX_WORKITEM_ROOT}",
145148
environmentVariables: EnvironmentVariables,
146149
outputDataReceived: Console.WriteLine,
147150
errorDataReceived: Console.Error.WriteLine,
148-
throwOnError: false);
151+
throwOnError: false,
152+
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
149153

150154
// ';' is the path separator on Windows, and ':' on Unix
151155
Options.Path += RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ";" : ":";

0 commit comments

Comments
 (0)