huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply suggestions from code review

This commit is contained in:
Chris Ross 2020-08-13 08:52:29 -07:00 committed by GitHub
parent ac6b62b5df
commit e35c4a8acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Build.props
View File

@ -126,10 +126,10 @@
<RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName> <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName> <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
<!-- This is used to produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.8. --> <!-- This is used to produce targeting pack installers/packages once per major.minor. -->
<IsTargetingPackBuilding Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</IsTargetingPackBuilding> <IsTargetingPackBuilding Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding <IsTargetingPackBuilding
Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '8' ">false</IsTargetingPackBuilding> Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '0' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding> <IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding>
<!-- <!--

6
src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs
View File

@ -31,12 +31,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
private async Task<bool> HostNameIsReachable() private async Task<bool> HostNameIsReachable()
{ {
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
// Code below is unreliable on macOS and tests fail on that platform.
return false;
}
try try
{ {
_hostname = Dns.GetHostName(); _hostname = Dns.GetHostName();