Skip to content
Open
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: 2 additions & 0 deletions eng/build-utils.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ function Make-BootstrapBuild() {

# prepare FsLex and Fsyacc and AssemblyCheck
$dotnetPath = InitializeDotNetCli
# Ensure apphosts spawned by this publish see the repo-local runtime even if the caller forgot DOTNET_ROOT.
$env:DOTNET_ROOT = $dotnetPath
$dotnetExe = Join-Path $dotnetPath "dotnet.exe"

# prepare compiler
Expand Down
3 changes: 3 additions & 0 deletions eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,9 @@ trap TrapAndReportError EXIT

InitializeDotNetCli $restore

# Apphosts (bootstrap fsc, testhost, etc.) resolve runtimes via DOTNET_ROOT, not PATH.
export DOTNET_ROOT="$DOTNET_INSTALL_DIR"

# Resolve product TFM from centralized source of truth if not overridden via --tfm
if [[ "$tfm" == "" ]]; then
tfm=$("$DOTNET_INSTALL_DIR/dotnet" msbuild "$scriptroot/TargetFrameworks.props" -getProperty:FSharpNetCoreProductTargetFramework 2>/dev/null | tr -d '[:space:]')
Expand Down
Loading