Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Microsoft.IO.Redist. #58359

Merged
merged 3 commits into from
Oct 13, 2021
Merged

Remove Microsoft.IO.Redist. #58359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31290fb
Remove the Microsoft.IO.Redist package.
teo-tsirpanis Aug 30, 2021
0b866e1
Remove all conditional compilation directives with MS_IO_REDIST.
teo-tsirpanis Aug 30, 2021
383ddf3
Merge branch 'main' into remove-ms-io-redist
jeffhandley Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/libraries/Common/src/System/IO/FileSystem.Attributes.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/Common/src/System/IO/FileSystem.DirectoryCreation.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 0 additions & 8 deletions src/libraries/Common/src/System/IO/PathInternal.CaseSensitivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions src/libraries/Common/src/System/IO/PathInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
}
}
42 changes: 0 additions & 42 deletions src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
View file
Open in desktop

This file was deleted.

Loading