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

Commit 0c9f431

Browse files
pgavlinpgavlin
committed
Address remaining PR feedback.
1 parent 1e0d978 commit 0c9f431

15 files changed

+365
-277
lines changed

‎src/System.Net.Primitives/src/System.Net.Primitives.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<Compile Include="System\Net\IPAddressPal.Windows.cs" />
100100
<Compile Include="System\Net\HostInformationPal.Windows.cs" />
101101
<Compile Include="System\Net\SocketAddressPal.Windows.cs" />
102+
<Compile Include="System\Net\SocketException.Windows.cs" />
102103

103104
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs" >
104105
<Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
@@ -146,6 +147,7 @@
146147
<Compile Include="System\Net\IPAddressPal.Unix.cs" />
147148
<Compile Include="System\Net\HostInformationPal.Unix.cs" />
148149
<Compile Include="System\Net\SocketAddressPal.Unix.cs" />
150+
<Compile Include="System\Net\SocketException.Unix.cs" />
149151

150152
<Compile Include="$(CommonPath)\Interop\Interop.CheckedAccess.cs" >
151153
<Link>Common\Interop\Interop.CheckedAccess.cs</Link>

‎src/System.Net.Primitives/src/System/Net/IPAddressParser.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ internal static IPAddress Parse(string ipString, bool tryParse)
6868
return null;
6969
}
7070

71-
Exception e = new SocketException(IPAddressPal.GetSocketErrorForErrorCode(error));
71+
Exception e = new SocketException(IPAddressPal.GetSocketErrorForErrorCode(error), error);
7272
throw new FormatException(SR.dns_bad_ip_address, e);
7373
}
7474

@@ -83,7 +83,7 @@ internal static string IPv4AddressToString(byte[] numbers)
8383
}
8484
else
8585
{
86-
throw new SocketException(IPAddressPal.GetSocketErrorForErrorCode(errorCode));
86+
throw new SocketException(IPAddressPal.GetSocketErrorForErrorCode(errorCode), errorCode);
8787
}
8888
}
8989

@@ -98,7 +98,7 @@ internal static string IPv6AddressToString(byte[] numbers, uint scopeId)
9898
}
9999
else
100100
{
101-
throw new SocketException(IPAddressPal.GetSocketErrorForErrorCode(errorCode));
101+
throw new SocketException(IPAddressPal.GetSocketErrorForErrorCode(errorCode), errorCode);
102102
}
103103
}
104104
}

‎src/System.Net.Primitives/src/System/Net/SocketException.Unix.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.ComponentModel;
6+
7+
namespace System.Net.Sockets
8+
{
9+
public partial class SocketException : Win32Exception
10+
{
11+
internal SocketException(SocketError errorCode, uint platformError)
12+
: this(errorCode)
13+
{
14+
HResult = unchecked((int)platformError);
15+
}
16+
}
17+
}

‎src/System.Net.Primitives/src/System/Net/SocketException.Windows.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.ComponentModel;
6+
7+
namespace System.Net.Sockets
8+
{
9+
public partial class SocketException : Win32Exception
10+
{
11+
internal SocketException(SocketError errorCode, uint platformError)
12+
: this(errorCode)
13+
{
14+
// platformError is unused on Windows.
15+
}
16+
}
17+
}

‎src/System.Net.Primitives/src/System/Net/SocketException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace System.Net.Sockets
1212
/// Provides socket exceptions to the application.
1313
/// </para>
1414
/// </devdoc>
15-
public class SocketException : Win32Exception
15+
public partial class SocketException : Win32Exception
1616
{
1717
private EndPoint _endPoint;
1818

‎src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Linux.Pal.Tests.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@
1111
<UnsupportedPlatforms>Windows_NT;OSX;FreeBSD</UnsupportedPlatforms>
1212
</PropertyGroup>
1313

14-
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.projinc" />
14+
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.msbuild" />
15+
16+
<ItemGroup>
17+
<Compile Include="@(CompileItem)" />
18+
</ItemGroup>
19+
20+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
1521
</Project>

‎src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.OSX.Pal.Tests.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@
1111
<UnsupportedPlatforms>Windows_NT;Linux;FreeBSD</UnsupportedPlatforms>
1212
</PropertyGroup>
1313

14-
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.projinc" />
14+
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.msbuild" />
15+
16+
<ItemGroup>
17+
<Compile Include="@(CompileItem)" />
18+
</ItemGroup>
19+
20+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
1521
</Project>

‎src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.projinc renamed to ‎src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.msbuild

Lines changed: 98 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -18,164 +18,169 @@
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU' " />
1919

2020
<ItemGroup>
21-
<Compile Include="IPAddressPalTest.cs" />
22-
<Compile Include="HostInformationPalTest.cs" />
23-
<Compile Include="SocketAddressPalTest.cs" />
21+
<CompileItem Include="IPAddressPalTest.cs" />
22+
<CompileItem Include="HostInformationPalTest.cs" />
23+
<CompileItem Include="SocketAddressPalTest.cs" />
2424

25-
<Compile Include="Fakes\GlobalLog.cs" />
25+
<CompileItem Include="Fakes\GlobalLog.cs" />
2626

27-
<Compile Include="..\..\src\System\Net\EndPoint.cs" >
27+
<CompileItem Include="..\..\src\System\Net\EndPoint.cs" >
2828
<Link>ProductionCode\System\Net\EndPoint.cs</Link>
29-
</Compile>
30-
<Compile Include="..\..\src\System\Net\IPAddress.cs" >
29+
</CompileItem>
30+
<CompileItem Include="..\..\src\System\Net\IPAddress.cs" >
3131
<Link>ProductionCode\System\Net\IPAddress.cs</Link>
32-
</Compile>
33-
<Compile Include="..\..\src\System\Net\IPAddressParser.cs" >
32+
</CompileItem>
33+
<CompileItem Include="..\..\src\System\Net\IPAddressParser.cs" >
3434
<Link>ProductionCode\System\Net\IPAddressParser.cs</Link>
35-
</Compile>
36-
<Compile Include="..\..\src\System\Net\IPEndPoint.cs" >
35+
</CompileItem>
36+
<CompileItem Include="..\..\src\System\Net\IPEndPoint.cs" >
3737
<Link>ProductionCode\System\Net\IPEndPoint.cs</Link>
38-
</Compile>
39-
<Compile Include="..\..\src\System\Net\NetworkInformation\NetworkInformationException.cs" >
38+
</CompileItem>
39+
<CompileItem Include="..\..\src\System\Net\NetworkInformation\NetworkInformationException.cs" >
4040
<Link>ProductionCode\System\Net\NetworkInformation\NetworkInformationException.cs</Link>
41-
</Compile>
42-
<Compile Include="..\..\src\System\Net\Sockets\SocketAddress.cs" >
41+
</CompileItem>
42+
<CompileItem Include="..\..\src\System\Net\Sockets\SocketAddress.cs" >
4343
<Link>ProductionCode\System\Net\Sockets\SocketAddress.cs</Link>
44-
</Compile>
45-
<Compile Include="..\..\src\System\Net\SocketException.cs" >
44+
</CompileItem>
45+
<CompileItem Include="..\..\src\System\Net\SocketException.cs" >
4646
<Link>ProductionCode\System\Net\SocketException.cs</Link>
47-
</Compile>
48-
<Compile Include="..\..\src\System\Net\Sockets\AddressFamily.cs" >
47+
</CompileItem>
48+
<CompileItem Include="..\..\src\System\Net\Sockets\AddressFamily.cs" >
4949
<Link>ProductionCode\System\Net\Sockets\AddressFamily.cs</Link>
50-
</Compile>
51-
<Compile Include="..\..\src\System\Net\Sockets\SocketError.cs" >
50+
</CompileItem>
51+
<CompileItem Include="..\..\src\System\Net\Sockets\SocketError.cs" >
5252
<Link>ProductionCode\System\Net\Sockets\SocketError.cs</Link>
53-
</Compile>
54-
<Compile Include="$(CommonPath)\System\Net\ByteOrder.cs" >
53+
</CompileItem>
54+
<CompileItem Include="$(CommonPath)\System\Net\ByteOrder.cs" >
5555
<Link>ProductionCode\Common\System\Net\ByteOrder.cs</Link>
56-
</Compile>
57-
<Compile Include="$(CommonPath)\System\Net\InternalException.cs" >
56+
</CompileItem>
57+
<CompileItem Include="$(CommonPath)\System\Net\InternalException.cs" >
5858
<Link>ProductionCode\Common\System\Net\InternalException.cs</Link>
59-
</Compile>
60-
<Compile Include="$(CommonPath)\System\Net\TcpValidationHelpers.cs" >
59+
</CompileItem>
60+
<CompileItem Include="$(CommonPath)\System\Net\TcpValidationHelpers.cs" >
6161
<Link>ProductionCode\Common\System\Net\TcpValidationHelpers.cs</Link>
62-
</Compile>
63-
<Compile Include="$(CommonPath)\System\NotImplemented.cs" >
62+
</CompileItem>
63+
<CompileItem Include="$(CommonPath)\System\NotImplemented.cs" >
6464
<Link>ProductionCode\Common\System\NotImplemented.cs</Link>
65-
</Compile>
65+
</CompileItem>
6666

67-
<Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs" >
67+
<CompileItem Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs" >
6868
<Link>ProductionCode\Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link>
69-
</Compile>
69+
</CompileItem>
7070
</ItemGroup>
7171

7272
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
73-
<Compile Include="..\..\src\System\Net\IPAddressPal.Windows.cs" >
73+
<CompileItem Include="..\..\src\System\Net\IPAddressPal.Windows.cs" >
7474
<Link>ProductionCode\System\Net\IPAddressPal.Windows.cs</Link>
75-
</Compile>
76-
<Compile Include="..\..\src\System\Net\HostInformationPal.Windows.cs" >
75+
</CompileItem>
76+
<CompileItem Include="..\..\src\System\Net\HostInformationPal.Windows.cs" >
7777
<Link>ProductionCode\System\Net\HostInformationPal.Windows.cs</Link>
78-
</Compile>
79-
<Compile Include="..\..\src\System\Net\SocketAddressPal.Windows.cs" >
78+
</CompileItem>
79+
<CompileItem Include="..\..\src\System\Net\SocketAddressPal.Windows.cs" >
8080
<Link>ProductionCode\System\Net\SocketAddressPal.Windows.cs</Link>
81-
</Compile>
81+
</CompileItem>
82+
<CompileItem Include="..\..\src\System\Net\SocketException.Windows.cs" >
83+
<Link>ProductionCode\System\Net\SocketException.Windows.cs</Link>
84+
</CompileItem>
8285

83-
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs" >
86+
<CompileItem Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs" >
8487
<Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
85-
</Compile>
88+
</CompileItem>
8689

87-
<Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs" >
90+
<CompileItem Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs" >
8891
<Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link>
89-
</Compile>
90-
<Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs" >
92+
</CompileItem>
93+
<CompileItem Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs" >
9194
<Link>Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs</Link>
92-
</Compile>
93-
<Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs" >
95+
</CompileItem>
96+
<CompileItem Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs" >
9497
<Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link>
95-
</Compile>
96-
<Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs" >
98+
</CompileItem>
99+
<CompileItem Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs" >
97100
<Link>Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs</Link>
98-
</Compile>
99-
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs" >
101+
</CompileItem>
102+
<CompileItem Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs" >
100103
<Link>ProductionCode\Common\Interop\Windows\Interop.Libraries.cs</Link>
101-
</Compile>
102-
<Compile Include="$(CommonPath)\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.cs" >
104+
</CompileItem>
105+
<CompileItem Include="$(CommonPath)\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.cs" >
103106
<Link>Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.cs</Link>
104-
</Compile>
105-
<Compile Include="$(CommonPath)\Interop\Windows\mincore_obsolete\Interop.LocalFree.cs" >
107+
</CompileItem>
108+
<CompileItem Include="$(CommonPath)\Interop\Windows\mincore_obsolete\Interop.LocalFree.cs" >
106109
<Link>Common\Interop\Windows\mincore_obsolete\Interop.LocalFree.cs</Link>
107-
</Compile>
108-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs" >
110+
</CompileItem>
111+
<CompileItem Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs" >
109112
<Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.NtStatus.cs</Link>
110-
</Compile>
111-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs" >
113+
</CompileItem>
114+
<CompileItem Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs" >
112115
<Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv4AddressToStringEx.cs</Link>
113-
</Compile>
114-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs" >
116+
</CompileItem>
117+
<CompileItem Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs" >
115118
<Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv4StringToAddressEx.cs</Link>
116-
</Compile>
117-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs" >
119+
</CompileItem>
120+
<CompileItem Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs" >
118121
<Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv6AddressToStringEx.cs</Link>
119-
</Compile>
120-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs" >
122+
</CompileItem>
123+
<CompileItem Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs" >
121124
<Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.RtlIpv6StringToAddressEx.cs</Link>
122-
</Compile>
125+
</CompileItem>
123126
</ItemGroup>
124127

125128
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
126-
<Compile Include="..\..\src\System\Net\IPAddressPal.Unix.cs" >
129+
<CompileItem Include="..\..\src\System\Net\IPAddressPal.Unix.cs" >
127130
<Link>ProductionCode\System\Net\IPAddressPal.Unix.cs</Link>
128-
</Compile>
129-
<Compile Include="..\..\src\System\Net\HostInformationPal.Unix.cs" >
131+
</CompileItem>
132+
<CompileItem Include="..\..\src\System\Net\HostInformationPal.Unix.cs" >
130133
<Link>ProductionCode\System\Net\HostInformationPal.Unix.cs</Link>
131-
</Compile>
132-
<Compile Include="..\..\src\System\Net\SocketAddressPal.Unix.cs" >
134+
</CompileItem>
135+
<CompileItem Include="..\..\src\System\Net\SocketAddressPal.Unix.cs" >
133136
<Link>ProductionCode\System\Net\SocketAddressPal.Unix.cs</Link>
134-
</Compile>
137+
</CompileItem>
138+
<CompileItem Include="..\..\src\System\Net\SocketException.Unix.cs" >
139+
<Link>ProductionCode\System\Net\SocketException.Unix.cs</Link>
140+
</CompileItem>
135141

136-
<Compile Include="$(CommonPath)\Interop\Interop.CheckedAccess.cs" >
142+
<CompileItem Include="$(CommonPath)\Interop\Interop.CheckedAccess.cs" >
137143
<Link>ProductionCode\Common\Interop\Interop.CheckedAccess.cs</Link>
138-
</Compile>
139-
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs" >
144+
</CompileItem>
145+
<CompileItem Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs" >
140146
<Link>ProductionCode\Common\Interop\Unix\Interop.Libraries.cs</Link>
141-
</Compile>
142-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.freeaddrinfo.cs" >
147+
</CompileItem>
148+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.freeaddrinfo.cs" >
143149
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.freeaddrinfo.cs</Link>
144-
</Compile>
145-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.getaddrinfo.cs" >
150+
</CompileItem>
151+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.getaddrinfo.cs" >
146152
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.getaddrinfo.cs</Link>
147-
</Compile>
148-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.gethostname.cs" >
153+
</CompileItem>
154+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.gethostname.cs" >
149155
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.gethostname.cs</Link>
150-
</Compile>
151-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.getdomainname.cs" >
156+
</CompileItem>
157+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.getdomainname.cs" >
152158
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.getdomainname.cs</Link>
153-
</Compile>
154-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.getnameinfo.cs" >
159+
</CompileItem>
160+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.getnameinfo.cs" >
155161
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.getnameinfo.cs</Link>
156-
</Compile>
162+
</CompileItem>
157163
</ItemGroup>
158164

159165
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
160-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.addrinfo.cs" >
166+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.addrinfo.cs" >
161167
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.addrinfo.cs</Link>
162-
</Compile>
163-
<Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.sockaddr.cs" >
168+
</CompileItem>
169+
<CompileItem Include="$(CommonPath)\Interop\Unix\libc\Interop.sockaddr.cs" >
164170
<Link>ProductionCode\Common\Interop\Unix\libc\Interop.sockaddr.cs</Link>
165-
</Compile>
171+
</CompileItem>
166172
</ItemGroup>
167173

168174
<ItemGroup Condition=" '$(TargetsOSX)' == 'true' ">
169-
<Compile Include="$(CommonPath)\Interop\OSX\libc\Interop.addrinfo.cs" >
175+
<CompileItem Include="$(CommonPath)\Interop\OSX\libc\Interop.addrinfo.cs" >
170176
<Link>ProductionCode\Common\Interop\OSX\libc\Interop.addrinfo.cs</Link>
171-
</Compile>
172-
<Compile Include="$(CommonPath)\Interop\OSX\libc\Interop.sockaddr.cs" >
177+
</CompileItem>
178+
<CompileItem Include="$(CommonPath)\Interop\OSX\libc\Interop.sockaddr.cs" >
173179
<Link>ProductionCode\Common\Interop\OSX\libc\Interop.sockaddr.cs</Link>
174-
</Compile>
180+
</CompileItem>
175181
</ItemGroup>
176182

177183
<ItemGroup>
178184
<None Include="project.json" />
179185
</ItemGroup>
180-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
181186
</Project>

‎src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Windows.Pal.Tests.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@
1111
<UnsupportedPlatforms>Linux;OSX;FreeBSD</UnsupportedPlatforms>
1212
</PropertyGroup>
1313

14-
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.projinc" />
14+
<Import Project="$(MSBuildThisFileDirectory)\System.Net.Primitives.Pal.Tests.msbuild" />
15+
16+
<ItemGroup>
17+
<Compile Include="@(CompileItem)" />
18+
</ItemGroup>
19+
20+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
1521
</Project>

0 commit comments

Comments
 (0)