From db7f79a27330d63ebe6319462c23e19d015ead2a Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Thu, 2 Mar 2023 16:14:08 -0800
Subject: [PATCH] Add explicit reference to `Microsoft.Bcl.AsyncInterfaces` in
 HealthChecks (#46920)

* Update Microsoft.Extensions.Diagnostics.HealthChecks.csproj

* Update MicrosoftBclAsyncInterfacesVersion

* Automate updating M.Bcl.AsyncInterfaces package

---------

Co-authored-by: Safia Abdalla <safia@microsoft.com>
---
 eng/Version.Details.xml                                       | 4 ++++
 eng/Versions.props                                            | 2 +-
 .../src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7c42b5fd3f86..ddbfc1b54695 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -274,6 +274,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>e7926d6bb96976d9fc7aa1ac0a4e7a40f965b688</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0-preview.3.23152.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>e7926d6bb96976d9fc7aa1ac0a4e7a40f965b688</Sha>
+    </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
diff --git a/eng/Versions.props b/eng/Versions.props
index bef5ceebf296..ce02ddc23fc3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -125,6 +125,7 @@
     <SystemThreadingRateLimitingVersion>8.0.0-preview.3.23152.1</SystemThreadingRateLimitingVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsVersion>8.0.0-preview.3.23152.1</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.3.23152.1</MicrosoftBclAsyncInterfacesVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>8.0.0-preview.3.23152.4</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.3.23152.4</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -186,7 +187,6 @@
     <MicrosoftAspNetCoreMvcRazorExtensionsVersion>6.0.0</MicrosoftAspNetCoreMvcRazorExtensionsVersion>
     <MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
     <!-- Partner teams -->
-    <MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
     <MicrosoftBCLHashCodeVersion>1.1.1</MicrosoftBCLHashCodeVersion>
     <MicrosoftBuildVersion>17.4.0</MicrosoftBuildVersion>
     <MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
index dec758bfac7b..b005c61de15f 100644
--- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
+++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj
@@ -33,6 +33,9 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+
+    <!-- See: https://github.com/dotnet/aspnetcore/issues/46683 -->
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
   </ItemGroup>
 
 </Project>