From: Jan Kotas <jkotas@microsoft.com>
Date: Tue, 11 Apr 2017 02:37:42 +0000 (-0700)
Subject: Merge pull request dotnet/corert#3285 from dotnet/nmirror
X-Git-Tag: accepted/tizen/base/20180629.140029~1474
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2030affc40ac0842db56b4c3ae2b3e8751fa06a4;p=platform%2Fupstream%2Fcoreclr.git

Merge pull request dotnet/corert#3285 from dotnet/nmirror

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
---

diff --git a/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs b/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs
index 5ab2e13..70f41f4 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 3248b84..495c520 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 890bb7f..0707447 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
     {