huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install dotnet-dump first (#22068)

This commit is contained in:
Brennan 2020-05-20 23:31:22 -07:00 committed by GitHub
parent b277dab236
commit 4e2584a04a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eng/helix/content/RunTests/Program.cs
View File

@ -16,6 +16,10 @@ namespace RunTests
var keepGoing = runner.SetupEnvironment(); var keepGoing = runner.SetupEnvironment();
if (keepGoing) if (keepGoing)
{
keepGoing = await runner.InstallDotnetDump();
}
if (keepGoing)
{ {
keepGoing = await runner.InstallAspNetAppIfNeededAsync(); keepGoing = await runner.InstallAspNetAppIfNeededAsync();
} }
@ -23,10 +27,6 @@ namespace RunTests
{ {
keepGoing = runner.InstallAspNetRefIfNeeded(); keepGoing = runner.InstallAspNetRefIfNeeded();
} }
if (keepGoing)
{
keepGoing = await runner.InstallDotnetDump();
}
runner.DisplayContents(); runner.DisplayContents();

12
eng/helix/content/RunTests/TestRunner.cs
View File

@ -123,14 +123,16 @@ namespace RunTests
environmentVariables: EnvironmentVariables, environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine, outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine, errorDataReceived: Console.Error.WriteLine,
throwOnError: false); throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
"nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config", "nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config",
environmentVariables: EnvironmentVariables, environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine, outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine, errorDataReceived: Console.Error.WriteLine,
throwOnError: false); throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
// Write nuget sources to console, useful for debugging purposes // Write nuget sources to console, useful for debugging purposes
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
@ -138,14 +140,16 @@ namespace RunTests
environmentVariables: EnvironmentVariables, environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine, outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine, errorDataReceived: Console.Error.WriteLine,
throwOnError: false); throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
$"tool install dotnet-ef --version {Options.EfVersion} --tool-path {Options.HELIX_WORKITEM_ROOT}", $"tool install dotnet-ef --version {Options.EfVersion} --tool-path {Options.HELIX_WORKITEM_ROOT}",
environmentVariables: EnvironmentVariables, environmentVariables: EnvironmentVariables,
outputDataReceived: Console.WriteLine, outputDataReceived: Console.WriteLine,
errorDataReceived: Console.Error.WriteLine, errorDataReceived: Console.Error.WriteLine,
throwOnError: false); throwOnError: false,
cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
// ';' is the path separator on Windows, and ':' on Unix // ';' is the path separator on Windows, and ':' on Unix
Options.Path += RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ";" : ":"; Options.Path += RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ";" : ":";