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

Merge nmirror to master

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

diff --git a/src/mscorlib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs b/src/mscorlib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
index a1abdd0..4eabe8f 100644 (file)
--- a/src/mscorlib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
+++ b/src/mscorlib/shared/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
@@ -10,9 +10,6 @@ using Microsoft.Win32;
 
 namespace Microsoft.Win32.SafeHandles
 {
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem")]
-#endif
     public sealed class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         private bool? _isAsync;

diff --git a/src/mscorlib/shared/System/IO/EndOfStreamException.cs b/src/mscorlib/shared/System/IO/EndOfStreamException.cs
index 52ab22c..7c4b2b7 100644 (file)
--- a/src/mscorlib/shared/System/IO/EndOfStreamException.cs
+++ b/src/mscorlib/shared/System/IO/EndOfStreamException.cs
@@ -6,10 +6,6 @@ using System.Runtime.Serialization;
 
 namespace System.IO
 {
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedType("System.IO")]
-    [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")]
-#endif
     [Serializable]
     public class EndOfStreamException : IOException
     {

diff --git a/src/mscorlib/shared/System/IO/FileAccess.cs b/src/mscorlib/shared/System/IO/FileAccess.cs
index eaa94f3..c6e583b 100644 (file)
--- a/src/mscorlib/shared/System/IO/FileAccess.cs
+++ b/src/mscorlib/shared/System/IO/FileAccess.cs
@@ -11,9 +11,6 @@ namespace System.IO
     // 
     [Serializable]
     [Flags]
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem.Primitives")]
-#endif
     public enum FileAccess
     {
         // Specifies read access to the file. Data can be read from the file and

diff --git a/src/mscorlib/shared/System/IO/FileMode.cs b/src/mscorlib/shared/System/IO/FileMode.cs
index 73ef68b..77f2fe6 100644 (file)
--- a/src/mscorlib/shared/System/IO/FileMode.cs
+++ b/src/mscorlib/shared/System/IO/FileMode.cs
@@ -12,9 +12,6 @@ namespace System.IO
     // to the end of the file).  To truncate a file or create it if it doesn't 
     // exist, use Create.
     // 
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem.Primitives")]
-#endif
     public enum FileMode
     {
         // Creates a new file. An exception is raised if the file already exists.

diff --git a/src/mscorlib/shared/System/IO/FileOptions.cs b/src/mscorlib/shared/System/IO/FileOptions.cs
index d9188dd..ae8396a 100644 (file)
--- a/src/mscorlib/shared/System/IO/FileOptions.cs
+++ b/src/mscorlib/shared/System/IO/FileOptions.cs
@@ -11,9 +11,6 @@ namespace System.IO
     // We didn't expose a number of these values because we didn't believe 
     // a number of them made sense in managed code, at least not yet.
     [Flags]
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem")]
-#endif
     public enum FileOptions
     {
         // NOTE: any change to FileOptions enum needs to be 

diff --git a/src/mscorlib/shared/System/IO/FileShare.cs b/src/mscorlib/shared/System/IO/FileShare.cs
index a96ae5c..e9b9b5e 100644 (file)
--- a/src/mscorlib/shared/System/IO/FileShare.cs
+++ b/src/mscorlib/shared/System/IO/FileShare.cs
@@ -14,9 +14,6 @@ namespace System.IO
     // FILE_SHARE_WRITE, and FILE_SHARE_DELETE in winnt.h
     // 
     [Flags]
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem.Primitives")]
-#endif
     public enum FileShare
     {
         // No sharing. Any request to open the file (by this process or another

diff --git a/src/mscorlib/shared/System/IO/FileStream.cs b/src/mscorlib/shared/System/IO/FileStream.cs
index 7545d0c..7db8518 100644 (file)
--- a/src/mscorlib/shared/System/IO/FileStream.cs
+++ b/src/mscorlib/shared/System/IO/FileStream.cs
@@ -9,9 +9,6 @@ using System.Diagnostics;
 
 namespace System.IO
 {
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.IO.FileSystem")]
-#endif
     public partial class FileStream : Stream
     {
         private const FileShare DefaultShare = FileShare.Read;

diff --git a/src/mscorlib/shared/System/IO/Path.cs b/src/mscorlib/shared/System/IO/Path.cs
index d26530b..b3a8783 100644 (file)
--- a/src/mscorlib/shared/System/IO/Path.cs
+++ b/src/mscorlib/shared/System/IO/Path.cs
@@ -11,9 +11,6 @@ namespace System.IO
     // Provides methods for processing file system strings in a cross-platform manner.
     // Most of the methods don't do a complete parsing (such as examining a UNC hostname), 
     // but they will handle most string operations.
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedTypeAttribute("System.Runtime.Extensions")]
-#endif
     public static partial class Path
     {
         // Public static readonly variant of the separators. The Path implementation itself is using

diff --git a/src/mscorlib/shared/System/Progress.cs b/src/mscorlib/shared/System/Progress.cs
index 48a6a35..755e771 100644 (file)
--- a/src/mscorlib/shared/System/Progress.cs
+++ b/src/mscorlib/shared/System/Progress.cs
@@ -19,9 +19,6 @@ namespace System
     /// when the instance is constructed.  If there is no current SynchronizationContext
     /// at the time of construction, the callbacks will be invoked on the ThreadPool.
     /// </remarks>
-#if PROJECTN
-    [Internal.Runtime.CompilerServices.RelocatedType("System.Runtime.Extensions")]
-#endif
     public class Progress<T> : IProgress<T>
     {
         /// <summary>The synchronization context captured upon construction.  This will never be null.</summary>