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

jkotas · jkotas · commit 2030affc40ac · 2017-04-11T09:01:06.000-07:00
Merge nmirror to master

Signed-off-by: dotnet-bot &lt;dotnet-bot@microsoft.com&gt;
diff --git a/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs b/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs
@@ -7,9 +7,6 @@
 
 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
@@ -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
@@ -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
     {

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace System.Resources`
`9`	`9`	`{`
`10`		`-#if PROJECTN`
`11`		`- [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")]`
`12`		`-#endif`
`13`	`10`	`[Serializable]`
`14`	`11`	`public class MissingManifestResourceException : SystemException`
`15`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace System.Resources`
`6`	`6`	`{`
`7`		`-#if PROJECTN`
`8`		`- [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")]`
`9`		`-#endif`
`10`	`7`	`[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]`
`11`	`8`	`public sealed class NeutralResourcesLanguageAttribute : Attribute`
`12`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@`
`16`	`16`
`17`	`17`	`namespace System.Resources`
`18`	`18`	`{`
`19`		`-#if PROJECTN`
`20`		`- [Internal.Runtime.CompilerServices.RelocatedType("System.Resources.ResourceManager")]`
`21`		`-#endif`
`22`	`19`	`[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]`
`23`	`20`	`public sealed class SatelliteContractVersionAttribute : Attribute`
`24`	`21`	`{`