Moved call to TryLoadGenericMetaTypeNullability #71851
Conversation
The TryLoadGenericMetaTypeNullability method was called with the same member info but varying nullability across the entire nullability hierarchy. Moved it one level up where nullability and member info are aligned. Added a test to cover this issue. Fix dotnet#68461
ghost
added
the
community-contribution
|
|
|
Tagging subscribers to this area: @dotnet/area-system-reflection Issue DetailsThe TryLoadGenericMetaTypeNullability method was called with the same Added a test to cover this issue. Fix #68461
|
src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
Outdated
Show resolved
Hide resolved
|
Is there anything else I should do (to the PR/issue/etc.) at this time? |
Nothing for now, just waiting CI build/test finish, most likely there will not issue for merge |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3990053331 |
|
@buyaa-n backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Moved call to TryLoadGenericMetaTypeNullability
Using index info to reconstruct a base tree...
M src/libraries/System.Private.CoreLib/src/System/Reflection/NullabilityInfoContext.cs
M src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Reflection/NullabilityInfoContext.cs
CONFLICT (content): Merge conflict in src/libraries/System.Private.CoreLib/src/System/Reflection/NullabilityInfoContext.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Moved call to TryLoadGenericMetaTypeNullability
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@buyaa-n an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
The TryLoadGenericMetaTypeNullability method was called with the same
member info but varying nullability across the entire nullability
hierarchy. Moved it one level up where nullability and member info are
aligned.
Added a test to cover this issue.
Fix #68461