Re-Bootstrap Source Build to .NET 10.0.100-rc.1.25420.111 #2037
Conversation
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
Member
|
@nkolev92 The VMR now sets
Is that expected? |
ViktorHofer
approved these changes
Aug 21, 2025
akoeplinger
approved these changes
Aug 21, 2025
Member
|
/backport to main |
Contributor
|
Started backporting to main: https://github.com/dotnet/dotnet/actions/runs/17127114633 |
Contributor
|
@ViktorHofer backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Re-Bootstrap Source Build to .NET 10.0.100-rc.1.25420.111
.git/rebase-apply/patch:467: trailing whitespace.
arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/Version.Details.props
M eng/Version.Details.xml
M eng/Versions.props
M eng/common/SetupNugetSources.ps1
M eng/common/SetupNugetSources.sh
M eng/common/core-templates/job/job.yml
M eng/common/core-templates/job/onelocbuild.yml
M eng/common/core-templates/job/publish-build-assets.yml
M eng/common/core-templates/jobs/codeql-build.yml
M eng/common/core-templates/jobs/jobs.yml
M eng/common/core-templates/post-build/post-build.yml
M eng/common/core-templates/post-build/setup-maestro-vars.yml
M eng/common/core-templates/steps/enable-internal-sources.yml
M eng/common/core-templates/steps/generate-sbom.yml
M eng/common/core-templates/steps/publish-logs.yml
M eng/common/core-templates/steps/source-index-stage1-publish.yml
M eng/common/generate-locproject.ps1
M eng/common/sdk-task.ps1
M eng/common/sdk-task.sh
M eng/common/template-guidance.md
M eng/common/templates-official/job/job.yml
M eng/common/templates-official/variables/sdl-variables.yml
M eng/common/templates/job/job.yml
M eng/common/tools.ps1
M global.json
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.props
CONFLICT (content): Merge conflict in eng/Version.Details.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging eng/Versions.props
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Re-Bootstrap Source Build to .NET 10.0.100-rc.1.25420.111
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
ViktorHofer
added a commit
that referenced
this pull request
Aug 21, 2025
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
ViktorHofer
added a commit
that referenced
this pull request
Aug 21, 2025
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
premun
pushed a commit
to premun/dotnet
that referenced
this pull request
Aug 22, 2025
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Re-Bootstrap Source Build to .NET 10.0.100-rc.1.25420.111
Needed for #2016 (approved for RC1), triggered by @ViktorHofer