diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-03-27 10:51:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 10:51:22 -0700 |
| commit | 4b95b41d93e7b267c972fe60e0fe9f2068cbeb1c (patch) | |
| tree | dc793ca5ab2193dc9d940d2e4ca37100ccb6b735 /src/mscorlib/shared | |
| parent | f56f7a50d60dd3ca2d8687afc492566494e6df41 (diff) | |
| download | coreclr-4b95b41d93e7b267c972fe60e0fe9f2068cbeb1c.tar.gz coreclr-4b95b41d93e7b267c972fe60e0fe9f2068cbeb1c.tar.bz2 coreclr-4b95b41d93e7b267c972fe60e0fe9f2068cbeb1c.zip | |
Cleanup InternalsVisibleTo (#17185)
Remove InternalsVisibleTo for mscorlib and make sure that corefx still builds with it.
Delete global constants that were left-overs from .NET Framework build system.
Diffstat (limited to 'src/mscorlib/shared')
3 files changed, 6 insertions, 18 deletions
diff --git a/src/mscorlib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs b/src/mscorlib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs index 72f62c2b9a..e7efa22b24 100644 --- a/src/mscorlib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs +++ b/src/mscorlib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs @@ -11,12 +11,8 @@ namespace System.Collections.Generic // keeps the performance not affected till we hit collision threshold and then we switch to the comparer which is using // randomized string hashing. [Serializable] // Required for compatibility with .NET Core 2.0 as we exposed the NonRandomizedStringEqualityComparer inside the serialization blob -#if CORERT - public -#else - internal -#endif - sealed class NonRandomizedStringEqualityComparer : EqualityComparer<string>, ISerializable + // Needs to be public to support binary serialization compatibility + public sealed class NonRandomizedStringEqualityComparer : EqualityComparer<string>, ISerializable { internal static new IEqualityComparer<string> Default { get; } = new NonRandomizedStringEqualityComparer(); diff --git a/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs b/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs index a8b7a187d9..eccb9f0347 100644 --- a/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs +++ b/src/mscorlib/shared/System/Collections/ListDictionaryInternal.cs @@ -20,12 +20,8 @@ namespace System.Collections /// This should not be used if performance is important for large numbers of elements. [Serializable] [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -#if CORERT - public -#else - internal -#endif - class ListDictionaryInternal : IDictionary + // Needs to be public to support binary serialization compatibility + public class ListDictionaryInternal : IDictionary { private DictionaryNode head; // Do not rename (binary serialization) private int version; // Do not rename (binary serialization) diff --git a/src/mscorlib/shared/System/UnitySerializationHolder.cs b/src/mscorlib/shared/System/UnitySerializationHolder.cs index 2f30356709..53323c32bc 100644 --- a/src/mscorlib/shared/System/UnitySerializationHolder.cs +++ b/src/mscorlib/shared/System/UnitySerializationHolder.cs @@ -11,12 +11,8 @@ namespace System /// This only exists for compatibility with .NET Framework. /// </summary> [Serializable] -#if CORERT - public -#else - internal -#endif - sealed class UnitySerializationHolder : ISerializable, IObjectReference + // Needs to be public to support binary serialization compatibility + public sealed class UnitySerializationHolder : ISerializable, IObjectReference { internal const int NullUnity = 0x0002; private readonly int _unityType; |