Skip to content

[release/10.0.1xx] Try cleanup feeds#32142

Merged
rmarinho merged 2 commits intorelease/10.0.1xxfrom
release-cleanup-feeds
Oct 22, 2025
Merged

[release/10.0.1xx] Try cleanup feeds#32142
rmarinho merged 2 commits intorelease/10.0.1xxfrom
release-cleanup-feeds

Conversation

@rmarinho
Copy link
Member

Description of Change

Cleanup our extra feeds

@rmarinho rmarinho added this to the .NET 10.0 GA milestone Oct 22, 2025
Copilot AI review requested due to automatic review settings October 22, 2025 08:53
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR removes outdated NuGet package feed sources from the NuGet.config file to streamline dependency management. The changes focus on cleaning up duplicate and obsolete feed entries that are no longer needed for the release/10.0.1xx branch.

Key Changes:

  • Removed duplicate automated feed entries managed by Dependency Flow automation
  • Removed manually added feeds for .NET 8 and .NET 9 Android and macOS dependencies that are likely no longer required

@rmarinho
Copy link
Member Author

/backport to net10.0

@github-actions
Copy link
Contributor

Started backporting to net10.0: https://github.com/dotnet/maui/actions/runs/18716342141

@github-actions
Copy link
Contributor

@rmarinho backporting to "net10.0" failed, the patch most likely resulted in conflicts:

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

Applying: Try cleanup feeds
Using index info to reconstruct a base tree...
M	NuGet.config
Falling back to patching base and 3-way merge...
Auto-merging NuGet.config
CONFLICT (content): Merge conflict in NuGet.config
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 Try cleanup feeds
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@rmarinho rmarinho merged commit 4a7f359 into release/10.0.1xx Oct 22, 2025
4 of 5 checks passed
@rmarinho rmarinho deleted the release-cleanup-feeds branch October 22, 2025 16:46
@github-actions github-actions bot locked and limited conversation to collaborators Nov 22, 2025
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.

2 participants