Replacing exception strings with those stored in the resx file#79378

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.

Sign up for GitHub

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

Merged
jkotas merged 2 commits into from
Dec 8, 2022
Merged

Replacing exception strings with those stored in the resx file #79378

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
38ff976
Replacing exception strings with those stored in the resx file
Nov 14, 2022
1dcf48d
Update argument name
jkotas Dec 8, 2022
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
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
// Global methods must be static.
if ((attributes & MethodAttributes.Static) == 0)
{
throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
}

return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
ArgumentException.ThrowIfNullOrEmpty(name);
if ((attributes & MethodAttributes.Static) == 0)
{
throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
}

return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
return members;
}

public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
{
if (IsGenericParameter)
throw new InvalidOperationException(SR.Arg_GenericParameter);

ArgumentNullException.ThrowIfNull(ifaceType);
ArgumentNullException.ThrowIfNull(interfaceType);

RuntimeType? ifaceRtType = ifaceType as RuntimeType;
RuntimeType? ifaceRtType = interfaceType as RuntimeType;

if (ifaceRtType == null)
throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

// SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
// SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
if (IsSZArray && ifaceType.IsGenericType)
if (IsSZArray && interfaceType.IsGenericType)
throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

InterfaceMapping im;
im.InterfaceType = ifaceType;
im.InterfaceType = interfaceType;
im.TargetType = this;
im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down
20 changes: 10 additions & 10 deletions ...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
}

public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
{
// restrictions and known limitations compared to CoreCLR:
// - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
if (IsGenericParameter)
throw new InvalidOperationException(SR.Arg_GenericParameter);

if (ifaceType is null)
throw new ArgumentNullException(nameof(ifaceType));
if (interfaceType is null)
throw new ArgumentNullException(nameof(interfaceType));

if (!(ifaceType is RuntimeTypeInfo))
throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
if (!(interfaceType is RuntimeTypeInfo))
throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
Debug.Assert(ifaceType.IsInterface);
Debug.Assert(interfaceType.IsInterface);
Debug.Assert(!IsInterface);

// SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
// runtime magic. We don't have accurate interface maps for them.
if (IsSZArray && ifaceType.IsGenericType)
if (IsSZArray && interfaceType.IsGenericType)
throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

InterfaceMapping im;
im.InterfaceType = ifaceType;
im.InterfaceType = interfaceType;
im.TargetType = this;
im.InterfaceMethods = interfaceMethods;
im.TargetMethods = targetMethods;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Collections.Immutable/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
<data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
<value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
</data>
<data name="Argument_InvalidArrayType" xml:space="preserve">
<data name="Argument_IncompatibleArrayType" xml:space="preserve">
<value>Target array type is not compatible with the type of items in the collection.</value>
</data>
<data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
{
if (array is not object[] objects)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}

try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Collections/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
<data name="Argument_ArrayTooLarge" xml:space="preserve">
<value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
</data>
<data name="Argument_InvalidArrayType" xml:space="preserve">
<data name="Argument_IncompatibleArrayType" xml:space="preserve">
<value>Target array type is not compatible with the type of items in the collection.</value>
</data>
<data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
object?[]? objects = array as object[];
if (objects == null)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
LinkedListNode<T>? node = head;
try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
object[]? objects = array as object[];
if (objects == null)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}

try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
object?[]? objects = array as object[];
if (objects == null)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}

try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.ObjectModel/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
<data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
<value>Only single dimensional arrays are supported for the requested action.</value>
</data>
<data name="Argument_InvalidArrayType" xml:space="preserve">
<data name="Argument_IncompatibleArrayType" xml:space="preserve">
<value>Target array type is not compatible with the type of items in the collection.</value>
</data>
<data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
<data name="Argument_GenericsInvalid" xml:space="preserve">
<value>Generic types are not valid.</value>
</data>
<data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
<data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
<value>Global members must be static.</value>
</data>
<data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
<data name="Argument_InvalidArrayLength" xml:space="preserve">
<value>Length of the array must be {0}.</value>
</data>
<data name="Argument_InvalidArrayType" xml:space="preserve">
<data name="Argument_IncompatibleArrayType" xml:space="preserve">
<value>Target array type is not compatible with the type of items in the collection.</value>
</data>
<data name="InvalidAssemblyName" xml:space="preserve">
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
object[]? objects = array as object[];
if (objects == null)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}

try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}
}
}
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
object[]? objects = array as object[];
if (objects == null)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}

int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}
}
}
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
object[]? objects = array as object[];
if (objects == null)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}

int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
}
catch (ArrayTypeMismatchException)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
Type sourceType = typeof(T);
if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}

//
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
object?[]? objects = array as object[];
if (objects == null)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}

int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
}
catch (ArrayTypeMismatchException)
{
ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
// We can't cast array of value type to object[], so we don't support widening of primitive types here.
if (array is not object?[] objects)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}

try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
}
catch (ArrayTypeMismatchException)
{
throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
}
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Replacing exception strings with those stored in the resx file#79378

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.

 Sign up for GitHub

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

 Merged

jkotas
merged 2 commits into

from

Dec 8, 2022
 Merged


Replacing exception strings with those stored in the resx file
#79378
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
38ff976

Replacing exception strings with those stored in the resx file

Nov 14, 2022
1dcf48d

Update argument name


jkotas Dec 8, 2022

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


4 changes: 2 additions & 2 deletions
src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -799,7 +799,7 @@ public MethodBuilder DefinePInvokeMethod(string name, string dllName, string ent
 // Global methods must be static.
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefinePInvokeMethod(name, dllName, entryName, attributes, callingConvention, returnType, parameterTypes, nativeCallConv, nativeCharSet);
Expand DownExpand Up@@ -829,7 +829,7 @@ private MethodBuilder DefineGlobalMethodNoLock(string name, MethodAttributes att
 ArgumentException.ThrowIfNullOrEmpty(name);
 if ((attributes & MethodAttributes.Static) == 0)
 {
 throw new ArgumentException(SR.Argument_GlobalFunctionHasToBeStatic);
 throw new ArgumentException(SR.Argument_GlobalMembersMustBeStatic);
 }

 return _globalTypeBuilder.DefineMethod(name, attributes, callingConvention,
Expand Down

14 changes: 7 additions & 7 deletions
src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2737,33 +2737,33 @@ public override MemberInfo[] GetMembers(BindingFlags bindingAttr)
 return members;
 }

 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 ArgumentNullException.ThrowIfNull(ifaceType);
 ArgumentNullException.ThrowIfNull(interfaceType);

 RuntimeType? ifaceRtType = ifaceType as RuntimeType;
 RuntimeType? ifaceRtType = interfaceType as RuntimeType;

 if (ifaceRtType == null)
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle ifaceRtTypeHandle = ifaceRtType.TypeHandle;

 TypeHandle.VerifyInterfaceIsImplemented(ifaceRtTypeHandle);
 Debug.Assert(ifaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(interfaceType.IsInterface); // VerifyInterfaceIsImplemented enforces this invariant
 Debug.Assert(!IsInterface); // VerifyInterfaceIsImplemented enforces this invariant

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // SZArrayHelper and some runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 int ifaceVirtualMethodCount = RuntimeTypeHandle.GetNumVirtualsAndStaticVirtuals(ifaceRtType);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = new MethodInfo[ifaceVirtualMethodCount];
 im.TargetMethods = new MethodInfo[ifaceVirtualMethodCount];
Expand Down

20 changes: 10 additions & 10 deletions
...tiveaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ public sealed override MemberInfo[] GetDefaultMembers()
 return defaultMemberName != null ? GetMember(defaultMemberName) : Array.Empty<MemberInfo>();
 }

 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type ifaceType)
 public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type interfaceType)
 {
 // restrictions and known limitations compared to CoreCLR:
 // - only interface.GetMethods() reflection visible interface methods are returned
Expand All@@ -199,27 +199,27 @@ public sealed override InterfaceMapping GetInterfaceMap([DynamicallyAccessedMemb
 if (IsGenericParameter)
 throw new InvalidOperationException(SR.Arg_GenericParameter);

 if (ifaceType is null)
 throw new ArgumentNullException(nameof(ifaceType));
 if (interfaceType is null)
 throw new ArgumentNullException(nameof(interfaceType));

 if (!(ifaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(ifaceType));
 if (!(interfaceType is RuntimeTypeInfo))
 throw new ArgumentException(SR.Argument_MustBeRuntimeType, nameof(interfaceType));

 RuntimeTypeHandle interfaceTypeHandle = ifaceType.TypeHandle;
 RuntimeTypeHandle interfaceTypeHandle = interfaceType.TypeHandle;

 ReflectionCoreExecution.ExecutionEnvironment.VerifyInterfaceIsImplemented(TypeHandle, interfaceTypeHandle);
 Debug.Assert(ifaceType.IsInterface);
 Debug.Assert(interfaceType.IsInterface);
 Debug.Assert(!IsInterface);

 // SZArrays implement the methods on IList`1, IEnumerable`1, and ICollection`1 with
 // runtime magic. We don't have accurate interface maps for them.
 if (IsSZArray && ifaceType.IsGenericType)
 if (IsSZArray && interfaceType.IsGenericType)
 throw new ArgumentException(SR.Argument_ArrayGetInterfaceMap);

 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, ifaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);
 ReflectionCoreExecution.ExecutionEnvironment.GetInterfaceMap(this, interfaceType, out MethodInfo[] interfaceMethods, out MethodInfo[] targetMethods);

 InterfaceMapping im;
 im.InterfaceType = ifaceType;
 im.InterfaceType = interfaceType;
 im.TargetType = this;
 im.InterfaceMethods = interfaceMethods;
 im.TargetMethods = targetMethods;
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections.Immutable/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_ArrayPlusOffTooSmall" xml:space="preserve">
 <value>Destination array is not long enough to copy all the items in the collection. Check array index and length.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections.Immutable/src/System/Collections/Frozen/FrozenDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,7 +283,7 @@ void ICollection.CopyTo(Array array, int index)
 {
 if (array is not object[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -295,7 +295,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
 <data name="Argument_ArrayTooLarge" xml:space="preserve">
 <value>The input array length must not exceed Int32.MaxValue / {0}. Otherwise BitArray.Length would exceed Int32.MaxValue.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="ArgumentOutOfRange_BiggerThanCollection" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/LinkedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -482,7 +482,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 LinkedListNode<T>? node = head;
 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/PriorityQueue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -886,7 +886,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedDictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -612,7 +612,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -786,7 +786,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedList.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -486,7 +486,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -498,7 +498,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand DownExpand Up@@ -1071,7 +1071,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand DownExpand Up@@ -1189,7 +1189,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Collections/src/System/Collections/Generic/SortedSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -574,7 +574,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -587,7 +587,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Collections/src/System/Collections/Generic/Stack.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.ObjectModel/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
 <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
 <value>Only single dimensional arrays are supported for the requested action.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="Arg_KeyNotFoundWithKey" xml:space="preserve">
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1053,7 +1053,7 @@
 <data name="Argument_GenericsInvalid" xml:space="preserve">
 <value>Generic types are not valid.</value>
 </data>
 <data name="Argument_GlobalFunctionHasToBeStatic" xml:space="preserve">
 <data name="Argument_GlobalMembersMustBeStatic" xml:space="preserve">
 <value>Global members must be static.</value>
 </data>
 <data name="Argument_HasToBeArrayClass" xml:space="preserve">
Expand DownExpand Up@@ -1110,7 +1110,7 @@
 <data name="Argument_InvalidArrayLength" xml:space="preserve">
 <value>Length of the array must be {0}.</value>
 </data>
 <data name="Argument_InvalidArrayType" xml:space="preserve">
 <data name="Argument_IncompatibleArrayType" xml:space="preserve">
 <value>Target array type is not compatible with the type of items in the collection.</value>
 </data>
 <data name="InvalidAssemblyName" xml:space="preserve">
Expand Down

12 changes: 6 additions & 6 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,7 +1078,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 try
Expand All@@ -1095,7 +1095,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1553,7 +1553,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1567,7 +1567,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand DownExpand Up@@ -1745,7 +1745,7 @@ void ICollection.CopyTo(Array array, int index)
 object[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = _dictionary._count;
Expand All@@ -1759,7 +1759,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/List.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,7 @@ void ICollection.CopyTo(Array array, int arrayIndex)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Queue.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }

Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/Collection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,7 @@ void ICollection.CopyTo(Array array, int index)
 Type sourceType = typeof(T);
 if (!(targetType.IsAssignableFrom(sourceType) || sourceType.IsAssignableFrom(targetType)))
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 //
Expand All@@ -219,7 +219,7 @@ void ICollection.CopyTo(Array array, int index)
 object?[]? objects = array as object[];
 if (objects == null)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }

 int count = items.Count;
Expand All@@ -232,7 +232,7 @@ void ICollection.CopyTo(Array array, int index)
 }
 catch (ArrayTypeMismatchException)
 {
 ThrowHelper.ThrowArgumentException_Argument_InvalidArrayType();
 ThrowHelper.ThrowArgumentException_Argument_IncompatibleArrayType();
 }
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 // We can't cast array of value type to object[], so we don't support widening of primitive types here.
 if (array is not object?[] objects)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }

 try
Expand All@@ -62,7 +62,7 @@ internal static void CopyTo<T>(ICollection<T> collection, Array array, int index
 }
 catch (ArrayTypeMismatchException)
 {
 throw new ArgumentException(SR.Argument_InvalidArrayType, nameof(array));
 throw new ArgumentException(SR.Argument_IncompatibleArrayType, nameof(array));
 }
 }
 }
Expand Down
Loading