Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.ps1"

Retry({
Write-Host "GET $uri"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.sh"

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
3 changes: 2 additions & 1 deletion src/vstest.console/InProcessVsTestConsoleWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ internal InProcessVsTestConsoleWrapper(
ProcessHelper.ExternalEnvironmentVariables = environmentVariableBaseline;

string someExistingFile = typeof(InProcessVsTestConsoleWrapper).Assembly.Location;
var args = new VsTestConsoleProcessManager(someExistingFile).BuildArguments(consoleParameters);
using var manager = new VsTestConsoleProcessManager(someExistingFile);
var args = manager.BuildArguments(consoleParameters);
// Skip vstest.console path, we are already running in process, so it would just end up
// being understood as test dll to run. (it is present even though we don't provide
// dotnet path, because it is a .dll file).
Expand Down