Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Remove Redundant Resource entry #15928

Merged
merged 2 commits into from
Jan 19, 2018
Merged

Remove Redundant Resource entry #15928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1ac48f
Remove Redundant Resource entry
tarekgh Jan 19, 2018
f59d841
Keep other resource entry name
tarekgh Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/mscorlib/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2866,9 +2866,6 @@
<data name="Marshaler_StringTooLong" xml:space="preserve">
<value>Marshaler restriction: Excessively long string.</value>
</data>
<data name="MemoryDisposed" xml:space="preserve">
Copy link
Member

Choose a reason for hiding this comment

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

I would keep MemoryDisposed and delete Memory_ThrowIfDisposed instead. We have MemoryDisposed in both CoreRT and CoreFX. Memory_ThrowIfDisposed is the CoreCLR-only outlier.

<value>Memory&lt;T&gt; has been disposed.</value>
</data>
<data name="MissingConstructor_Name" xml:space="preserve">
<value>Constructor on type '{0}' not found.</value>
</data>
Expand Down Expand Up @@ -3688,7 +3685,7 @@
<data name="NotSupported_SignatureType" xml:space="preserve">
<value>This method is not supported on signature types.</value>
</data>
<data name="Memory_ThrowIfDisposed" xml:space="preserve">
<data name="MemoryDisposed" xml:space="preserve">
<value>Memory&lt;T&gt; has been disposed.</value>
</data>
<data name="Memory_OutstandingReferences" xml:space="preserve">
Expand Down
3 changes: 1 addition & 2 deletions src/mscorlib/src/System/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ internal enum ExceptionResource
TaskT_TransitionToFinal_AlreadyCompleted,
TaskCompletionSourceT_TrySetException_NullException,
TaskCompletionSourceT_TrySetException_NoExceptions,
Memory_ThrowIfDisposed,
MemoryDisposed,
Memory_OutstandingReferences,
InvalidOperation_WrongAsyncResultOrEndCalledMultiple,
ConcurrentDictionary_ConcurrencyLevelMustBePositive,
Expand All @@ -580,7 +580,6 @@ internal enum ExceptionResource
InvalidOperation_HandleIsNotInitialized,
AsyncMethodBuilder_InstanceNotInitialized,
ArgumentNull_SafeHandle,
MemoryDisposed,
}
}