From 45e11fc3b161c30c612af3cb0a415b5f7dfcafe6 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Mon, 10 Apr 2017 19:37:42 -0700 Subject: [PATCH] Merge pull request dotnet/corertdotnet/coreclr#3285 from dotnet/nmirror Merge nmirror to master Signed-off-by: dotnet-bot Commit migrated from https://github.com/dotnet/coreclr/commit/2030affc40ac0842db56b4c3ae2b3e8751fa06a4 --- .../shared/System/Resources/MissingManifestResourceException.cs | 3 --- .../shared/System/Resources/NeutralResourcesLanguageAttribute.cs | 3 --- .../shared/System/Resources/SatelliteContractVersionAttribute.cs | 3 --- 3 files changed, 9 deletions(-) diff --git a/src/coreclr/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs b/src/coreclr/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs index 5ab2e13..70f41f4 100644 --- a/src/coreclr/src/mscorlib/shared/System/Resources/MissingManifestResourceException.cs +++ b/src/coreclr/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/coreclr/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs b/src/coreclr/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs index 3248b84..495c520 100644 --- a/src/coreclr/src/mscorlib/shared/System/Resources/NeutralResourcesLanguageAttribute.cs +++ b/src/coreclr/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/coreclr/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs b/src/coreclr/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs index 890bb7f..0707447 100644 --- a/src/coreclr/src/mscorlib/shared/System/Resources/SatelliteContractVersionAttribute.cs +++ b/src/coreclr/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 { -- 2.7.4