Skip to content

Install .NET 8 before running Publish Using Darc#16263

Merged
dkurepa merged 2 commits intodotnet:mainfrom
dkurepa:dkurepa/InstallGlobalJsonDotnetWhenPublishing
Nov 4, 2025
Merged

Install .NET 8 before running Publish Using Darc#16263
dkurepa merged 2 commits intodotnet:mainfrom
dkurepa:dkurepa/InstallGlobalJsonDotnetWhenPublishing

Conversation

@dkurepa
Copy link
Copy Markdown
Member

@dkurepa dkurepa commented Nov 4, 2025

@dkurepa
Copy link
Copy Markdown
Member Author

dkurepa commented Nov 4, 2025

/backport to release/10.0

@dkurepa
Copy link
Copy Markdown
Member Author

dkurepa commented Nov 4, 2025

/backport to release/9.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 4, 2025

Started backporting to release/9.0 (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 4, 2025

@dkurepa backporting to release/9.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Install .NET 8 before running Publish Using Darc
Using index info to reconstruct a base tree...
M	eng/common/core-templates/job/publish-build-assets.yml
M	eng/common/core-templates/post-build/post-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/core-templates/job/publish-build-assets.yml
Auto-merging eng/common/core-templates/post-build/post-build.yml
CONFLICT (content): Merge conflict in eng/common/core-templates/post-build/post-build.yml
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 Install .NET 8 before running Publish Using Darc
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@dkurepa
Copy link
Copy Markdown
Member Author

dkurepa commented Nov 4, 2025

/backport to release/10.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 4, 2025

Started backporting to release/10.0 (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 4, 2025

@dkurepa backporting to release/10.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Install .NET 8 before running Publish Using Darc
Using index info to reconstruct a base tree...
M	eng/common/core-templates/job/publish-build-assets.yml
M	eng/common/core-templates/post-build/post-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/core-templates/job/publish-build-assets.yml
Auto-merging eng/common/core-templates/post-build/post-build.yml
CONFLICT (content): Merge conflict in eng/common/core-templates/post-build/post-build.yml
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 Install .NET 8 before running Publish Using Darc
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@dkurepa dkurepa merged commit 9b521bd into dotnet:main Nov 4, 2025
10 checks passed
JoeRobich added a commit that referenced this pull request Jan 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants