Remove Microsoft.IO.Redist. (#58359)

* Remove the Microsoft.IO.Redist package. * Remove all conditional compilation directives with MS_IO_REDIST. Co-authored-by: Jeff Handley <jeff.handley@microsoft.com>
dotnet · Oct 13, 2021 · 09c1a1f · 09c1a1f
1 parent 082bb6c
commit 09c1a1f
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 716 deletions.
diff --git a/src/libraries/Common/src/System/IO/FileSystem.Attributes.Windows.cs b/src/libraries/Common/src/System/IO/FileSystem.Attributes.Windows.cs
@@ -9,11 +9,7 @@
 using System.IO;
 using System.Text;
 
-#if MS_IO_REDIST
-namespace Microsoft.IO
-#else
 namespace System.IO
-#endif
 {
     internal static partial class FileSystem
     {

diff --git a/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs b/src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs
@@ -9,11 +9,7 @@
 using System.IO;
 using System.Text;
 
-#if MS_IO_REDIST
-namespace Microsoft.IO
-#else
 namespace System.IO
-#endif
 {
     internal static partial class FileSystem
     {

diff --git a/src/libraries/Common/src/System/IO/PathInternal.CaseSensitivity.cs b/src/libraries/Common/src/System/IO/PathInternal.CaseSensitivity.cs
@@ -3,10 +3,6 @@
 
 using System.Diagnostics;
 
-#if MS_IO_REDIST
-using Microsoft.IO;
-#endif
-
 namespace System.IO
 {
     /// <summary>Contains internal path helpers that are shared between many projects.</summary>
@@ -28,11 +24,7 @@ internal static bool IsCaseSensitive
         {
             get
             {
-#if MS_IO_REDIST
-                return false; // Windows is always case-insensitive
-#else
                 return !(OperatingSystem.IsWindows() || OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS());
-#endif
             }
         }
     }

diff --git a/src/libraries/Common/src/System/IO/PathInternal.cs b/src/libraries/Common/src/System/IO/PathInternal.cs
@@ -15,13 +15,8 @@ internal static partial class PathInternal
         /// </summary>
         internal static bool StartsWithDirectorySeparator(ReadOnlySpan<char> path) => path.Length > 0 && IsDirectorySeparator(path[0]);
 
-#if MS_IO_REDIST
-        internal static string EnsureTrailingSeparator(string path)
-            => EndsInDirectorySeparator(path) ? path : path + DirectorySeparatorCharAsString;
-#else
         internal static string EnsureTrailingSeparator(string path)
             => EndsInDirectorySeparator(path.AsSpan()) ? path : path + DirectorySeparatorCharAsString;
-#endif
 
         internal static bool IsRoot(ReadOnlySpan<char> path)
             => path.Length == GetRootLength(path);
@@ -248,10 +243,6 @@ internal static bool EndsInDirectorySeparator(ReadOnlySpan<char> path) =>
 
         internal static string GetLinkTargetFullPath(string path, string pathToTarget)
             => IsPartiallyQualified(pathToTarget.AsSpan()) ?
-#if MS_IO_REDIST
-                Path.Combine(Path.GetDirectoryName(path), pathToTarget) : pathToTarget;
-#else
                 Path.Join(Path.GetDirectoryName(path.AsSpan()), pathToTarget.AsSpan()) : pathToTarget;
-#endif
     }
 }
diff --git a/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln b/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln