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

[Helix] Install ef tool to work item root instead of globally (#21025)

This commit is contained in:
Hao Kung 2020-04-20 19:33:02 -07:00 committed by GitHub
parent 6e06ff8a16
commit f86eb17fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ namespace RunTests
EnvironmentVariables.Add("NUGET_FALLBACK_PACKAGES", helixDir); EnvironmentVariables.Add("NUGET_FALLBACK_PACKAGES", helixDir);
var nugetRestore = Path.Combine(helixDir, "nugetRestore"); var nugetRestore = Path.Combine(helixDir, "nugetRestore");
EnvironmentVariables.Add("NUGET_RESTORE", nugetRestore); EnvironmentVariables.Add("NUGET_RESTORE", nugetRestore);
var dotnetEFFullPath = Path.Combine(nugetRestore, $"dotnet-ef/{Options.EfVersion}/tools/netcoreapp3.1/any/dotnet-ef.exe"); var dotnetEFFullPath = Path.Combine(nugetRestore, helixDir, "dotnet-ef.exe");
Console.WriteLine($"Set DotNetEfFullPath: {dotnetEFFullPath}"); Console.WriteLine($"Set DotNetEfFullPath: {dotnetEFFullPath}");
EnvironmentVariables.Add("DotNetEfFullPath", dotnetEFFullPath); EnvironmentVariables.Add("DotNetEfFullPath", dotnetEFFullPath);
@ -138,11 +138,10 @@ namespace RunTests
errorDataReceived: Console.Error.WriteLine); errorDataReceived: Console.Error.WriteLine);
await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
$"tool install dotnet-ef --global --version {Options.EfVersion}", $"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); // EF tool is sometimes already installed so we can ignore this failure
// ';' 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) ? ";" : ":";