Skip to content

Commit 3d77251

Browse files
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26265.4 -> To Version 11.0.0-beta.26272.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent bdc381e commit 3d77251

10 files changed

Lines changed: 42 additions & 81 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26265.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26272.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>60e594d8a0e742ae93f96384508dcd690b2fbf01</Sha>
8+
<Sha>106da9762cd30768ee7cc944510daf476570a619</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/build.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ node_reuse=true
8484
build_check=false
8585
binary_log=false
8686
exclude_ci_binary_log=false
87-
pipelines_log=false
8887

8988
projects=''
9089
configuration=''
@@ -118,9 +117,6 @@ while [[ $# -gt 0 ]]; do
118117
-excludecibinarylog|-nobl)
119118
exclude_ci_binary_log=true
120119
;;
121-
-pipelineslog|-pl)
122-
pipelines_log=true
123-
;;
124120
-restore|-r)
125121
restore=true
126122
;;
@@ -210,7 +206,6 @@ if [[ -z "$configuration" ]]; then
210206
fi
211207

212208
if [[ "$ci" == true ]]; then
213-
pipelines_log=true
214209
node_reuse=false
215210
if [[ "$exclude_ci_binary_log" == false ]]; then
216211
binary_log=true

‎eng/common/core-templates/steps/source-index-stage1-publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20250906.1
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20260521.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20260521.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

77
steps:
88
- task: UseDotNet@2
9-
displayName: "Source Index: Use .NET 9 SDK"
9+
displayName: "Source Index: Use .NET 10 SDK"
1010
inputs:
1111
packageType: sdk
12-
version: 9.0.x
12+
version: 10.0.x
1313
installationPath: $(Agent.TempDirectory)/dotnet
1414
workingDirectory: $(Agent.TempDirectory)
1515

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ __AlpinePackages+=" openssl-dev"
7676
__AlpinePackages+=" zlib-dev"
7777

7878
__FreeBSDBase="13.5-RELEASE"
79-
__FreeBSDPkg="1.21.3"
79+
__FreeBSDPkg="2.7.5"
8080
__FreeBSDABI="13"
8181
__FreeBSDPackages="libunwind"
8282
__FreeBSDPackages+=" icu"
@@ -577,7 +577,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
577577
./autogen.sh && ./configure --prefix="$__RootfsDir"/host && make -j "$JOBS" && make install
578578
rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
579579
# install packages we need.
580-
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
580+
INSTALL_AS_USER=$(whoami) IGNORE_OSVERSION=yes "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
581581
# shellcheck disable=SC2086
582582
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
583583
elif [[ "$__CodeName" == "openbsd" ]]; then

‎eng/common/cross/install-debs.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,18 @@ def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool):
328328
raise ValueError(f"Unsupported compression format: {file_extension}")
329329

330330
with tarfile.open(tar_file_path, mode) as tar:
331-
tar.extractall(path=extract_dir, filter='tar')
331+
tar.extractall(path=extract_dir, filter=_rootfs_extraction_filter)
332+
333+
def _rootfs_extraction_filter(member, dest_path):
334+
"""Tarfile extraction filter based on the 'data' filter that additionally
335+
rewrites absolute-target symlinks/hardlinks into rootfs-relative paths.
336+
"""
337+
if (member.issym() or member.islnk()) and os.path.isabs(member.linkname):
338+
link_dir = os.path.dirname(member.name)
339+
new_linkname = os.path.relpath(member.linkname.lstrip('/'),
340+
start=link_dir or '.')
341+
member = member.replace(linkname=new_linkname, deep=False)
342+
return tarfile.data_filter(member, dest_path)
332343

333344
def finalize_setup(rootfsdir):
334345
lib_dir = os.path.join(rootfsdir, 'lib')

‎eng/common/pipeline-logging-functions.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function Write-PipelineTelemetryError {
3232
$PSBoundParameters.Remove('Category') | Out-Null
3333

3434
if ($Force -Or ((Test-Path variable:ci) -And $ci)) {
35-
$Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message"
35+
$Message = "($Category) $Message"
3636
}
3737
$PSBoundParameters.Remove('Message') | Out-Null
3838
$PSBoundParameters.Add('Message', $Message)

‎eng/common/templates/steps/vmr-sync.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ steps:
4545
workingDirectory: ${{ parameters.vmrPath }}
4646

4747
- script: |
48-
./eng/common/vmr-sync.sh \
49-
--vmr ${{ parameters.vmrPath }} \
50-
--tmp $(Agent.TempDirectory) \
51-
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
52-
--ci \
48+
./eng/common/vmr-sync.sh \
49+
--vmr ${{ parameters.vmrPath }} \
50+
--tmp $(Agent.TempDirectory) \
51+
--azdev-pat '$(AzdoToken)' \
52+
--ci \
5353
--debug
5454
5555
if [ "$?" -ne 0 ]; then
@@ -67,11 +67,11 @@ steps:
6767
condition: eq(variables['Agent.OS'], 'Windows_NT')
6868

6969
- powershell: |
70-
./eng/common/vmr-sync.ps1 `
71-
-vmr ${{ parameters.vmrPath }} `
72-
-tmp $(Agent.TempDirectory) `
73-
-azdevPat '$(dn-bot-all-orgs-code-r)' `
74-
-ci `
70+
./eng/common/vmr-sync.ps1 `
71+
-vmr ${{ parameters.vmrPath }} `
72+
-tmp $(Agent.TempDirectory) `
73+
-azdevPat '$(AzdoToken)' `
74+
-ci `
7575
-debugOutput
7676
7777
if ($LASTEXITCODE -ne 0) {

‎eng/common/tools.ps1‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
# Set to true to output binary log from msbuild. Note that emitting binary log slows down the build.
1414
[bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $ci -and !$excludeCIBinarylog }
1515

16-
# Set to true to use the pipelines logger which will enable Azure logging output.
17-
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
18-
# This flag is meant as a temporary opt-opt for the feature while validate it across
19-
# our consumers. It will be deleted in the future.
20-
[bool]$pipelinesLog = if (Test-Path variable:pipelinesLog) { $pipelinesLog } else { $ci }
21-
2216
# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes).
2317
[bool]$prepareMachine = if (Test-Path variable:prepareMachine) { $prepareMachine } else { $false }
2418

@@ -753,28 +747,13 @@ function Stop-Processes() {
753747
# Terminates the script if the build fails.
754748
#
755749
function MSBuild() {
756-
if ($pipelinesLog) {
757-
$buildTool = InitializeBuildTool
758-
759-
if ($ci -and $buildTool.Tool -eq 'dotnet') {
760-
$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
761-
$env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20
762-
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20'
763-
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
764-
}
750+
if ($ci) {
751+
$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
752+
$env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20
753+
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20'
754+
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
765755

766756
Enable-Nuget-EnhancedRetry
767-
768-
$toolsetBuildProject = InitializeToolset
769-
$basePath = Split-Path -parent $toolsetBuildProject
770-
$selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
771-
772-
if (-not $selectedPath) {
773-
Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
774-
ExitWithExitCode 1
775-
}
776-
777-
$args += "/logger:$selectedPath"
778757
}
779758

780759
MSBuild-Core @args

‎eng/common/tools.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ ci=${ci:-false}
88
# Build mode
99
source_build=${source_build:-false}
1010

11-
# Set to true to use the pipelines logger which will enable Azure logging output.
12-
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
13-
# This flag is meant as a temporary opt-opt for the feature while validate it across
14-
# our consumers. It will be deleted in the future.
15-
if [[ "$ci" == true ]]; then
16-
pipelines_log=${pipelines_log:-true}
17-
else
18-
pipelines_log=${pipelines_log:-false}
19-
fi
20-
2111
# Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names.
2212
configuration=${configuration:-'Debug'}
2313

@@ -513,26 +503,12 @@ function DotNet {
513503

514504
function MSBuild {
515505
local args=( "$@" )
516-
if [[ "$pipelines_log" == true ]]; then
517-
InitializeBuildTool
518-
InitializeToolset
519-
520-
if [[ "$ci" == true ]]; then
521-
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
522-
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
523-
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
524-
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
525-
fi
526-
527-
local toolset_dir="${_InitializeToolset%/*}"
528-
local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
529-
530-
if [[ -z "$selectedPath" ]]; then
531-
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath"
532-
ExitWithExitCode 1
533-
fi
534506

535-
args+=( "-logger:$selectedPath" )
507+
if [[ "$ci" == true ]]; then
508+
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
509+
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
510+
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
511+
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
536512
fi
537513

538514
MSBuild-Core "${args[@]}"

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dotnet": "11.0.100-preview.5.26227.104"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26265.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26272.4",
1212
"Microsoft.Build.NoTargets": "3.7.0",
1313
"Microsoft.Build.Traversal": "3.4.0"
1414
}

0 commit comments

Comments
 (0)