Skip to content

Commit ddbf1fa

Browse files
[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade (#7794)
2 parents edcee9d + cd4dc0c commit ddbf1fa

5 files changed

Lines changed: 51 additions & 12 deletions

File tree

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26211.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26222.1">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
6+
<Sha>302c3502814a662725657511a2f71978a41a66d4</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26211.1">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26222.1">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
10+
<Sha>302c3502814a662725657511a2f71978a41a66d4</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26211.1">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26222.1">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
14+
<Sha>302c3502814a662725657511a2f71978a41a66d4</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0-preview.26222.3">
16+
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0-preview.26223.1">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
18-
<Sha>060576d66577f594185ecb5b0465bc2c4a6475c4</Sha>
18+
<Sha>e8a74b66b49be69b94cbc5fd5044146b7ed88490</Sha>
1919
</Dependency>
2020
<Dependency Name="MSTest" Version="4.3.0-preview.26223.4">
2121
<Uri>https://github.com/microsoft/testfx</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26211.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftTestingExtensionsCodeCoverageVersion>18.7.0-preview.26222.3</MicrosoftTestingExtensionsCodeCoverageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26222.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftTestingExtensionsCodeCoverageVersion>18.7.0-preview.26223.1</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.3.0-preview.26223.4</MSTestVersion>
1414
<MicrosoftTestingPlatformVersion>2.3.0-preview.26223.4</MicrosoftTestingPlatformVersion>

eng/common/tools.ps1

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,12 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
168168
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
169169
}
170170

171+
# Keep repo builds isolated from machine-installed SDK state and workload advertising.
172+
# This avoids preview SDK builds picking up mismatched workloads on CI images.
173+
$env:DOTNET_MULTILEVEL_LOOKUP = '0'
174+
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
175+
$env:DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE = '1'
176+
171177
# Find the first path on %PATH% that contains the dotnet.exe
172178
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
173179
$dotnetExecutable = GetExecutableFileName 'dotnet'
@@ -230,6 +236,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
230236
Write-PipelinePrependPath -Path $dotnetRoot
231237

232238
Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
239+
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
240+
Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
241+
Write-PipelineSetVariable -Name 'DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE' -Value '1'
233242

234243
return $global:_DotNetInstallDir = $dotnetRoot
235244
}
@@ -765,6 +774,10 @@ function MSBuild-Core() {
765774

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

777+
if ($ci -and $buildTool.Tool -eq 'dotnet') {
778+
$cmdArgs += ' /p:MSBuildEnableWorkloadResolver=false'
779+
}
780+
768781
# Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
769782
if ($env:MSBUILD_MT_ENABLED -eq "1") {
770783
$cmdArgs += ' -mt'
@@ -875,6 +888,12 @@ Create-Directory $ToolsetDir
875888
Create-Directory $TempDir
876889
Create-Directory $LogDir
877890

891+
# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location
892+
# under artifacts/log so they are captured as build artifacts in CI.
893+
if (-not $env:MSBUILDDEBUGPATH) {
894+
$env:MSBUILDDEBUGPATH = Join-Path $LogDir 'MsbuildDebugLogs'
895+
}
896+
878897
Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir
879898
Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir
880899
Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir

eng/common/tools.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@ function InitializeDotNetCli {
126126
export DOTNET_CLI_TELEMETRY_OPTOUT=1
127127
fi
128128

129+
# Keep repo builds isolated from machine-installed SDK state and workload advertising.
130+
# This avoids preview SDK builds picking up mismatched workloads on CI images.
131+
export DOTNET_MULTILEVEL_LOOKUP=0
132+
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
133+
export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=1
134+
129135
# LTTNG is the logging infrastructure used by Core CLR. Need this variable set
130136
# so it doesn't output warnings to the console.
131137
export LTTNG_HOME="$HOME"
@@ -171,6 +177,9 @@ function InitializeDotNetCli {
171177
Write-PipelinePrependPath -path "$dotnet_root"
172178

173179
Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
180+
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
181+
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
182+
Write-PipelineSetVariable -name "DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE" -value "1"
174183

175184
# return value
176185
_InitializeDotNetCli="$dotnet_root"
@@ -542,7 +551,12 @@ function MSBuild-Core {
542551
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=$warn_not_as_error"
543552
fi
544553

545-
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 "$@"
554+
local workload_resolver_switch=""
555+
if [[ "$ci" == true && -n "${_InitializeBuildToolCommand:-}" ]]; then
556+
workload_resolver_switch="/p:MSBuildEnableWorkloadResolver=false"
557+
fi
558+
559+
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 "$@"
546560
}
547561

548562
function GetDarc {
@@ -598,6 +612,12 @@ mkdir -p "$toolset_dir"
598612
mkdir -p "$temp_dir"
599613
mkdir -p "$log_dir"
600614

615+
# Direct MSBuild crash diagnostics (MSB4166 failure.txt files) to a known location
616+
# under artifacts/log so they are captured as build artifacts in CI.
617+
if [[ -z "${MSBUILDDEBUGPATH:-}" ]]; then
618+
export MSBUILDDEBUGPATH="$log_dir/MsbuildDebugLogs"
619+
fi
620+
601621
Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir"
602622
Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir"
603623
Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir"

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"runner": "Microsoft.Testing.Platform"
3838
},
3939
"msbuild-sdks": {
40-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26211.1",
40+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26222.1",
4141
"MSBuild.Sdk.Extras": "3.0.44"
4242
}
4343
}

0 commit comments

Comments
 (0)