From 78d46b75966baffd66787df767b8205a7b0014a0 Mon Sep 17 00:00:00 2001
From: Wraith2 <wraith2@gmail.com>
Date: Fri, 4 Nov 2022 14:32:18 +0000
Subject: [PATCH] add explicit dependency versions for netfx

---
 .../netcore/ref/Microsoft.Data.SqlClient.csproj             | 6 +++---
 .../netfx/ref/Microsoft.Data.SqlClient.csproj               | 4 ++++
 .../netfx/src/Microsoft.Data.SqlClient.csproj               | 6 ++++++
 tools/props/Versions.props                                  | 2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index 6daba77ab9..d31105b085 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -19,13 +19,13 @@
   <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
     <Compile Include="..\..\ref\System.Data.Common.Batch.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND $(TargetNetStandardVersion)=='netstandard2.1'">
+    <Compile Include="..\..\ref\System.Data.Common.Batch.IAsyncDisposable.cs" />    
+  </ItemGroup>  
   <ItemGroup>
     <Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.cs" />
     <Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' AND $(TargetNetStandardVersion)=='netstandard2.1'">
-    <Compile Include="..\..\ref\System.Data.Common.Batch.IAsyncDisposable.cs" />    
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
     <Compile Include="Microsoft.Data.SqlClient.NetStandard.cs" />
   </ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
index b8359cd4ba..067edd7cd1 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -23,4 +23,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 6155388f0a..4962989392 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -719,6 +719,9 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
+      <Version>$(MicrosoftBclAsyncInterfacesVersion)</Version>
+    </PackageReference>
     <PackageReference Condition="$(BuildForRelease) == 'true'" Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All" />
     <PackageReference Include="System.Text.Encodings.Web">
       <Version>$(SystemTextEncodingsWebVersion)</Version>
@@ -752,6 +755,9 @@
     <PackageReference Include="System.IO">
       <Version>$(SystemIOVersion)</Version>
     </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>$(SystemThreadingTasksExtensionsVersion)</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(NetFxSource)tools\targets\GenerateResourceStringsSource.targets" />
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 54547cc71b..331a3fa82d 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -23,6 +23,8 @@
     <MicrosoftDataSqlClientSniVersion>5.1.0-preview1.22278.1</MicrosoftDataSqlClientSniVersion>    
     <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
     <SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
+    <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
+    <MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
   </PropertyGroup>
   <!-- NetFx and NetCore project dependencies -->
   <PropertyGroup>