diff --git a/azure-pipelines-codeql.yml b/azure-pipelines-codeql.yml index 8a82754a73..e38283d838 100644 --- a/azure-pipelines-codeql.yml +++ b/azure-pipelines-codeql.yml @@ -64,6 +64,9 @@ jobs: -prepareMachine /p:Test=false displayName: Windows Build + env: + # https://github.com/microsoft/testfx/issues/6767 + DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe' - task: CodeQL3000Finalize@0 displayName: CodeQL Finalize diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index c25160ecc1..4cb8b6ab7e 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -139,6 +139,9 @@ extends: /p:Test=false name: Build displayName: Build + env: + # https://github.com/microsoft/testfx/issues/6767 + DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe' - ${{ if eq(parameters.SkipTests, False) }}: # -ci is allowing to import some environment variables and some required configurations diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ec5bd75e4..a80ead0d75 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -108,6 +108,9 @@ stages: /p:FastAcceptanceTest=true name: Build displayName: Build + env: + # https://github.com/microsoft/testfx/issues/6767 + DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe' - task: PublishBuildArtifacts@1 displayName: 'Publish NuGet packages' diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb93c5a4f5..4507313c79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d78e0e9d17ca041656652ef10b8f5cb4f1f42475 - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d78e0e9d17ca041656652ef10b8f5cb4f1f42475 - + https://github.com/dotnet/arcade - d48732057be73512b3bac9c01eeacd59398c16d5 + d78e0e9d17ca041656652ef10b8f5cb4f1f42475 https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage diff --git a/eng/Versions.props b/eng/Versions.props index 3ede629f7c..4e95fa0168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ preview - 11.0.0-beta.25527.2 + 11.0.0-beta.25528.1 18.1.0-preview.25507.2 4.1.0-preview.25525.1 diff --git a/eng/build.ps1 b/eng/build.ps1 index ee14198255..f22162dcef 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -34,6 +34,15 @@ Param( [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) +# Workaround for DOTNET_HOST_PATH not being set by older MSBuild +# Removal is tracked by https://github.com/microsoft/testfx/issues/6767 +if (-not $env:DOTNET_HOST_PATH) { + $env:DOTNET_HOST_PATH = [System.IO.Path]::GetFullPath((Join-Path (Join-Path (Join-Path $PSScriptRoot '..') '.dotnet') 'dotnet')) + if (-not (Test-Path $env:DOTNET_HOST_PATH)) { + $env:DOTNET_HOST_PATH = "$($env:DOTNET_HOST_PATH).exe" + } +} + if ($vs -or $vscode) { . $PSScriptRoot\common\tools.ps1 @@ -52,7 +61,7 @@ if ($vs -or $vscode) { # Disable .NET runtime signature validation errors which errors for local builds $env:VSDebugger_ValidateDotnetDebugLibSignatures=0; - # Enables the logginc of Json RPC messages if diagnostic logging for Test Explorer is enabled in Visual Studio. + # Enables the logging of Json RPC messages if diagnostic logging for Test Explorer is enabled in Visual Studio. $env:_TestingPlatformDiagnostics_=1; if ($vs) { diff --git a/global.json b/global.json index a790f40f6d..ad6d1a0ccc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-rc.2.25464.104", + "dotnet": "10.0.100-rc.2.25502.107", "runtimes": { "dotnet": [ "3.1.32", @@ -26,7 +26,7 @@ } }, "sdk": { - "version": "10.0.100-rc.2.25464.104", + "version": "10.0.100-rc.2.25502.107", "paths": [ ".dotnet", "$host$" @@ -39,7 +39,7 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.1", "MSBuild.Sdk.Extras": "3.0.44" } } diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpProcessTreeTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpProcessTreeTests.cs index 83180701dd..d960ebb1ad 100644 --- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpProcessTreeTests.cs +++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpProcessTreeTests.cs @@ -10,6 +10,12 @@ public sealed class HangDumpProcessTreeTests : AcceptanceTestBase