Skip to content
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f42d7c9
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 9, 2026
4d9f461
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 9, 2026
16a77ef
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 10, 2026
037bae9
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 10, 2026
6df206e
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 12, 2026
f6f56e1
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 12, 2026
79d437d
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 14, 2026
4f6f7a5
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 14, 2026
5d391ec
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 15, 2026
05d50b3
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 15, 2026
cccac6d
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 16, 2026
e6b803c
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 16, 2026
d8f3f5a
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 17, 2026
dfa5bbc
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 17, 2026
602b2bd
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 19, 2026
52896c3
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 19, 2026
b7939ca
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 20, 2026
a10d218
Update global.json.
rolfbjarne May 20, 2026
79575ad
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 21, 2026
c3794be
Bump global.json.
rolfbjarne May 21, 2026
41ad8a9
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-d4fe6…
rolfbjarne May 21, 2026
3e3d5e1
Merge branch 'net11.0' into darc-net11.0-d4fe64b2-8391-403d-bbd7-5e33…
rolfbjarne May 22, 2026
ad000fe
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 23, 2026
6973c82
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 23, 2026
bb57913
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 24, 2026
28af61a
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 24, 2026
d3a901f
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 26, 2026
2782900
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 26, 2026
918b50d
Fix SmartEnumTest.AVMediaTypes after ILLink dataflow improvement
rolfbjarne May 26, 2026
f4c9af1
Fix IsARM64CallingConvention test after ILLink body-stubbing change
rolfbjarne May 26, 2026
bc4f773
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-d4fe6…
rolfbjarne May 26, 2026
ee1768b
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] May 27, 2026
3ff8dea
Re-generate global.json for PR #25379: [net11.0] Update dependencies …
May 27, 2026
d794c37
Fix TestRuntime.IsLinkAny after ILLink dataflow improvement
rolfbjarne May 27, 2026
fcd3db3
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-d4fe6…
rolfbjarne May 27, 2026
4473e3e
[devops] Remove the fix to avoid using a leaked GitHub ssh key. (#25504)
rolfbjarne May 25, 2026
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
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26256.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26256.105</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26256.105</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26256.105</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26256.105</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.5.26256.105</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.5.26256.105</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.5.26256.105</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26256.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.5.26256.105</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26261.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26261.101</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26261.101</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26261.101</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26261.101</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.5.26261.101</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.5.26261.101</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.5.26261.101</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26261.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.5.26261.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_264PackageVersion>26.4.10261</MicrosoftiOSSdknet100_264PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26256.105">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26256.105">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26256.105">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26261.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>547c640d5626b2976499cb3433abc741a63d67c5</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/AGENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# `eng/common`

Files under `eng/common` come from [Arcade](https://github.com/dotnet/arcade).
Edits in `eng/common` will be overwritten by automation unless the changes are made directly in the Arcade repository.
For more information, see the [Arcade documentation](https://github.com/dotnet/arcade/tree/main/Documentation).
3 changes: 3 additions & 0 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ parameters:
GitHubOrg: dotnet
MirrorRepo: ''
MirrorBranch: main
xLocCustomPowerShellScript: ''
condition: ''
JobNameSuffix: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -97,6 +98,8 @@ jobs:
gitHubOrganization: ${{ parameters.GitHubOrg }}
mirrorRepo: ${{ parameters.MirrorRepo }}
mirrorBranch: ${{ parameters.MirrorBranch }}
${{ if ne(parameters.xLocCustomPowerShellScript, '') }}:
xLocCustomPowerShellScript: ${{ parameters.xLocCustomPowerShellScript }}
condition: ${{ parameters.condition }}

# Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
Expand Down
12 changes: 9 additions & 3 deletions eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,19 @@ elseif(ILLUMOS)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
if ($ENV{CCC_CC} MATCHES ".*gcc.*")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
else()
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
endif()

# let CMake set up the correct search paths
include(Platform/Haiku)
Expand Down
6 changes: 5 additions & 1 deletion eng/common/dotnet-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ Param(

. $PSScriptRoot\tools.ps1

$dotnetRoot = Join-Path $RepoRoot '.dotnet'
if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) {
$dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
}

$installdir = $dotnetRoot
try {
Expand Down
6 changes: 5 additions & 1 deletion eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ case $cpuname in
;;
esac

dotnetRoot="${repo_root}.dotnet"
if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then
dotnetRoot="$DOTNET_GLOBAL_INSTALL_DIR"
else
dotnetRoot="${repo_root}.dotnet"
fi
if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
dotnetRoot="$dotnetRoot/$architecture"
fi
Expand Down
38 changes: 22 additions & 16 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
}

# Keep repo builds isolated from machine-installed SDK state and workload advertising.
# This avoids preview SDK builds picking up mismatched workloads on CI images.
$env:DOTNET_MULTILEVEL_LOOKUP = '0'
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
$env:DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE = '1'

# Find the first path on %PATH% that contains the dotnet.exe
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
$dotnetExecutable = GetExecutableFileName 'dotnet'
Expand Down Expand Up @@ -230,6 +236,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
Write-PipelinePrependPath -Path $dotnetRoot

Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
Write-PipelineSetVariable -Name 'DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE' -Value '1'

return $global:_DotNetInstallDir = $dotnetRoot
}
Expand Down Expand Up @@ -619,11 +628,7 @@ function GetSdkTaskProject([string]$taskName) {
if (Test-Path $proj) {
return $proj
}
# TODO: Remove this fallback once all supported versions use the new layout.
$legacyProj = Join-Path $toolsetDir "SdkTasks\$taskName.proj"
if (Test-Path $legacyProj) {
return $legacyProj
}

throw "Unable to find $taskName.proj in toolset at: $toolsetDir"
}

Expand Down Expand Up @@ -699,23 +704,14 @@ function InitializeToolset() {

$packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion)
$packageToolsetDir = Join-Path $packageDir 'toolset'
$packageToolsDir = Join-Path $packageDir 'tools'

# TODO: Remove the tools/ check once all supported versions have the toolset folder.
if (!(Test-Path $packageToolsetDir) -and !(Test-Path $packageToolsDir)) {
if (!(Test-Path $packageToolsetDir)) {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK package does not contain a toolset or tools folder: $packageDir"
ExitWithExitCode 3
}

New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null

# Copy toolset if present at the package root (new layout), otherwise fall back to tools
if (Test-Path $packageToolsetDir) {
Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force
} else {
# TODO: Remove this fallback once all supported versions have the toolset folder.
Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
}
Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force

if (Test-Path $buildProjPath) {
$toolsetBuildProj = $buildProjPath
Expand Down Expand Up @@ -842,6 +838,10 @@ function MSBuild-Core() {

$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"

if ($ci -and $buildTool.Tool -eq 'dotnet') {
$cmdArgs += ' /p:MSBuildEnableWorkloadResolver=false'
}

# Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
if ($env:MSBUILD_MT_ENABLED -eq "1") {
$cmdArgs += ' -mt'
Expand Down Expand Up @@ -952,6 +952,12 @@ Create-Directory $ToolsetDir
Create-Directory $TempDir
Create-Directory $LogDir

# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location
# under artifacts/log so they are captured as build artifacts in CI.
if (-not $env:MSBUILDDEBUGPATH) {
$env:MSBUILDDEBUGPATH = Join-Path $LogDir 'MsbuildDebugLogs'
}

Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir
Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir
Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
Expand Down
43 changes: 25 additions & 18 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ function InitializeDotNetCli {
export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi

# Keep repo builds isolated from machine-installed SDK state and workload advertising.
# This avoids preview SDK builds picking up mismatched workloads on CI images.
export DOTNET_MULTILEVEL_LOOKUP=0
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=1

# LTTNG is the logging infrastructure used by Core CLR. Need this variable set
# so it doesn't output warnings to the console.
export LTTNG_HOME="$HOME"
Expand Down Expand Up @@ -171,6 +177,9 @@ function InitializeDotNetCli {
Write-PipelinePrependPath -path "$dotnet_root"

Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
Write-PipelineSetVariable -name "DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE" -value "1"

# return value
_InitializeDotNetCli="$dotnet_root"
Expand Down Expand Up @@ -449,21 +458,13 @@ function InitializeToolset {

local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version"

# TODO: Remove the tools/ check once all supported versions have the toolset folder.
if [[ ! -d "$package_dir/toolset" && ! -d "$package_dir/tools" ]]; then
Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset or tools folder: $package_dir"
if [[ ! -d "$package_dir/toolset" ]]; then
Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset folder: $package_dir"
ExitWithExitCode 3
fi

mkdir -p "$toolset_tools_dir"

# Copy toolset if present at the package root (new layout), otherwise fall back to tools
if [[ -d "$package_dir/toolset" ]]; then
cp -r "$package_dir/toolset/." "$toolset_tools_dir"
else
# TODO: Remove this fallback once all supported versions have the toolset folder.
cp -r "$package_dir/tools/." "$toolset_tools_dir"
fi
cp -r "$package_dir/toolset/." "$toolset_tools_dir"

if [[ -a "$toolset_tools_dir/Build.proj" ]]; then
toolset_build_proj="$toolset_tools_dir/Build.proj"
Expand Down Expand Up @@ -590,7 +591,12 @@ function MSBuild-Core {
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error"
fi

RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
local workload_resolver_switch=""
if [[ "$ci" == true && -n "${_InitializeBuildToolCommand:-}" ]]; then
workload_resolver_switch="/p:MSBuildEnableWorkloadResolver=false"
fi

RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch $workload_resolver_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
}

function GetDarc {
Expand All @@ -615,12 +621,7 @@ function GetSdkTaskProject {
echo "$proj"
return
fi
# TODO: Remove this fallback once all supported versions use the new layout.
local legacyProj="$toolsetDir/SdkTasks/$taskName.proj"
if [[ -a "$legacyProj" ]]; then
echo "$legacyProj"
return
fi

Write-PipelineTelemetryError -category 'Build' "Unable to find $taskName.proj in toolset at: $toolsetDir"
ExitWithExitCode 3
}
Expand Down Expand Up @@ -660,6 +661,12 @@ mkdir -p "$toolset_dir"
mkdir -p "$temp_dir"
mkdir -p "$log_dir"

# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location
# under artifacts/log so they are captured as build artifacts in CI.
if [[ -z "${MSBUILDDEBUGPATH:-}" ]]; then
export MSBUILDDEBUGPATH="$log_dir/MsbuildDebugLogs"
fi

Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir"
Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir"
Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir"
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-preview.5.26256.105",
"version": "11.0.100-preview.5.26261.101",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.5.26256.105"
"dotnet": "11.0.100-preview.5.26261.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26256.105"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26261.101"
}
}
Loading