From 629804fc1c165a6ef287439868c666436585db19 Mon Sep 17 00:00:00 2001
From: "Zi Chen (from Dev Box)" <zijchen@microsoft.com>
Date: Wed, 14 Feb 2024 16:56:23 -0800
Subject: [PATCH] Add copy task

---
 src/Microsoft.Build.Sql/sdk/Sdk.props   |  8 ++++----
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 17 +++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index 6343dc1..a85e5ef 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -64,12 +64,12 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.SqlServer.DacFx" Version="161.8089.0" GeneratePathProperty="true" ExcludeAssets="all" />
-      <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" GeneratePathProperty="true" ExcludeAssets="all" />
+      <PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.2.82-preview" GeneratePathProperty="true" ExcludeAssets="all" />
+      <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" GeneratePathProperty="true" ExcludeAssets="all" />
       <PackageReference Include="Microsoft.SqlServer.Server" Version="1.0.0" GeneratePathProperty="true" ExcludeAssets="all" />
       <PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" GeneratePathProperty="true" ExcludeAssets="all" />
-      <PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" GeneratePathProperty="true" ExcludeAssets="all" />
-      <PackageReference Include="System.IO.Packaging" Version="5.0.0" GeneratePathProperty="true" ExcludeAssets="all" />
+      <PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" GeneratePathProperty="true" ExcludeAssets="all" />
+      <PackageReference Include="System.IO.Packaging" Version="8.0.0" GeneratePathProperty="true" ExcludeAssets="all" />
   </ItemGroup>
   
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 3c00f8a..c4a9e58 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -6,12 +6,17 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
   <Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(MSBuildSdksPath)/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.BeforeCommon.targets" />
-  <Target Name="AfterRestore" AfterTargets="Restore">
-    <Message Text="Hello from Microsoft.Build.Sql after restore" Importance="high" />
-    <PropertyGroup>
-      <NETCoreTargetsPath Condition="$(NETCoreTargetsPath) == ''">$(PkgMicrosoft_SqlServer_DacFx)\lib\netstandard2.1</NETCoreTargetsPath>
-    </PropertyGroup>
-
+  
+  <Target Name="_CopyDllsForSqlBuild" AfterTargets="Restore">
+    <ItemGroup>
+      <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_DacFx)/lib/netstandard2.1/*.dll" />
+      <__SqlBuildBinaries Include="$(PkgMicrosoft_Data_SqlClient)/lib/netstandard2.1/Microsoft.Data.SqlClient.dll" />
+      <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_Server)/lib/netstandard2.0/Microsoft.SqlServer.Server.dll" />
+      <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_Types)/lib/netstandard2.1/Microsoft.SqlServer.Types.dll" />
+      <__SqlBuildBinaries Include="$(PkgSystem_ComponentModel_Composition)/lib/net6.0/System.ComponentModel.Composition.dll" />
+      <__SqlBuildBinaries Include="$(PkgSystem_IO_Packaging)/lib/netstandard2.0/System.IO.Packaging.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(__SqlBuildBinaries)" DestinationFolder="$(NETCoreTargetsPath)" SkipUnchangedFiles="true" />
   </Target>
 
   <!-- Pack target properties -->