Skip to content

Commit 4dc10d6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#36242)
[main] Source code updates from dotnet/dotnet
1 parent d994045 commit 4dc10d6

File tree

13 files changed

+121
-114
lines changed

13 files changed

+121
-114
lines changed

‎Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
1010
</ItemGroup>
1111

12+
<ItemGroup>
13+
<FrameworkReference Update="Microsoft.NETCore.App"
14+
Condition="('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)') AND
15+
('$(PackAsTool)' != 'true')"
16+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
17+
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
18+
</ItemGroup>
19+
1220
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1321
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
1422

‎eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="20fdc50b34ee89e7c54eef0a193c30ed4816597a" BarId="271343" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25311.102">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25315.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
7+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25311.102">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25315.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
11+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25311.102">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25315.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
15+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25311.102">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25315.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
19+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25311.102">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25315.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
23+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25311.102">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25315.102">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
27+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25311.102">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25315.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
31+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25311.102">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25315.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
35+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25311.102">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25315.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
39+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25311.102">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25315.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
43+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25311.102">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25315.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
47+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25311.102">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25315.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
51+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25311.102">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25315.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
55+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25311.102">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25315.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
59+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25311.102">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25315.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
63+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25311.102">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
69+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25311.102">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25315.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
73+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25311.102">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25315.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>20fdc50b34ee89e7c54eef0a193c30ed4816597a</Sha>
77+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25311.102</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25311.102</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25311.102</MicrosoftNETCorePlatformsVersion>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25311.102</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.6.25311.102</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.6.25311.102</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.6.25311.102</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25315.102</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25315.102</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25315.102</MicrosoftNETCorePlatformsVersion>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25315.102</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.6.25315.102</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.6.25315.102</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.6.25315.102</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25311.102</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25315.102</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>

‎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

0 commit comments

Comments
 (0)