Skip to content
Open
Show file tree
Hide file tree
Changes from 10 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
3 changes: 3 additions & 0 deletions azure-pipelines-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ jobs:
-configuration $(_BuildConfig)
-prepareMachine
/p:Test=false
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'
displayName: Windows Build

- task: CodeQL3000Finalize@0
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ extends:
/p:ProductsToBuild=$(_Products)
/p:Test=false
name: Build
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'
displayName: Build

- ${{ if eq(parameters.SkipTests, False) }}:
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ stages:
/p:Test=false
/p:FastAcceptanceTest=true
name: Build
env:
# https://github.com/microsoft/testfx/issues/6767
DOTNET_HOST_PATH: '$(Build.SourcesDirectory)/.dotnet/dotnet.exe'
displayName: Build

- task: PublishBuildArtifacts@1
Expand Down
11 changes: 10 additions & 1 deletion eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that our CI sometimes uses globally installed SDK so we needed to tweak the logic a bit: dotnet/roslyn#80842, I'm not sure if that's something you need to do as well

Copy link
Member

@Youssef1313 Youssef1313 Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we never use globally installed SDK. I'll keep an eye to official builds after merging this to ensure they are still not broken. Thanks for the note!

$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

Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -23,7 +23,7 @@
}
},
"sdk": {
"version": "10.0.100-rc.2.25464.104",
"version": "10.0.100-rc.2.25502.107",
"paths": [
".dotnet",
"$host$"
Expand Down
Loading