-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[main] Source code updates from dotnet/dotnet #52028
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
Closed
dotnet-maestro
wants to merge
8
commits into
main
from
darc-main-24ea8807-f780-476e-83c8-f7ebf5610b67
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
87ffbb1
Backflow from https://github.com/dotnet/dotnet / 29eefe2 build 293166
dotnet-maestro[bot] 2d8e6d9
Update dependencies from https://github.com/dotnet/dotnet build 293166
dotnet-maestro[bot] 246c7be
Merge branch 'main' into darc-main-24ea8807-f780-476e-83c8-f7ebf5610b67
MiYanni afe4502
Update dependencies from https://github.com/dotnet/dotnet build 293255
dotnet-maestro[bot] 7c18529
Merge branch 'main' into darc-main-24ea8807-f780-476e-83c8-f7ebf5610b67
DonnaChen888 8fa23b1
Manually resolve conflicts
ViktorHofer e98de98
Add Microsoft.CodeAnalysis.ExternalAccess.HotReload entry
ViktorHofer e9e0d96
Merge branch 'main' into darc-main-24ea8807-f780-476e-83c8-f7ebf5610b67
SimonZhao888 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most of the changes in this file are due to NuGet dependencies flowing via the VMR (so from dotnet/dotnet) which is correct and therefore the entries getting moved up into the "dotnet/dotnet dependencies" section.
5a135a4 updated nuget dependencies two months ago but marked them as coming from nuget-client, which is wrong. NuGet-Client dependencies should always be consumed from VMR builds here in sdk. That's why we now see this large reshuffle cc @marcpopMSFT
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the context and for pinging. I believe this backlog of NuGet changes from November (7.0.0-preview.1.1610 to 7.0.0-preview.1.10406) have caused some issues that are now surfacing, since the VMR isn't testing the logic.
One is that prune package data is failing:
from
TrimmingOptions_Are_Defaulted_Correctly_On_Aot_Appsfor example. This seems to be impacting many tests.The targeting packs data doesn't seem to work either.
The other is that the Pack target is now missing in some of the NuGet tests:
@dotnet/nuget-team May you PTAL at these?
I think @nkolev92 is a good resource for prune package issues. @dsplaisted, are you familiar with the prune package issue - and do you think this would help #51978?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think 51978 will help - so this will require some investigation from nuget.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure about the prune issue. That's more of an internal thing for the SDK.
Regarding the pack stuff, @zivkan can probably help.
This is unfortunately probably related to dotnet/dotnet#3463 being really far out