Skip to content
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

Fix Version.Details.xml merge failure #32748

Merged
merged 2 commits into from
Feb 24, 2020
Merged

Fix Version.Details.xml merge failure #32748

merged 2 commits into from
Feb 24, 2020

Conversation

ViktorHofer
Copy link
Member

Broken by 9a08506.
Missing tag.

Broken by 9a08506.
Missing <Dependency> tag.
@ViktorHofer ViktorHofer self-assigned this Feb 24, 2020
@ViktorHofer
Copy link
Member Author

@jaredpar that doesn't fix the signing validation break but the "Prepare for Publish" step which was failing in the last build: https://dev.azure.com/dnceng/internal/_build/results?buildId=534343.

@jaredpar
Copy link
Member

@ViktorHofer ah okay. Misread the title. Removed the comment linking the issues.

@ViktorHofer
Copy link
Member Author

Merging as this path isn't exercised in CI. Opened dotnet/arcade-services#2534 to track guarding this.

@ViktorHofer ViktorHofer merged commit b93b498 into master Feb 24, 2020
@ViktorHofer ViktorHofer deleted the ViktorHofer-patch-1 branch February 24, 2020 18:18
Copy link
Member

@akoeplinger akoeplinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix. I should stop using the GitHub Web UI for conflict resolution, I always mess something up there.

@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants