Skip to content
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into o_append
# Conflicts:
#	src/libraries/System.IO.FileSystem/tests/Net5CompatTests/System.IO.FileSystem.Net5Compat.Tests.csproj
  • Loading branch information
adamsitnik committed Jul 10, 2021
commit f847b83d4691e15caa0c2a6d3fa492b607795311
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="..\**\*.cs" />
<Compile Remove="..\DisabledFileLockingTests\DisabledFileLockingSwitchTests.cs" />
<!-- .NET 5 did not properly support FileStreams created out of handle opened with APPEND -->
<Compile Remove="..\File\OpenHandle.cs" />
</ItemGroup>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.