Skip to content

Commit d78740d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#5142)
[main] Source code updates from dotnet/dotnet
1 parent 584807a commit d78740d

File tree

11 files changed

+185
-179
lines changed

11 files changed

+185
-179
lines changed

‎eng/Version.Details.xml‎

Lines changed: 85 additions & 85 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<!-- Enable to remove prerelease label. -->
99
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1010
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
11-
<MicrosoftNETSdkWindowsDesktopVersion>10.0.0-preview.6.25313.102</MicrosoftNETSdkWindowsDesktopVersion>
12-
<MicrosoftDotNetWpfProjectTemplatesVersion>10.0.0-preview.6.25313.102</MicrosoftDotNetWpfProjectTemplatesVersion>
13-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25313.102</MicrosoftDotNetBuildTasksFeedVersion>
14-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25313.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
11+
<MicrosoftNETSdkWindowsDesktopVersion>10.0.0-preview.6.25314.101</MicrosoftNETSdkWindowsDesktopVersion>
12+
<MicrosoftDotNetWpfProjectTemplatesVersion>10.0.0-preview.6.25314.101</MicrosoftDotNetWpfProjectTemplatesVersion>
13+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25314.101</MicrosoftDotNetBuildTasksFeedVersion>
14+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25314.101</MicrosoftDotnetWinFormsProjectTemplatesVersion>
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<!-- arcade -->
18-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25313.102</MicrosoftDotNetBuildTasksArchivesVersion>
19-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25313.102</MicrosoftDotNetBuildTasksInstallersVersion>
20-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25313.102</MicrosoftDotNetBuildTasksTemplatingVersion>
18+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25314.101</MicrosoftDotNetBuildTasksArchivesVersion>
19+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25314.101</MicrosoftDotNetBuildTasksInstallersVersion>
20+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25314.101</MicrosoftDotNetBuildTasksTemplatingVersion>
2121
<!-- corefx -->
2222
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2323
<!-- The SQL team had deprecated System.Data.SqlClient package and replaced it with Microsoft.Data.SqlClient.
@@ -31,48 +31,48 @@
3131
<!-- nuget -->
3232
<NuGetPackagingVersion>6.12.1</NuGetPackagingVersion>
3333
<!-- runtime -->
34-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>10.0.0-preview.6.25313.102</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
35-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25313.102</MicrosoftNETCoreAppRefVersion>
36-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25313.102</MicrosoftNETCorePlatformsVersion>
37-
<MicrosoftWin32RegistryAccessControlVersion>10.0.0-preview.6.25313.102</MicrosoftWin32RegistryAccessControlVersion>
34+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>10.0.0-preview.6.25314.101</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
35+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25314.101</MicrosoftNETCoreAppRefVersion>
36+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25314.101</MicrosoftNETCorePlatformsVersion>
37+
<MicrosoftWin32RegistryAccessControlVersion>10.0.0-preview.6.25314.101</MicrosoftWin32RegistryAccessControlVersion>
3838
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
39-
<MicrosoftWin32SystemEventsVersion>10.0.0-preview.6.25313.102</MicrosoftWin32SystemEventsVersion>
40-
<SystemCodeDomVersion>10.0.0-preview.6.25313.102</SystemCodeDomVersion>
41-
<SystemComponentModelCompositionRegistrationVersion>10.0.0-preview.6.25313.102</SystemComponentModelCompositionRegistrationVersion>
42-
<SystemComponentModelCompositionVersion>10.0.0-preview.6.25313.102</SystemComponentModelCompositionVersion>
43-
<SystemConfigurationConfigurationManagerVersion>10.0.0-preview.6.25313.102</SystemConfigurationConfigurationManagerVersion>
44-
<SystemDataOdbcVersion>10.0.0-preview.6.25313.102</SystemDataOdbcVersion>
45-
<SystemDataOleDbVersion>10.0.0-preview.6.25313.102</SystemDataOleDbVersion>
46-
<SystemDiagnosticsEventLogVersion>10.0.0-preview.6.25313.102</SystemDiagnosticsEventLogVersion>
47-
<SystemDiagnosticsPerformanceCounterVersion>10.0.0-preview.6.25313.102</SystemDiagnosticsPerformanceCounterVersion>
48-
<SystemDirectoryServicesAccountManagementVersion>10.0.0-preview.6.25313.102</SystemDirectoryServicesAccountManagementVersion>
49-
<SystemDirectoryServicesProtocolsVersion>10.0.0-preview.6.25313.102</SystemDirectoryServicesProtocolsVersion>
50-
<SystemDirectoryServicesVersion>10.0.0-preview.6.25313.102</SystemDirectoryServicesVersion>
39+
<MicrosoftWin32SystemEventsVersion>10.0.0-preview.6.25314.101</MicrosoftWin32SystemEventsVersion>
40+
<SystemCodeDomVersion>10.0.0-preview.6.25314.101</SystemCodeDomVersion>
41+
<SystemComponentModelCompositionRegistrationVersion>10.0.0-preview.6.25314.101</SystemComponentModelCompositionRegistrationVersion>
42+
<SystemComponentModelCompositionVersion>10.0.0-preview.6.25314.101</SystemComponentModelCompositionVersion>
43+
<SystemConfigurationConfigurationManagerVersion>10.0.0-preview.6.25314.101</SystemConfigurationConfigurationManagerVersion>
44+
<SystemDataOdbcVersion>10.0.0-preview.6.25314.101</SystemDataOdbcVersion>
45+
<SystemDataOleDbVersion>10.0.0-preview.6.25314.101</SystemDataOleDbVersion>
46+
<SystemDiagnosticsEventLogVersion>10.0.0-preview.6.25314.101</SystemDiagnosticsEventLogVersion>
47+
<SystemDiagnosticsPerformanceCounterVersion>10.0.0-preview.6.25314.101</SystemDiagnosticsPerformanceCounterVersion>
48+
<SystemDirectoryServicesAccountManagementVersion>10.0.0-preview.6.25314.101</SystemDirectoryServicesAccountManagementVersion>
49+
<SystemDirectoryServicesProtocolsVersion>10.0.0-preview.6.25314.101</SystemDirectoryServicesProtocolsVersion>
50+
<SystemDirectoryServicesVersion>10.0.0-preview.6.25314.101</SystemDirectoryServicesVersion>
5151
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
52-
<SystemIOPackagingVersion>10.0.0-preview.6.25313.102</SystemIOPackagingVersion>
52+
<SystemIOPackagingVersion>10.0.0-preview.6.25314.101</SystemIOPackagingVersion>
5353
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
54-
<SystemIOPortsVersion>10.0.0-preview.6.25313.102</SystemIOPortsVersion>
55-
<SystemManagementVersion>10.0.0-preview.6.25313.102</SystemManagementVersion>
56-
<SystemReflectionContextVersion>10.0.0-preview.6.25313.102</SystemReflectionContextVersion>
57-
<SystemRuntimeCachingVersion>10.0.0-preview.6.25313.102</SystemRuntimeCachingVersion>
54+
<SystemIOPortsVersion>10.0.0-preview.6.25314.101</SystemIOPortsVersion>
55+
<SystemManagementVersion>10.0.0-preview.6.25314.101</SystemManagementVersion>
56+
<SystemReflectionContextVersion>10.0.0-preview.6.25314.101</SystemReflectionContextVersion>
57+
<SystemRuntimeCachingVersion>10.0.0-preview.6.25314.101</SystemRuntimeCachingVersion>
5858
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
5959
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
60-
<SystemSecurityCryptographyPkcsVersion>10.0.0-preview.6.25313.102</SystemSecurityCryptographyPkcsVersion>
61-
<SystemSecurityCryptographyProtectedDataVersion>10.0.0-preview.6.25313.102</SystemSecurityCryptographyProtectedDataVersion>
62-
<SystemSecurityCryptographyXmlVersion>10.0.0-preview.6.25313.102</SystemSecurityCryptographyXmlVersion>
63-
<SystemSecurityPermissionsVersion>10.0.0-preview.6.25313.102</SystemSecurityPermissionsVersion>
60+
<SystemSecurityCryptographyPkcsVersion>10.0.0-preview.6.25314.101</SystemSecurityCryptographyPkcsVersion>
61+
<SystemSecurityCryptographyProtectedDataVersion>10.0.0-preview.6.25314.101</SystemSecurityCryptographyProtectedDataVersion>
62+
<SystemSecurityCryptographyXmlVersion>10.0.0-preview.6.25314.101</SystemSecurityCryptographyXmlVersion>
63+
<SystemSecurityPermissionsVersion>10.0.0-preview.6.25314.101</SystemSecurityPermissionsVersion>
6464
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
65-
<SystemServiceModelSyndicationVersion>10.0.0-preview.6.25313.102</SystemServiceModelSyndicationVersion>
66-
<SystemServiceProcessServiceControllerVersion>10.0.0-preview.6.25313.102</SystemServiceProcessServiceControllerVersion>
67-
<SystemSpeechVersion>10.0.0-preview.6.25313.102</SystemSpeechVersion>
68-
<SystemTextEncodingCodePagesVersion>10.0.0-preview.6.25313.102</SystemTextEncodingCodePagesVersion>
69-
<SystemThreadingAccessControlVersion>10.0.0-preview.6.25313.102</SystemThreadingAccessControlVersion>
65+
<SystemServiceModelSyndicationVersion>10.0.0-preview.6.25314.101</SystemServiceModelSyndicationVersion>
66+
<SystemServiceProcessServiceControllerVersion>10.0.0-preview.6.25314.101</SystemServiceProcessServiceControllerVersion>
67+
<SystemSpeechVersion>10.0.0-preview.6.25314.101</SystemSpeechVersion>
68+
<SystemTextEncodingCodePagesVersion>10.0.0-preview.6.25314.101</SystemTextEncodingCodePagesVersion>
69+
<SystemThreadingAccessControlVersion>10.0.0-preview.6.25314.101</SystemThreadingAccessControlVersion>
7070
<!-- wcf -->
7171
<SystemServiceModelVersion>8.1.2</SystemServiceModelVersion>
7272
<!-- winforms -->
73-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25313.102</MicrosoftPrivateWinformsVersion>
74-
<SystemDrawingCommonVersion>10.0.0-preview.6.25313.102</SystemDrawingCommonVersion>
73+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25314.101</MicrosoftPrivateWinformsVersion>
74+
<SystemDrawingCommonVersion>10.0.0-preview.6.25314.101</SystemDrawingCommonVersion>
7575
<!-- WPF -->
76-
<MicrosoftDotNetWpfGitHubVersion>10.0.0-preview.6.25313.102</MicrosoftDotNetWpfGitHubVersion>
76+
<MicrosoftDotNetWpfGitHubVersion>10.0.0-preview.6.25314.101</MicrosoftDotNetWpfGitHubVersion>
7777
</PropertyGroup>
7878
</Project>

‎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

0 commit comments

Comments
 (0)