-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Remove dependency on netstandard.library.ref #20039
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
Conversation
Can't you just remove the reference and let the SDK provide the default one? |
We probably could - looks like the only place we use the version is here: aspnetcore/Directory.Build.targets Lines 137 to 139 in 3787d7e
And core-sdk is already pinned to 2.1.0: So we should be able to get away with relying on them for the version & removing the workaround. @dougbu @JunTaoLuo do you remember if there was another reason that we needed that |
Yeah, I'd prefer to remove the dependency over pinning if possible. |
Updated |
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.
LGTM assuming the KnownFrameworkReference part is ok.
Believe that was added before the SDKs referenced the final .NET Standard library. Doubt we need the workaround in any branch anymore. @ericstj dotnet/runtime is only 'master'. Do dotnet/core-setup and related repos still create / package NETStandard.Library in other branches? (@wtgodbe if not, please stand up PRs for when the other branches open using the https://github.com/dotnet/aspnetcore-internal/blob/master/docs/engineering/servicing-and-preview-fixes.md process.) |
Yup, what @wtgodbe did is perfect. |
77d2c97
to
24a15ca
Compare
@dougbu I followed the instructions in https://github.com/dotnet/aspnetcore-internal/blob/master/docs/engineering/servicing-and-preview-fixes.md for this branch, is it expected there'd be merge conflicts? |
3.1 PR (same branch): #20043 |
Yeah, I'd expect merge conflicts because you're touching eng/Versions.props -- one of the files that changes significantly between branches. Use the no-op merge approach I detailed near the bottom of https://github.com/dotnet/aspnetcore-internal/blob/master/docs/engineering/servicing-and-preview-fixes.md and restore your previous "fix for realz" changes in this branch -- separately. |
Or is it saying I need to create a branch off of wtgodbe/standard that no-op merges #20043 to master, then separately create another PR that does the "right thing" in master off of a 3rd branch? And won't the "no-op" PR actually have some changes, since some but not all of that branch merges cleanly into master? This process seems very cumbersome... |
@wtgodbe see https://github.com/dotnet/aspnetcore-internal/blob/master/docs/engineering/servicing-and-preview-fixes.md#distinct-changes-needed-in-one-or-more-branch in particular. If that doesn't help unconfuse you, please contact me on Teams. |
24a15ca
to
7e974d4
Compare
Rebased this to be strictly against master, since the 3.1 change is unneeded |
This package isn't being produced out of dotnet/runtime anymore - we should just use the default version that is bundled with the SDK rather than listing a dependency on it.
CC @dagood @Pilchie @ericstj