From 990055fc92f065657bfcfdc2cce1ba631a254778 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 09:49:06 -0700 Subject: [PATCH 1/6] Make Win8/7 required for debugging [skip ci] --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index a5ec01a94f81..8cc269279554 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -23,12 +23,12 @@ + + - - From 0ac62af87c1172a7450e703b29c2c88eeb9ad70e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 09:50:20 -0700 Subject: [PATCH 2/6] Shell dotnet in runtest to looksie --- eng/helix/content/runtests.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 44d8b83c57f7..6a5a9eac575d 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,5 +28,6 @@ dotnet run --project RunTests\RunTests.csproj -- --target %1 --sdk %2 --runtime if errorlevel 1 ( set exit_code=1 ) +dotnet tool install dotnet-ef --global --version 5.0.0-preview.4.20216.3 echo "Finished running tests: exit_code=%exit_code%" exit /b %exit_code% From a8ad723888b749bb5c617449cb1dc53e10819b7c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 09:53:12 -0700 Subject: [PATCH 3/6] Add restore sources --- eng/helix/content/runtests.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 6a5a9eac575d..5045a8834f60 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,6 +28,8 @@ dotnet run --project RunTests\RunTests.csproj -- --target %1 --sdk %2 --runtime if errorlevel 1 ( set exit_code=1 ) +dotnet nuget add source %HELIX_WORKITEM_ROOT% --configfile NuGet.config +dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config dotnet tool install dotnet-ef --global --version 5.0.0-preview.4.20216.3 echo "Finished running tests: exit_code=%exit_code%" exit /b %exit_code% From c6e4f27b9062515cc9b3d4b4998ee2fe7b959365 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 12:41:44 -0700 Subject: [PATCH 4/6] Allow ef tool install to fail --- eng/helix/content/RunTests/TestRunner.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index 65dd451036cf..43e3cce49070 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -141,7 +141,8 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", $"tool install dotnet-ef --global --version {Options.EfVersion}", environmentVariables: EnvironmentVariables, 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 Options.Path += RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ";" : ":"; From 5f01c10cccbc38f580c6e4fa955298524eba3164 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 12:42:56 -0700 Subject: [PATCH 5/6] Update runtests.cmd --- eng/helix/content/runtests.cmd | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 5045a8834f60..44d8b83c57f7 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -28,8 +28,5 @@ dotnet run --project RunTests\RunTests.csproj -- --target %1 --sdk %2 --runtime if errorlevel 1 ( set exit_code=1 ) -dotnet nuget add source %HELIX_WORKITEM_ROOT% --configfile NuGet.config -dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --configfile NuGet.config -dotnet tool install dotnet-ef --global --version 5.0.0-preview.4.20216.3 echo "Finished running tests: exit_code=%exit_code%" exit /b %exit_code% From e2df991fdda71f9c23666d3ba3749523780cfcaf Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 17 Apr 2020 14:49:35 -0700 Subject: [PATCH 6/6] Update Helix.Common.props --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 8cc269279554..a5ec01a94f81 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -23,12 +23,12 @@ - - + +