Skip to content

Commit 56d4c10

Browse files
Merge pull request #63458 from dotnet/darc-release/10.0-0b5f1d61-512f-46bf-9db1-6245ce11f284
[release/10.0] Source code updates from dotnet/dotnet
1 parent 03e9582 commit 56d4c10

File tree

7 files changed

+293
-288
lines changed

7 files changed

+293
-288
lines changed

eng/Version.Details.props

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

eng/Version.Details.xml

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.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

eng/common/sdk-task.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ Param(
77
[switch] $restore,
88
[switch] $prepareMachine,
99
[switch][Alias('nobl')]$excludeCIBinaryLog,
10+
[switch]$noWarnAsError,
1011
[switch] $help,
1112
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1213
)
1314

1415
$ci = $true
1516
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
16-
$warnAsError = $true
17+
$warnAsError = if ($noWarnAsError) { $false } else { $true }
1718

1819
. $PSScriptRoot\tools.ps1
1920

eng/common/sdk-task.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo " --noWarnAsError Do not warn as error
1314
echo ""
1415
echo "Command line arguments not listed above are passed thru to msbuild."
1516
}
@@ -52,6 +53,7 @@ exclude_ci_binary_log=false
5253
restore=false
5354
help=false
5455
properties=''
56+
warnAsError=true
5557
5658
while (($# > 0)); do
5759
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -73,6 +75,10 @@ while (($# > 0)); do
7375
exclude_ci_binary_log=true
7476
shift 1
7577
;;
78+
--noWarnAsError)
79+
warnAsError=false
80+
shift 1
81+
;;
7682
--help)
7783
help=true
7884
shift 1
@@ -85,7 +91,6 @@ while (($# > 0)); do
8591
done
8692
8793
ci=true
88-
warnAsError=true
8994
9095
if $help; then
9196
show_usage

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
553553

554554
if (!(Test-Path $vsWhereExe)) {
555555
Create-Directory $vsWhereDir
556-
Write-Host 'Downloading vswhere $vswhereVersion'
556+
Write-Host "Downloading vswhere $vswhereVersion"
557557
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
558558
Retry({
559559
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe

global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25411.109"
3+
"version": "10.0.100-rc.1.25420.111"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-rc.1.25411.109",
6+
"dotnet": "10.0.100-rc.1.25420.111",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25420.109",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25427.104",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)