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

Commit f0b6c14

Browse files
committed
Fix build failure due to conflict between concurrent PRs
New usage of Interop.libc.close was added while it was simultaneously being removed in another PR, which defeated catching it via CI PR validation.
1 parent b6dda6a commit f0b6c14

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private static bool IsProtocolSupported(AddressFamily af)
8181
{
8282
if (socket != -1)
8383
{
84-
Interop.libc.close(socket);
84+
Interop.Sys.Close(socket);
8585
}
8686
}
8787
}

src/System.Net.NameResolution/src/System.Net.NameResolution.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@
155155
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
156156
<Link>Interop\Unix\Interop.Libraries.cs</Link>
157157
</Compile>
158-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.close.cs">
159-
<Link>Interop\Unix\libc\Interop.close.cs</Link>
158+
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Close.cs">
159+
<Link>Interop\Unix\System.Native\Interop.Close.cs</Link>
160160
</Compile>
161161
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.freeaddrinfo.cs">
162162
<Link>Interop\Unix\libc\Interop.freeaddrinfo.cs</Link>

src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.msbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
134134
<Link>Interop\Unix\Interop.Libraries.cs</Link>
135135
</Compile>
136-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.close.cs">
137-
<Link>Interop\Unix\libc\Interop.close.cs</Link>
136+
<Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Close.cs">
137+
<Link>Interop\Unix\System.Native\Interop.Close.cs</Link>
138138
</Compile>
139139
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.freeaddrinfo.cs">
140140
<Link>Interop\Unix\libc\Interop.freeaddrinfo.cs</Link>

0 commit comments

Comments
 (0)