Skip to content

Clean-up duplicated PathInternal files #57988

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

Merged
jozkee merged 2 commits into from
Aug 28, 2021
Merged

Clean-up duplicated PathInternal files #57988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dce667
Clean-up duplicated PathInternal files
jozkee Aug 24, 2021
0d2674c
Move PathInternal*.cs to Common
jozkee Aug 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
Next Next commit
Clean-up duplicated PathInternal files
  • Loading branch information
@jozkee
jozkee committed Aug 27, 2021
commit 8dce66768435e914112d51b25d41e7e41b72fdf4
44 changes: 0 additions & 44 deletions src/libraries/Common/src/System/IO/PathInternal.Unix.cs
View file
Open in desktop

This file was deleted.

195 changes: 0 additions & 195 deletions src/libraries/Common/src/System/IO/PathInternal.Windows.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/libraries/Common/tests/Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
Expand Down Expand Up @@ -26,7 +26,7 @@
Link="Common\System\Collections\Generic\LargeArrayBuilder.cs" />
<Compile Include="$(CommonPath)System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs"
Link="Common\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
<Compile Include="$(CommonPath)System\IO\RowConfigReader.cs"
Link="Common\System\IO\RowConfigReader.cs" />
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -202,7 +202,7 @@
Link="Common\System\IO\FileSystem.Attributes.Windows.cs" />
<Compile Include="$(CommonPath)System\IO\FileSystem.DirectoryCreation.Windows.cs"
Link="Common\System\IO\FileSystem.DirectoryCreation.Windows.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
<Compile Include="$(CommonPath)System\Memory\FixedBufferExtensions.cs"
Link="Common\System\Memory\FixedBufferExtensions.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Compile Include="System\IO\Compression\ZipFileExtensions.ZipArchive.Create.cs" />
<Compile Include="System\IO\Compression\ZipFileExtensions.ZipArchive.Extract.cs" />
<Compile Include="System\IO\Compression\ZipFileExtensions.ZipArchiveEntry.Extract.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Copy link
Member

@jkotas jkotas Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would "$(CommonPath)System\IO\PathInternal.* be more appropriate place for these files?

These files do not contain public APIs. I think we only use CoreLib includes for files with public APIs, and only include them for legacy TFM configurations.

Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<!-- Unix specific files -->
Expand Down
6 changes: 1 addition & 5 deletions src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
Expand Down Expand Up @@ -41,8 +41,6 @@
<!-- Windows specific files -->
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
<Compile Include="System\IO\Compression\ZipArchiveEntry.Windows.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs"
Link="Common\System\IO\PathInternal.Windows.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
Link="Common\Interop\Windows\Interop.Libraries.cs" />
</ItemGroup>
Expand All @@ -51,8 +49,6 @@
<Compile Include="System\IO\Compression\ZipArchiveEntry.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs"
Link="Common\Interop\Unix\Interop.Libraries.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs"
Link="Common\System\IO\PathInternal.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs"
Link="Common\Interop\Unix\System.Native\Interop.PathConf.cs" />
</ItemGroup>
Expand Down
6 changes: 1 addition & 5 deletions src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Compile Include="System\IO\DriveType.cs" />
<Compile Include="$(CommonPath)System\HResults.cs"
Link="Common\System\HResults.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
Expand Down Expand Up @@ -46,8 +46,6 @@
Link="Common\System\IO\Win32Marshal.cs" />
<Compile Include="$(CoreLibSharedDir)System\IO\DriveInfoInternal.Windows.cs"
Link="Common\System\IO\DriveInfoInternal.Windows.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs"
Link="Common\System\IO\PathInternal.Windows.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true' And $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)'))">
<Compile Include="System\IO\DriveInfo.UnixOrBrowser.cs" />
Expand All @@ -60,8 +58,6 @@
Link="Common\Interop\Unix\Interop.UnixFileSystemTypes.cs" />
<Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs"
Link="Common\Interop\Unix\Interop.IOErrors.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs"
Link="Common\System\IO\PathInternal.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs"
Link="Common\Interop\Unix\Interop.PathConf.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MountPoints.cs"
Expand Down
10 changes: 6 additions & 4 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
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks>
Expand All @@ -23,11 +23,13 @@
<Compile Include="System\IO\RenamedEventHandler.cs" />
<Compile Include="System\IO\WatcherChangeTypes.cs" />
<Compile Include="System\IO\WaitForChangedResult.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs"
<Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs"
Link="Common\System\Text\ValueStringBuilder.cs" />
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Windows.cs"
Link="Common\System\IO\PathInternal.Windows.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
Link="Common\Interop\Windows\Interop.Libraries.cs" />
Expand Down Expand Up @@ -59,7 +61,7 @@
Link="Common\Interop\Unix\Interop.Errors.cs" />
<Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs"
Link="Common\Interop\Unix\Interop.IOErrors.cs" />
<Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Unix.cs"
Link="Common\System\IO\PathInternal.Unix.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs"
Link="Common\Interop\Unix\Interop.PathConf.cs" />
Expand Down
2 changes: 1 addition & 1 deletion ...s/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<Compile Include="$(CommonTestPath)System\IO\TempFile.cs" Link="Common\System\IO\TempFile.cs" />
<Compile Include="$(CommonTestPath)System\IO\PathFeatures.cs" Link="Common\System\IO\PathFeatures.cs" />
<Content Include="..\DirectoryInfo\test-dir\dummy.txt" Link="test-dir\dummy.txt" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<Compile Include="$(CommonTestPath)System\IO\TempFile.cs" Link="Common\System\IO\TempFile.cs" />
<Compile Include="$(CommonTestPath)System\IO\PathFeatures.cs" Link="Common\System\IO\PathFeatures.cs" />
<Content Include="DirectoryInfo\test-dir\dummy.txt" Link="test-dir\dummy.txt" />
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs"
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.CaseSensitivity.cs"
Link="Common\System\IO\PathInternal.CaseSensitivity.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading