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

Fold System.IO.FileSystem into CoreLib #53231

Merged
merged 12 commits into from
May 27, 2021
Merged

Fold System.IO.FileSystem into CoreLib #53231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4ffe5e9
move Queue<T> to System.Private.CoreLib
adamsitnik May 25, 2021
52dab09
fold System.IO.FileSystem into System.Private.CoreLib
adamsitnik May 25, 2021
72a7559
fix the Unix build
adamsitnik May 25, 2021
e8e5eb8
Merge remote-tracking branch 'upstream/main' into foldSystemIoFileSystem
adamsitnik May 25, 2021
6e35f8f
don't use EnumerableHelpers.ToArray, as the array returned by it migh…
adamsitnik May 26, 2021
41cca77
don't move Stack<T> into CoreLib, use List<T> instead
adamsitnik May 26, 2021
80ebe49
revert EnumerableHelpers changes that are not needed anymore
adamsitnik May 26, 2021
2e1bddd
Merge remote-tracking branch 'upstream/main' into foldSystemIoFileSystem
adamsitnik May 26, 2021
fd16ed1
not needed anymore
adamsitnik May 26, 2021
768cad0
address code review feedback
adamsitnik May 27, 2021
173b4c0
fix Mono build
adamsitnik May 27, 2021
d09c0b4
fix Windows build?
adamsitnik May 27, 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
7 changes: 0 additions & 7 deletions src/libraries/Common/src/Interop/Windows/NtDll/Interop.NtQueryInformationFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ internal static extern unsafe int NtQueryInformationFile(
uint Length,
uint FileInformationClass);

[StructLayout(LayoutKind.Sequential)]
internal struct IO_STATUS_BLOCK
{
private uint Status;
private IntPtr Information;
}

internal const uint FileModeInformation = 16;

internal const int STATUS_INVALID_HANDLE = unchecked((int)0xC0000008);
Expand Down
49 changes: 24 additions & 25 deletions src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,51 @@
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Directory.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Directory.cs"
Link="Microsoft\IO\Directory.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\DirectoryInfo.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\DirectoryInfo.cs"
Link="Microsoft\IO\DirectoryInfo.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEntry.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEntry.cs"
Link="Microsoft\IO\Enumeration\FileSystemEntry.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEntry.Windows.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEntry.Windows.cs"
Link="Microsoft\IO\Enumeration\FileSystemEntry.Windows.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEnumerable.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEnumerable.cs"
Link="Microsoft\IO\Enumeration\FileSystemEnumerable.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEnumerableFactory.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEnumerableFactory.cs"
Link="Microsoft\IO\Enumeration\FileSystemEnumerableFactory.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEnumerator.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEnumerator.cs"
Link="Microsoft\IO\Enumeration\FileSystemEnumerator.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEnumerator.Win32.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEnumerator.Win32.cs"
Link="Microsoft\IO\Enumeration\FileSystemEnumerator.Win32.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemEnumerator.Windows.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemEnumerator.Windows.cs"
Link="Microsoft\IO\Enumeration\FileSystemEnumerator.Windows.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Enumeration\FileSystemName.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Enumeration\FileSystemName.cs"
Link="Microsoft\IO\Enumeration\FileSystemName.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\EnumerationOptions.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\EnumerationOptions.cs"
Link="Microsoft\IO\EnumerationOptions.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Error.cs"
Link="Microsoft\IO\Error.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\File.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\File.cs"
Link="Microsoft\IO\File.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\FileInfo.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\FileInfo.cs"
Link="Microsoft\IO\FileInfo.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\FileSystem.Win32.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\FileSystem.Win32.cs"
Link="Microsoft\IO\FileSystem.Win32.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\FileSystem.Windows.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\FileSystem.Windows.cs"
Link="Microsoft\IO\FileSystem.Windows.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\FileSystemInfo.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\FileSystemInfo.cs"
Link="Microsoft\IO\FileSystemInfo.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\FileSystemInfo.Windows.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\FileSystemInfo.Windows.cs"
Link="Microsoft\IO\FileSystemInfo.Windows.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\Iterator.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\Iterator.cs"
Link="Microsoft\IO\Iterator.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\MatchCasing.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\MatchCasing.cs"
Link="Microsoft\IO\MatchCasing.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\MatchType.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\MatchType.cs"
Link="Microsoft\IO\MatchType.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\ReadLinesIterator.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\ReadLinesIterator.cs"
Link="Microsoft\IO\ReadLinesIterator.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\SearchOption.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\SearchOption.cs"
Link="Microsoft\IO\SearchOption.cs" />
<Compile Include="..\..\System.IO.FileSystem\src\System\IO\SearchTarget.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\SearchTarget.cs"
Link="Microsoft\IO\SearchTarget.cs" />
<Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs"
Link="Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs" />
Expand Down Expand Up @@ -195,6 +193,7 @@
<Compile Include="$(CoreLibSharedDir)System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs"
Link="System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs" />
<Compile Include="Microsoft\IO\StringExtensions.cs" />
<Compile Include="Microsoft\IO\ThrowHelper.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
Expand Down
16 changes: 16 additions & 0 deletions src/libraries/Microsoft.IO.Redist/src/Microsoft/IO/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.IO;

namespace Microsoft.IO
{
internal static class ThrowHelper
{
internal static void ThrowEndOfFileException()
{
throw new EndOfStreamException(SR.IO_EOF_ReadBeyondEOF);
}
}
}
1 change: 0 additions & 1 deletion src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.ComponentModel\ref\System.ComponentModel.csproj" />
<ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" />
<ProjectReference Include="..\..\System.IO.FileSystem.DriveInfo\ref\System.IO.FileSystem.DriveInfo.csproj" />
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Collections/src/System.Collections.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<Compile Include="System\Collections\Generic\LinkedList.cs" />
<Compile Include="System\Collections\Generic\PriorityQueue.cs" />
<Compile Include="System\Collections\Generic\PriorityQueueDebugView.cs" />
<Compile Include="System\Collections\Generic\Queue.cs" />
<Compile Include="System\Collections\Generic\QueueDebugView.cs" />
<Compile Include="System\Collections\Generic\SortedDictionary.cs" />
<Compile Include="System\Collections\Generic\SortedList.cs" />
<Compile Include="System\Collections\Generic\SortedSet.cs" />
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.IO.FileSystem.Primitives\ref\System.IO.FileSystem.Primitives.csproj" />
<ProjectReference Include="..\..\System.IO.FileSystem\ref\System.IO.FileSystem.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
<Compile Include="System\IO\FileSystemWatcher.OSX.cs" />
<Compile Include="$(LibrariesProjectRoot)System.IO.FileSystem\src\System\IO\FileSystem.Exists.Unix.cs"
Link="System.IO.FileSystem\src\System\IO\FileSystem.Exists.Unix.cs" />
<Compile Include="$(CoreLibSharedDir)System\IO\FileSystem.Exists.Unix.cs"
Link="System\IO\FileSystem.Exists.Unix.cs" />
<Compile Include="$(CommonPath)Interop\OSX\Interop.EventStream.cs"
Link="Common\Interop\OSX\Interop.EventStream.cs" />
<Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs"
Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.Forwards.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,17 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Win32.SafeHandles.SafeFileHandle))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.FileOptions))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.FileStream))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Directory))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.DirectoryInfo))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.EnumerationOptions))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.File))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.FileInfo))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.FileSystemInfo))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchCasing))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchType))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.SearchOption))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEntry))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerable<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerator<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemName))]

Loading