-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
Apply custom Message and Url to all [RequiresPreviewFeatures] attributes #60379
Conversation
…atures] attributes
Note regarding the This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change. |
src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.cs
Show resolved
Hide resolved
@lewing do you know why this might have happened? It got killed. This was after ~25 mins so I don't think it was timed out.
|
/backport to release/6.0 I'm invoking this early so that we can go ahead and send this for tactics consideration into 6.0 GA. |
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1344506847 |
Tagging subscribers to this area: @dotnet/area-system-runtime Issue DetailsWith #56498 we have added Literally updated all APIs
|
@jeffhandley backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Apply custom messages and urls to all generic math [RequiresPreviewFeatures] attributes
Using index info to reconstruct a base tree...
M eng/Versions.props
M src/libraries/System.Private.CoreLib/src/System/Byte.cs
M src/libraries/System.Private.CoreLib/src/System/Char.cs
M src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
M src/libraries/System.Private.CoreLib/src/System/DateTime.cs
M src/libraries/System.Private.CoreLib/src/System/DateTimeOffset.cs
M src/libraries/System.Private.CoreLib/src/System/Decimal.cs
M src/libraries/System.Private.CoreLib/src/System/Double.cs
M src/libraries/System.Private.CoreLib/src/System/Guid.cs
M src/libraries/System.Private.CoreLib/src/System/Half.cs
M src/libraries/System.Private.CoreLib/src/System/Int16.cs
M src/libraries/System.Private.CoreLib/src/System/Int32.cs
M src/libraries/System.Private.CoreLib/src/System/Int64.cs
M src/libraries/System.Private.CoreLib/src/System/IntPtr.cs
M src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.cs
M src/libraries/System.Private.CoreLib/src/System/SByte.cs
M src/libraries/System.Private.CoreLib/src/System/Single.cs
M src/libraries/System.Private.CoreLib/src/System/TimeOnly.cs
M src/libraries/System.Private.CoreLib/src/System/TimeSpan.cs
M src/libraries/System.Private.CoreLib/src/System/UInt16.cs
M src/libraries/System.Private.CoreLib/src/System/UInt32.cs
M src/libraries/System.Private.CoreLib/src/System/UInt64.cs
M src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs
M src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.cs
M src/libraries/System.Runtime/ref/System.Runtime.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/ref/System.Runtime.cs
Auto-merging src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/UInt64.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/UInt32.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/UInt16.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/TimeSpan.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/TimeOnly.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Single.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/SByte.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeFeature.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/IntPtr.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Int64.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Int32.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Int16.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Half.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Guid.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Double.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Decimal.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/DateTimeOffset.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/DateTime.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Char.cs
Auto-merging src/libraries/System.Private.CoreLib/src/System/Byte.cs
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Apply custom messages and urls to all generic math [RequiresPreviewFeatures] attributes
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 128 Please backport manually! |
The build failure is unrelated and looks like CI issue: The other issue: So merging |
With #56498 we have added
Message
andUrl
properties to the RequiresPreviewFeatures, now with dotnet/roslyn-analyzers#5502 the analyzer would include thoseMessage
andUrl
in the error message. So now its time to apply custom message and url to all generic math APIs having[RequiresPreviewFeatures]
attributesLiterally updated all APIs
[RequiresPreviewFeatures]
attributes, seems all related to generic math, but not that sure