Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete unused WinRT related strings #45067

Merged
merged 1 commit into from
Nov 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/coreclr/src/inc/bitvector.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
You should use mutator operators &=, |= ... instead of the
non-mutators whenever possible to avoid creating a temps

Specifically did NOT supply automatic coersions to
Specifically did NOT supply automatic coercions to
and from short types so that the programmer is aware of
when code was being injected on their behalf. The upshot of this
is that you have to use the BitVector() toUnsigned() to convert
Expand Down
27 changes: 0 additions & 27 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1381,9 +1381,6 @@
<data name="Argument_NoUninitializedStrings" xml:space="preserve">
<value>Uninitialized Strings cannot be created.</value>
</data>
<data name="Argument_ObjIsWinRTObject" xml:space="preserve">
<value>The object's type must not be a Windows Runtime type.</value>
</data>
<data name="Argument_ObjNotComObject" xml:space="preserve">
<value>The object's type must be __ComObject or derived from __ComObject.</value>
</data>
Expand Down Expand Up @@ -1504,9 +1501,6 @@
<data name="Argument_TypedReferenceInvalidField" xml:space="preserve">
<value>Field '{0}' in TypedReferences cannot be static.</value>
</data>
<data name="Argument_TypeIsWinRTType" xml:space="preserve">
<value>The type must not be a Windows Runtime type.</value>
</data>
<data name="Argument_TypeMustBeVisibleFromCom" xml:space="preserve">
<value>The specified type must be visible from COM.</value>
</data>
Expand Down Expand Up @@ -1549,9 +1543,6 @@
<data name="Argument_WaitHandleNameTooLong" xml:space="preserve">
<value>The length of the name exceeds the maximum limit.</value>
</data>
<data name="Argument_WinRTSystemRuntimeType" xml:space="preserve">
<value>Cannot marshal type '{0}' to Windows Runtime. Only 'System.RuntimeType' is supported.</value>
</data>
<data name="ArgumentException_BadMethodImplBody" xml:space="preserve">
<value>MethodOverride's body must be from this type.</value>
</data>
Expand Down Expand Up @@ -2395,15 +2386,6 @@
<data name="InvalidCast_StoreArrayElement" xml:space="preserve">
<value>Object cannot be stored in an array of this type.</value>
</data>
<data name="InvalidCast_WinRTIPropertyValueArrayCoersion" xml:space="preserve">
<value>Object in an IPropertyValue is of type '{0}' which cannot be convereted to a '{1}' due to array element '{2}': {3}.</value>
</data>
<data name="InvalidCast_WinRTIPropertyValueCoersion" xml:space="preserve">
<value>Object in an IPropertyValue is of type '{0}' with value '{1}', which cannot be converted to a '{2}'.</value>
</data>
<data name="InvalidCast_WinRTIPropertyValueElement" xml:space="preserve">
<value>Object in an IPropertyValue is of type '{0}', which cannot be converted to a '{1}'.</value>
</data>
<data name="InvalidOperation_AsyncFlowCtrlCtxMismatch" xml:space="preserve">
<value>AsyncFlowControl objects can be used to restore flow only on a Context that had its flow suppressed.</value>
</data>
Expand Down Expand Up @@ -2563,9 +2545,6 @@
<data name="InvalidOperation_NotGenericType" xml:space="preserve">
<value>This operation is only valid on generic types.</value>
</data>
<data name="InvalidOperation_NotSupportedOnWinRTEvent" xml:space="preserve">
<value>Adding or removing event handlers dynamically is not supported on WinRT events.</value>
</data>
<data name="InvalidOperation_NotWithConcurrentGC" xml:space="preserve">
<value>This API is not available when the concurrent GC is enabled.</value>
</data>
Expand Down Expand Up @@ -2863,9 +2842,6 @@
<data name="NotSupported_CollectibleBoundNonCollectible" xml:space="preserve">
<value>A non-collectible assembly may not reference a collectible assembly.</value>
</data>
<data name="NotSupported_CollectibleWinRT" xml:space="preserve">
<value>WinRT Interop is not supported for collectible types.</value>
</data>
<data name="NotSupported_CreateInstanceWithTypeBuilder" xml:space="preserve">
<value>CreateInstance cannot be used with an object of type TypeBuilder.</value>
</data>
Expand Down Expand Up @@ -3136,9 +3112,6 @@
<data name="PlatformNotSupported_StrongNameSigning" xml:space="preserve">
<value>Strong-name signing is not supported on this platform.</value>
</data>
<data name="PlatformNotSupported_WinRT" xml:space="preserve">
<value>Windows Runtime is not supported on this operating system.</value>
</data>
<data name="PlatformNotSupported_OverlappedIO" xml:space="preserve">
<value>This API is specific to the way in which Windows handles asynchronous I/O, and is not supported on this platform.</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public sealed override MethodBase BindToMethod(
#region Match method by parameter type
for (j = 0; j < argsToCheck; j++)
{
#region Classic argument coersion checks
#region Classic argument coercion checks
// get the formal type
pCls = par[j].ParameterType;

Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/tests/verifier/make_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ do
I=`expr $I + 1`
done

#valid coersion between native int and int32
#valid coercion between native int and int32
I=1
for OP in stloc.0 "starg 0"
do
Expand Down