Skip to content

[release/10.0] Source code updates from dotnet/dotnet #63458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 29, 2025
Merged

[release/10.0] Source code updates from dotnet/dotnet #63458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2477782
Merge release/10.0 into darc-release/10.0-0b5f1d61-512f-46bf-9db1-624…
dotnet-maestro[bot] Aug 28, 2025
3dd5bd5
Update dependencies from https://github.com/dotnet/dotnet build 281059
dotnet-maestro[bot] Aug 28, 2025
5a55b9a
Update dependencies from https://github.com/dotnet/dotnet build 281128
dotnet-maestro[bot] Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 92 additions & 93 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog

Expand Down
3 changes: 2 additions & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ Param(
[switch] $restore,
[switch] $prepareMachine,
[switch][Alias('nobl')]$excludeCIBinaryLog,
[switch]$noWarnAsError,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)

$ci = $true
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
$warnAsError = $true
$warnAsError = if ($noWarnAsError) { $false } else { $true }

. $PSScriptRoot\tools.ps1

Expand Down
7 changes: 6 additions & 1 deletion eng/common/sdk-task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ show_usage() {

echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --noWarnAsError Do not warn as error
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
Expand Down Expand Up @@ -52,6 +53,7 @@ exclude_ci_binary_log=false
restore=false
help=false
properties=''
warnAsError=true

while (($# > 0)); do
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
Expand All @@ -73,6 +75,10 @@ while (($# > 0)); do
exclude_ci_binary_log=true
shift 1
;;
--noWarnAsError)
warnAsError=false
shift 1
;;
--help)
help=true
shift 1
Expand All @@ -85,7 +91,6 @@ while (($# > 0)); do
done

ci=true
warnAsError=true

if $help; then
show_usage
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){

if (!(Test-Path $vsWhereExe)) {
Create-Directory $vsWhereDir
Write-Host 'Downloading vswhere $vswhereVersion'
Write-Host "Downloading vswhere $vswhereVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-rc.1.25411.109"
"version": "10.0.100-rc.1.25420.111"
},
"tools": {
"dotnet": "10.0.100-rc.1.25411.109",
"dotnet": "10.0.100-rc.1.25420.111",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
Expand All @@ -27,9 +27,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25420.109",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25427.104",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
Loading