Skip to content

Publish Xdt with monthly releases#4853

Merged
mmitche merged 1 commit intodotnet:release/10.0.1xxfrom
mmitche:publish-xdt
Feb 17, 2026
Merged

Publish Xdt with monthly releases#4853
mmitche merged 1 commit intodotnet:release/10.0.1xxfrom
mmitche:publish-xdt

Conversation

@mmitche
Copy link
Copy Markdown
Member

@mmitche mmitche commented Feb 13, 2026

No description provided.

@mmitche
Copy link
Copy Markdown
Member Author

mmitche commented Feb 13, 2026

/backport to main

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to main (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

@mmitche backporting to main 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: Publish Xdt with monthly releases
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/xdt/eng/Publishing.props
CONFLICT (add/add): Merge conflict in src/xdt/eng/Publishing.props
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 Publish Xdt with monthly releases
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@ViktorHofer
Copy link
Copy Markdown
Member

Already enabled for 11.0 but not for 10.0.2xx or 10.0.3xx.

@mmitche
Copy link
Copy Markdown
Member Author

mmitche commented Feb 17, 2026

Already enabled for 11.0 but not for 10.0.2xx or 10.0.3xx.

2xx and 3xx don't have xdt in them.

@mmitche mmitche merged commit 09e4195 into dotnet:release/10.0.1xx Feb 17, 2026
11 checks passed
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.

3 participants