-
Notifications
You must be signed in to change notification settings - Fork 728
[dev] Source code updates from dotnet/dotnet #6702
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.
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
ViktorHofer
merged 3 commits into
dev
from
darc-dev-8c407223-33ec-4803-93b2-7e474c311942
Aug 14, 2025
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
68d6caf
Backflow from https://github.com/dotnet/dotnet / e9f665e build 278626
dotnet-maestro[bot] 079f6f9
Update dependencies from https://github.com/dotnet/dotnet build 278626
dotnet-maestro[bot] 15dd747
Merge branch 'dev' into darc-dev-8c407223-33ec-4803-93b2-7e474c311942
nkolev92 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| @echo off | ||
| powershell -NoLogo -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1"""%*" | ||
| exit /b %ErrorLevel% | ||
| powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,47 @@ | ||
|
|
||
| # The VMR orchestrator passes a number of stnadar | ||
| [CmdletBinding(PositionalBinding=$false)] | ||
| param ( | ||
| [string][Alias('c')]$configuration = "Release", | ||
| [string][Alias('v')]$verbosity = "minimal", | ||
| [switch]$ci, | ||
| [switch]$prepareMachine, | ||
| [string]$msbuildEngine = $null, | ||
| [switch][Alias('bl')]$binaryLog, | ||
| [switch][Alias('nobl')]$excludeCIBinarylog, | ||
| [switch][Alias('pb')]$productBuild, | ||
| [switch]$fromVMR, | ||
| [bool]$warnAsError = $true, | ||
| [bool]$nodeReuse = $true, | ||
| [Parameter(ValueFromRemainingArguments = $true)][string[]]$properties | ||
| ) | ||
|
|
||
| # This will exec a process using the console and return it's exit code. | ||
| # This will not throw when the process fails. | ||
| # Returns process exit code. | ||
| function Exec-Process([string]$command, [string]$commandArgs) { | ||
| $startInfo = New-Object System.Diagnostics.ProcessStartInfo | ||
| $startInfo.FileName = $command | ||
| $startInfo.Arguments = $commandArgs | ||
| Write-Host $command | ||
| WRite-Host $commandArgs | ||
| $startInfo.UseShellExecute = $false | ||
| $startInfo.WorkingDirectory = Get-Location | ||
|
|
||
| $process = New-Object System.Diagnostics.Process | ||
| $process.StartInfo = $startInfo | ||
| $process.Start() | Out-Null | ||
|
|
||
| $finished = $false | ||
| try { | ||
| while (-not $process.WaitForExit(100)) { | ||
| # Non-blocking loop done to allow ctr-c interrupts | ||
| } | ||
|
|
||
| $finished = $true | ||
| return $global:LASTEXITCODE = $process.ExitCode | ||
| } | ||
| finally { | ||
| # If we didn't finish then an error occurred or the user hit ctrl-c. Either | ||
| # way kill the process | ||
| if (-not $finished) { | ||
| $process.Kill() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| $dotnet = Join-Path $env:DOTNET_PATH dotnet.exe | ||
| $repoRoot = Resolve-Path "$PSScriptRoot/../../" | ||
| $nugetPackagesRoot = Join-Path $repoRoot "artifacts/.packages/" | ||
|
|
||
| # Environment variables | ||
| $env:NUGET_PACKAGES=$nugetPackagesRoot | ||
| . $PSScriptRoot\..\common\tools.ps1 | ||
|
|
||
| # MSBuild arguments | ||
| $dotnetArguments = @() | ||
| $dotnetArguments += "$PSScriptRoot/dotnet-build.proj" | ||
| $dotnetArguments += "/p:RepoRoot=$repoRoot" | ||
| $dotnetArguments += "/p:Configuration=$configuration" | ||
| $dotnetArguments += "/p:DotNetBuild=$productBuild" | ||
| $dotnetArguments += "/p:DotNetBuildFromVMR=$fromVMR" | ||
| function Build { | ||
| $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' } | ||
|
|
||
| $bl = if ($binaryLog) { "/bl:" + (Join-Path $repoRoot "artifacts/log/$configuration/Build.binlog") } else { '' } | ||
| if ($ci) { | ||
| $nodeReuse = $false | ||
| } | ||
|
|
||
| $cmdArgs = "$dotnet msbuild /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" | ||
|
|
||
| if ($warnAsError) { | ||
| $cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true' | ||
| } | ||
| else { | ||
| $cmdArgs += ' /p:TreatWarningsAsErrors=false' | ||
| MSBuild "$PSScriptRoot\dotnet-build.proj" ` | ||
| $bl ` | ||
| /p:Configuration=$configuration ` | ||
| /p:RepoRoot=$RepoRoot ` | ||
| /p:DotNetBuild=$productBuild ` | ||
| /p:DotNetBuildFromVMR=$fromVMR ` | ||
| @properties | ||
| } | ||
|
|
||
| try { | ||
| $exitCode = Exec-Process $cmdArgs $bl "$dotnetArguments" "$properties" | ||
| if ($exitCode -ne 0) { | ||
| exit $exitCode | ||
| if ($ci) { | ||
| if (-not $excludeCIBinarylog) { | ||
| $binaryLog = $true | ||
| } | ||
| $nodeReuse = $false | ||
| } | ||
|
|
||
| Build | ||
| } | ||
| catch { | ||
| exit 1 | ||
| } | ||
| Write-Host $_.ScriptStackTrace | ||
| Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ | ||
| ExitWithExitCode 1 | ||
| } | ||
|
|
||
| ExitWithExitCode 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.