From fe316795177080e704b0b07afb01bdeb5f26ab23 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Fri, 28 Jul 2023 17:16:05 -0700
Subject: [PATCH] Fix Microsoft.Bcl.AsyncInterfaces references

- HealthChecks was missing a reference for net462
- Connections.Abstractions was missing a reference for netstandard2.1
- The DotNetBuildFromSource check was redundant
---
 .../Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 2 +-
 .../Microsoft.AspNetCore.Connections.Abstractions.csproj | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
index b005c61de15f..5720fc33fa84 100644
--- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
+++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
@@ -35,7 +35,7 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
 
     <!-- See: https://github.com/dotnet/aspnetcore/issues/46683 -->
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
index 039515346f72..3013bd460723 100644
--- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -11,6 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />
+
     <Reference Include="Microsoft.Extensions.Features" />
     <Reference Include="System.IO.Pipelines" />
 
@@ -24,11 +26,4 @@
     <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
-  <!-- Special case building from source because Microsoft.Bcl.AsyncInterfaces isn't available for source builds. -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR
-      '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
-      ('$(MSBuildRestoreSessionId)' == '' AND '$(DotNetBuildFromSource)' != 'true') ">
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces" />
-  </ItemGroup>
-
 </Project>