diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-04-10 19:37:42 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-04-11 09:01:06 -0700 |
| commit | 2030affc40ac0842db56b4c3ae2b3e8751fa06a4 (patch) | |
| tree | f49feb5df160b73886ff5746b4f01e07db60de66 /src | |
| parent | 5bc1e42710434cbc6c62a4ed1deb16aa9ecd92f5 (diff) | |
| download | coreclr-2030affc40ac0842db56b4c3ae2b3e8751fa06a4.tar.gz coreclr-2030affc40ac0842db56b4c3ae2b3e8751fa06a4.tar.bz2 coreclr-2030affc40ac0842db56b4c3ae2b3e8751fa06a4.zip | |
Merge pull request dotnet/corert#3285 from dotnet/nmirror
Merge nmirror to master
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src')
3 files changed, 0 insertions, 9 deletions
diff --git a/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs b/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs index 5ab2e1303e..70f41f4d9e 100644 --- a/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs +++ b/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs @@ -7,9 +7,6 @@ using System.Runtime.Serialization; namespace System.Resources { -#if PROJECTN - [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")] -#endif [Serializable] public class MissingManifestResourceException : SystemException { diff --git a/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs b/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs index 3248b849a0..495c5205b2 100644 --- a/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs +++ b/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs @@ -4,9 +4,6 @@ namespace System.Resources { -#if PROJECTN - [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")] -#endif [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)] public sealed class NeutralResourcesLanguageAttribute : Attribute { diff --git a/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs b/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs index 890bb7f67c..0707447677 100644 --- a/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs +++ b/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs @@ -16,9 +16,6 @@ namespace System.Resources { -#if PROJECTN - [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")] -#endif [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)] public sealed class SatelliteContractVersionAttribute : Attribute { |