diff options
| author | Michal Strehovský <michals@microsoft.com> | 2019-01-31 13:51:45 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-01 09:23:48 -0800 |
| commit | c1fabb9120d39ff7b7b9fb00e43ff6a4dd6ccfd6 (patch) | |
| tree | e6d85c76f29c8137a6c4fdc0019939cda1469504 | |
| parent | d617f96303c4b65b7b77ff5fa0d7aee38ebc19f8 (diff) | |
| download | coreclr-c1fabb9120d39ff7b7b9fb00e43ff6a4dd6ccfd6.tar.gz coreclr-c1fabb9120d39ff7b7b9fb00e43ff6a4dd6ccfd6.tar.bz2 coreclr-c1fabb9120d39ff7b7b9fb00e43ff6a4dd6ccfd6.zip | |
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 <dotnet-bot@microsoft.com>
4 files changed, 12 insertions, 0 deletions
diff --git a/src/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs b/src/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs index a5a4d2abfd..ae2add730d 100644 --- a/src/System.Private.CoreLib/shared/System/Environment.SpecialFolder.cs +++ b/src/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/src/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs b/src/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs index cd0e5714ef..929e3d9036 100644 --- a/src/System.Private.CoreLib/shared/System/Environment.SpecialFolderOption.cs +++ b/src/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/src/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs b/src/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs index e68cbd8ecf..806eb75ad3 100644 --- a/src/System.Private.CoreLib/shared/System/EnvironmentVariableTarget.cs +++ b/src/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/src/System.Private.CoreLib/shared/System/OperatingSystem.cs b/src/System.Private.CoreLib/shared/System/OperatingSystem.cs index 0fc9b0f5d9..be30271358 100644 --- a/src/System.Private.CoreLib/shared/System/OperatingSystem.cs +++ b/src/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; |