.NET Source-Build 10.0.100-rc.2.25502.107 October 2025 Updates #2907
Conversation
|
All source-built release artifacts are now located at |
|
All builds are failing with |
|
@mmitche should the release build be pushed into the non-internal RC2 channel? |
Yeah we can do that |
|
@dotnet/source-build - can I please get a review on this? Thanks in advance. |
|
@ellahathaway - Can you help ensure the changes to |
|
/backport to main |
|
@ellahathaway backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: .NET 10.0.100-rc.2.25502.107 update
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/publish-build-assets.yml
M eng/common/core-templates/jobs/jobs.yml
M eng/common/sdk-task.sh
M eng/common/templates-official/variables/sdl-variables.yml
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
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/common/SetupNugetSources.ps1
Auto-merging eng/common/SetupNugetSources.sh
Auto-merging eng/common/core-templates/job/publish-build-assets.yml
CONFLICT (content): Merge conflict in eng/common/core-templates/job/publish-build-assets.yml
Auto-merging eng/common/core-templates/jobs/jobs.yml
CONFLICT (content): Merge conflict in eng/common/core-templates/jobs/jobs.yml
Auto-merging eng/common/sdk-task.sh
CONFLICT (content): Merge conflict in eng/common/sdk-task.sh
Auto-merging eng/common/templates-official/variables/sdl-variables.yml
CONFLICT (content): Merge conflict in eng/common/templates-official/variables/sdl-variables.yml
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 .NET 10.0.100-rc.2.25502.107 update
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
@mthalman - This requires re-bootstrapping these branches. I think a re-bootstrap makes sense for 2xx (see #3026 (comment)), but do we need to re-bootstrap main? |
| @@ -1,3 +1,4 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
There was a problem hiding this comment.
why did this add the <?xml back?
I also see quite a lot of newline-at-end-of-file changes in this diff
There was a problem hiding this comment.
Thanks for catching this. I created the changes in this PR with this new infra. I will investigate.
There was a problem hiding this comment.
Looks like my new logic added the <?xml back. I will fix that. I also verified that my code caused EOL changes to the versions.props and global.json file.
For all of the other EOL diffs, it looks like darc is potentially the culprit? I ran darc update-dependencies locally with the build ID from the release and verified that it added all of those newlines. I don't see any settings in the VMR repo that could cause these newlines otherwise, and I don't have any local git settings configured that could've caused this either.
6 participants
Source-build updates for the .NET 10.0.0-rc.2.25502.107 / 10.0.100-rc.2.25502.107 release.