Skip to content

Commit 5525c4c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#1271)
* Update dependencies from https://github.com/dotnet/dotnet build 271708 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25311.107 -> 10.0.0-beta.25313.102) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-preview.6.25311.107 -> 10.0.100-preview.6.25313.102) * Update dependencies from https://github.com/dotnet/dotnet build 271805 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25313.102 -> 10.0.0-beta.25314.101) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-preview.6.25313.102 -> 10.0.100-preview.6.25314.101) * Update dependencies from https://github.com/dotnet/dotnet build 271836 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25314.101 -> 10.0.0-beta.25315.102) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-preview.6.25314.101 -> 10.0.100-preview.6.25315.102) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 20adb90 commit 5525c4c

File tree

11 files changed

+65
-59
lines changed

11 files changed

+65
-59
lines changed

‎eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="25bec1af21db71468c5c2c3a588dd54d0e058e9d" BarId="271417" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25311.107">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>25bec1af21db71468c5c2c3a588dd54d0e058e9d</Sha>
7+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.6.25311.107">
9+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.6.25315.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>25bec1af21db71468c5c2c3a588dd54d0e058e9d</Sha>
11+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
1414
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1818
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
1919
<!-- SDK dependencies -->
20-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.6.25311.107</MicrosoftDotNetGenAPITaskPackageVersion>
20+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.6.25315.102</MicrosoftDotNetGenAPITaskPackageVersion>
2121
<!-- xUnit dependencies -->
2222
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
2323
</PropertyGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
parameters:
22
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
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 8 SDK"
9+
displayName: "Source Index: Use .NET 9 SDK"
1010
inputs:
1111
packageType: sdk
12-
version: 8.0.x
12+
version: 9.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
@@ -295,8 +295,8 @@ while :; do
295295
;;
296296
noble) # Ubuntu 24.04
297297
__CodeName=noble
298-
if [[ -n "$__LLDB_Package" ]]; then
299-
__LLDB_Package="liblldb-18-dev"
298+
if [[ -z "$__LLDB_Package" ]]; then
299+
__LLDB_Package="liblldb-19-dev"
300300
fi
301301
;;
302302
stretch) # Debian 9

‎eng/common/dotnet.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
3+
:: This script is used to install the .NET SDK.
4+
:: It will also invoke the SDK with any provided arguments.
5+
6+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
7+
exit /b %ErrorLevel%

‎eng/common/dotnet.ps1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This script is used to install the .NET SDK.
2+
# It will also invoke the SDK with any provided arguments.
3+
4+
. $PSScriptRoot\tools.ps1
5+
$dotnetRoot = InitializeDotNetCli -install:$true
6+
7+
# Invoke acquired SDK with args if they are provided
8+
if ($args.count -gt 0) {
9+
$env:DOTNET_NOLOGO=1
10+
& "$dotnetRoot\dotnet.exe" $args
11+
}

‎eng/common/dotnet.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
# This script is used to install the .NET SDK.
4+
# It will also invoke the SDK with any provided arguments.
5+
6+
source="${BASH_SOURCE[0]}"
7+
# resolve $SOURCE until the file is no longer a symlink
8+
while [[ -h $source ]]; do
9+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
10+
source="$(readlink "$source")"
11+
12+
# if $source was a relative symlink, we need to resolve it relative to the path where the
13+
# symlink file was located
14+
[[ $source != /* ]] && source="$scriptroot/$source"
15+
done
16+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
17+
18+
source $scriptroot/tools.sh
19+
InitializeDotNetCli true # install
20+
21+
# Invoke acquired SDK with args if they are provided
22+
if [[ $# > 0 ]]; then
23+
__dotnetDir=${_InitializeDotNetCli}
24+
dotnetPath=${__dotnetDir}/dotnet
25+
${dotnetPath} "$@"
26+
fi

‎eng/common/templates/vmr-build-pr.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
trigger: none
2-
pr:
3-
branches:
4-
include:
5-
- main
6-
- release/*
7-
paths:
8-
exclude:
9-
- documentation/*
10-
- README.md
11-
- CODEOWNERS
2+
pr: none
123

134
variables:
145
- template: /eng/common/templates/variables/pool-providers.yml@self

‎eng/common/tools.ps1

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -765,28 +765,13 @@ function MSBuild() {
765765

766766
$toolsetBuildProject = InitializeToolset
767767
$basePath = Split-Path -parent $toolsetBuildProject
768-
$possiblePaths = @(
769-
# new scripts need to work with old packages, so we need to look for the old names/versions
770-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
771-
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
772-
773-
# This list doesn't need to be updated anymore and can eventually be removed.
774-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
775-
(Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
776-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
777-
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
778-
)
779-
$selectedPath = $null
780-
foreach ($path in $possiblePaths) {
781-
if (Test-Path $path -PathType Leaf) {
782-
$selectedPath = $path
783-
break
784-
}
785-
}
768+
$selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
769+
786770
if (-not $selectedPath) {
787-
Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
771+
Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
788772
ExitWithExitCode 1
789773
}
774+
790775
$args += "/logger:$selectedPath"
791776
}
792777

‎eng/common/tools.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -447,27 +447,13 @@ function MSBuild {
447447
fi
448448

449449
local toolset_dir="${_InitializeToolset%/*}"
450-
# new scripts need to work with old packages, so we need to look for the old names/versions
451-
local selectedPath=
452-
local possiblePaths=()
453-
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
454-
possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
455-
456-
# This list doesn't need to be updated anymore and can eventually be removed.
457-
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
458-
possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
459-
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
460-
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
461-
for path in "${possiblePaths[@]}"; do
462-
if [[ -f $path ]]; then
463-
selectedPath=$path
464-
break
465-
fi
466-
done
450+
local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
451+
467452
if [[ -z "$selectedPath" ]]; then
468-
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly."
453+
Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath"
469454
ExitWithExitCode 1
470455
fi
456+
471457
args+=( "-logger:$selectedPath" )
472458
fi
473459

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.6.25302.104"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25311.107",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)