From d5a924a9ddba559ed5205b812b3c740097fd29f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 31 Jan 2019 13:51:45 -0800 Subject: [PATCH] Annotate types moved from S.R.Extensions Testing how much hate this is going to bring me. These annotations let ProjectN deal with the fact that we now have two definitions of System.Environment in the system. This is needed as long as Project N is stuck on 2.1-level version of the framework. Signed-off-by: dotnet-bot --- .../System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs | 3 +++ .../shared/System/Environment.SpecialFolderOption.cs | 3 +++ .../System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs | 3 +++ netcore/System.Private.CoreLib/shared/System/OperatingSystem.cs | 3 +++ 4 files changed, 12 insertions(+) diff --git a/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs b/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs index a5a4d2abfde..ae2add730d2 100644 --- a/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs +++ b/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs @@ -6,6 +6,9 @@ namespace System { public static partial class Environment { +#if PROJECTN + [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")] +#endif public enum SpecialFolder { ApplicationData = SpecialFolderValues.CSIDL_APPDATA, diff --git a/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs b/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs index cd0e5714ef0..929e3d9036a 100644 --- a/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs +++ b/netcore/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs @@ -6,6 +6,9 @@ namespace System { public static partial class Environment { +#if PROJECTN + [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")] +#endif public enum SpecialFolderOption { None = 0, diff --git a/netcore/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs b/netcore/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs index e68cbd8ecfd..806eb75ad38 100644 --- a/netcore/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs +++ b/netcore/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs @@ -4,6 +4,9 @@ namespace System { +#if PROJECTN + [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")] +#endif public enum EnvironmentVariableTarget { Process = 0, diff --git a/netcore/System.Private.CoreLib/shared/System/OperatingSystem.cs b/netcore/System.Private.CoreLib/shared/System/OperatingSystem.cs index 0fc9b0f5d9a..be302713586 100644 --- a/netcore/System.Private.CoreLib/shared/System/OperatingSystem.cs +++ b/netcore/System.Private.CoreLib/shared/System/OperatingSystem.cs @@ -7,6 +7,9 @@ using System.Runtime.Serialization; namespace System { +#if PROJECTN + [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")] +#endif public sealed class OperatingSystem : ISerializable, ICloneable { private readonly Version _version; -- 2.11.4.GIT