From 4438c0718d81c15796eaa4cadd96352ed436825b Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Tue, 14 Sep 2021 14:27:58 -0600 Subject: [PATCH 1/5] Update to latest dotnet-install script --- tools/Install-DotNetSdk.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Install-DotNetSdk.ps1 b/tools/Install-DotNetSdk.ps1 index 67c66c1e..73dae25f 100644 --- a/tools/Install-DotNetSdk.ps1 +++ b/tools/Install-DotNetSdk.ps1 @@ -154,10 +154,10 @@ if ($DotNetInstallDir) { } if ($IsMacOS -or $IsLinux) { - $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/49d5da7f7d313aa65d24fe95cc29767faef553fd/src/dotnet-install.sh" + $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/781752509a890ca7520f1182e8bae71f9a53d754/src/dotnet-install.sh" $DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.sh" } else { - $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/49d5da7f7d313aa65d24fe95cc29767faef553fd/src/dotnet-install.ps1" + $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/781752509a890ca7520f1182e8bae71f9a53d754/src/dotnet-install.ps1" $DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.ps1" } From f220004889a1ac02ac55cafcc84b737be04f4ad1 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 15 Sep 2021 07:14:15 -0600 Subject: [PATCH 2/5] Capture dumps from test hangs on Mac/Linux --- .github/workflows/Linux.runsettings | 15 ++++++++++++++- .github/workflows/macOS.runsettings | 15 ++++++++++++++- azure-pipelines/Darwin.runsettings | 15 ++++++++++++++- azure-pipelines/Linux.runsettings | 15 ++++++++++++++- azure-pipelines/artifacts/testResults.ps1 | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Linux.runsettings b/.github/workflows/Linux.runsettings index b444e819..5e2244a0 100644 --- a/.github/workflows/Linux.runsettings +++ b/.github/workflows/Linux.runsettings @@ -1 +1,14 @@ - + + + + + + + + + %GITHUB_WORKSPACE% + + + + + diff --git a/.github/workflows/macOS.runsettings b/.github/workflows/macOS.runsettings index b444e819..5e2244a0 100644 --- a/.github/workflows/macOS.runsettings +++ b/.github/workflows/macOS.runsettings @@ -1 +1,14 @@ - + + + + + + + + + %GITHUB_WORKSPACE% + + + + + diff --git a/azure-pipelines/Darwin.runsettings b/azure-pipelines/Darwin.runsettings index b444e819..0b43ecb0 100644 --- a/azure-pipelines/Darwin.runsettings +++ b/azure-pipelines/Darwin.runsettings @@ -1 +1,14 @@ - + + + + + + + + + %BUILD_ARTIFACTSTAGINGDIRECTORY% + + + + + diff --git a/azure-pipelines/Linux.runsettings b/azure-pipelines/Linux.runsettings index b444e819..0b43ecb0 100644 --- a/azure-pipelines/Linux.runsettings +++ b/azure-pipelines/Linux.runsettings @@ -1 +1,14 @@ - + + + + + + + + + %BUILD_ARTIFACTSTAGINGDIRECTORY% + + + + + diff --git a/azure-pipelines/artifacts/testResults.ps1 b/azure-pipelines/artifacts/testResults.ps1 index 1e4c4c4e..7895ddca 100644 --- a/azure-pipelines/artifacts/testResults.ps1 +++ b/azure-pipelines/artifacts/testResults.ps1 @@ -2,7 +2,7 @@ if ($env:AGENT_TEMPDIRECTORY) { # The DotNetCoreCLI uses an alternate location to publish these files $guidRegex = '^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$' @{ - $env:AGENT_TEMPDIRECTORY = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse }); + $env:AGENT_TEMPDIRECTORY = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\dotnet*.dmp","$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse }); } } else { $testRoot = Resolve-Path "$PSScriptRoot\..\..\test" From da2dbc0e905c0b6045c7f51875848fa50cad9b7e Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 15 Sep 2021 07:56:31 -0600 Subject: [PATCH 3/5] Remove ResultsDirectory tag --- .github/workflows/Linux.runsettings | 2 -- .github/workflows/Windows.runsettings | 2 -- .github/workflows/macOS.runsettings | 2 -- azure-pipelines/Darwin.runsettings | 2 -- azure-pipelines/Linux.runsettings | 2 -- azure-pipelines/Windows_NT.runsettings | 2 -- 6 files changed, 12 deletions(-) diff --git a/.github/workflows/Linux.runsettings b/.github/workflows/Linux.runsettings index 5e2244a0..db20611f 100644 --- a/.github/workflows/Linux.runsettings +++ b/.github/workflows/Linux.runsettings @@ -5,8 +5,6 @@ - - %GITHUB_WORKSPACE% diff --git a/.github/workflows/Windows.runsettings b/.github/workflows/Windows.runsettings index 5e2244a0..db20611f 100644 --- a/.github/workflows/Windows.runsettings +++ b/.github/workflows/Windows.runsettings @@ -5,8 +5,6 @@ - - %GITHUB_WORKSPACE% diff --git a/.github/workflows/macOS.runsettings b/.github/workflows/macOS.runsettings index 5e2244a0..db20611f 100644 --- a/.github/workflows/macOS.runsettings +++ b/.github/workflows/macOS.runsettings @@ -5,8 +5,6 @@ - - %GITHUB_WORKSPACE% diff --git a/azure-pipelines/Darwin.runsettings b/azure-pipelines/Darwin.runsettings index 0b43ecb0..db20611f 100644 --- a/azure-pipelines/Darwin.runsettings +++ b/azure-pipelines/Darwin.runsettings @@ -5,8 +5,6 @@ - - %BUILD_ARTIFACTSTAGINGDIRECTORY% diff --git a/azure-pipelines/Linux.runsettings b/azure-pipelines/Linux.runsettings index 0b43ecb0..db20611f 100644 --- a/azure-pipelines/Linux.runsettings +++ b/azure-pipelines/Linux.runsettings @@ -5,8 +5,6 @@ - - %BUILD_ARTIFACTSTAGINGDIRECTORY% diff --git a/azure-pipelines/Windows_NT.runsettings b/azure-pipelines/Windows_NT.runsettings index 0b43ecb0..db20611f 100644 --- a/azure-pipelines/Windows_NT.runsettings +++ b/azure-pipelines/Windows_NT.runsettings @@ -5,8 +5,6 @@ - - %BUILD_ARTIFACTSTAGINGDIRECTORY% From ecbaf97d74980f7455d3426f0138611992acc256 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 15 Sep 2021 08:32:30 -0600 Subject: [PATCH 4/5] Update SDK to 5.0.401 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 9f36eab1..3057bb45 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.400", + "version": "5.0.401", "rollForward": "patch", "allowPrerelease": false } From 934d5f208f748fcdaf99e628c36c127246af99e6 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 23 Sep 2021 15:36:27 -0600 Subject: [PATCH 5/5] Add a collection for prepended paths --- init.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.ps1 b/init.ps1 index 4cf910f2..cb86c6ca 100755 --- a/init.ps1 +++ b/init.ps1 @@ -48,6 +48,7 @@ Param ( ) $EnvVars = @{} +$PrependPath = @() if (!$NoPrerequisites) { if (!$NoNuGetCredProvider) { @@ -82,7 +83,7 @@ try { } } - & "$PSScriptRoot/tools/Set-EnvVars.ps1" -Variables $EnvVars | Out-Null + & "$PSScriptRoot/tools/Set-EnvVars.ps1" -Variables $EnvVars -PrependPath $PrependPath | Out-Null } catch { Write-Error $error[0]