diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-04-11 05:37:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 05:37:42 +0300 |
| commit | e684c3c6aa6db6a5622e9d990e169700600cbe51 (patch) | |
| tree | 3afc97d0f12581443948bfa6f7c64e6393ad9f3a /src/System.Private.CoreLib/shared/System | |
| parent | 0170f4008393971d8b19ca00c81f6f60149c86b7 (diff) | |
| parent | 24d95441c3487d566947496501457a8443c6836d (diff) | |
Merge pull request #3285 from dotnet/nmirror
Merge nmirror to master
Diffstat (limited to 'src/System.Private.CoreLib/shared/System')
3 files changed, 0 insertions, 9 deletions
diff --git a/src/System.Private.CoreLib/shared/System/Resources/MissingManifestResourceException.cs b/src/System.Private.CoreLib/shared/System/Resources/MissingManifestResourceException.cs index 5ab2e1303..70f41f4d9 100644 --- a/src/System.Private.CoreLib/shared/System/Resources/MissingManifestResourceException.cs +++ b/src/System.Private.CoreLib/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/System.Private.CoreLib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs b/src/System.Private.CoreLib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs index 3248b849a..495c5205b 100644 --- a/src/System.Private.CoreLib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs +++ b/src/System.Private.CoreLib/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/System.Private.CoreLib/shared/System/Resources/SatelliteContractVersionAttribute.cs b/src/System.Private.CoreLib/shared/System/Resources/SatelliteContractVersionAttribute.cs index 890bb7f67..070744767 100644 --- a/src/System.Private.CoreLib/shared/System/Resources/SatelliteContractVersionAttribute.cs +++ b/src/System.Private.CoreLib/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 { |