Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Port rollback of System.IO DCR from release branch to master #23566

Merged
safern merged 2 commits into from
Sep 1, 2017
Merged

Port rollback of System.IO DCR from release branch to master #23566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efd365c
Port rollback of System.IO DCR from release branch to master
safern Aug 26, 2017
7d3aed0
Fix CI
safern Aug 26, 2017
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
1 change: 0 additions & 1 deletion external/dir.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<Project Include="portable\portable.depproj" />
<Project Include="ilasm/ilasm.depproj" />
<Project Include="docs/docs.depproj" />
<Project Include="ioNativeDependency/ioNativeDependency.depproj" />
<Project Condition="'$(ILLinkTrimAssembly)' != 'false'" Include="ILLink/ILLink.depproj" />
</ItemGroup>

Expand Down
8 changes: 0 additions & 8 deletions external/ioNativeDependency/Configurations.props
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions external/ioNativeDependency/ioNativeDependency.depproj
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@

<ExcludeFromDuplicateTypes Include="System.Private.Reflection.Metadata.Ecma335" />

<File Include="$(RuntimePath)\FileApiInterop.dll" Condition="'$(PackageTargetRuntime)' != ''">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
</File>

<!-- Permit the following implementation-only assemblies -->
<ValidatePackageSuppression Condition="'$(PackageTargetRuntime)' != ''" Include="PermitInbox">
<Value>
Expand Down
25 changes: 15 additions & 10 deletions src/System.IO.FileSystem/src/System.IO.FileSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@
<Compile Include="$(CommonPath)\System\Memory\FixedBufferExtensions.cs">
<Link>Common\System\Memory\FixedBufferExtensions.cs</Link>
</Compile>
</ItemGroup>
<!-- Windows : Win32 only -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' != 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeleteFile.cs">
<Link>Common\Interop\Windows\Interop.DeleteFile.cs</Link>
</Compile>
Expand All @@ -222,22 +219,30 @@
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReplaceFile.cs">
<Link>Common\Interop\Windows\Interop.ReplaceFile.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
<Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnsafeCreateFile.cs">
<Link>Common\Interop\Windows\Interop.UnsafeCreateFile.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFile.cs">
<Link>Common\Interop\Windows\Interop.CopyFile.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFileEx.cs">
<Link>Common\Interop\Windows\Interop.CopyFileEx.cs</Link>
</Compile>
</ItemGroup>
<!-- Windows : Win32 only -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' != 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnsafeCreateFile.cs">
<Link>Common\Interop\Windows\Interop.UnsafeCreateFile.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
<Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
</Compile>
</ItemGroup>
<!-- Windows : UAP - Win32 + WinRT -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' == 'true'">
<Compile Include="System\IO\FromApp.Interop.cs" />
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile2.cs">
<Link>Common\Interop\Windows\Interop.CreateFile2.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnsafeCreateFile.uap.cs">
<Link>Common\Interop\Windows\Interop.UnsafeCreateFile.uap.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs">
<Link>Common\Interop\Windows\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs</Link>
</Compile>
Expand Down
150 changes: 0 additions & 150 deletions src/System.IO.FileSystem/src/System/IO/FromApp.Interop.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/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 @@ -53,9 +53,6 @@
<Compile Include="File\ReadWriteAllTextAsync.cs" />
<Compile Include="FileStream\ReadWriteSpan.netcoreapp.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot' or '$(TargetGroup)' == 'uap'">
<Compile Include="WinRT_BrokeredFunctions.cs" />
</ItemGroup>
<ItemGroup>
<!-- Rewritten -->
<Compile Include="DirectoryInfo\GetSetAttributes.cs" />
Expand Down
Loading