diff --git a/Directory.Packages.props b/Directory.Packages.props
index e0dd5cf0d..143a88b82 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -28,5 +28,6 @@
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="161.8817.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/Microsoft.SqlServer.TransactSql.ScriptDom.dll b/lib/Microsoft.SqlServer.TransactSql.ScriptDom.dll
deleted file mode 100644
index 9f62aabf3..000000000
Binary files a/lib/Microsoft.SqlServer.TransactSql.ScriptDom.dll and /dev/null differ
diff --git a/performance/packages.lock.json b/performance/packages.lock.json
index 168be8c16..0d1f151fd 100644
--- a/performance/packages.lock.json
+++ b/performance/packages.lock.json
@@ -1863,6 +1863,7 @@
           "Microsoft.AspNetCore.Http": "[2.2.2, )",
           "Microsoft.Azure.WebJobs": "[3.0.36, )",
           "Microsoft.Data.SqlClient": "[5.0.1, )",
+          "Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
           "Newtonsoft.Json": "[13.0.2, )",
           "System.Runtime.Caching": "[5.0.0, )",
           "morelinq": "[3.3.2, )"
@@ -2048,6 +2049,12 @@
           "Microsoft.TestPlatform.TestHost": "17.4.0"
         }
       },
+      "Microsoft.SqlServer.TransactSql.ScriptDom": {
+        "type": "CentralTransitive",
+        "requested": "[161.8817.2, )",
+        "resolved": "161.8817.2",
+        "contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
+      },
       "Moq": {
         "type": "CentralTransitive",
         "requested": "[4.18.2, )",
diff --git a/samples/samples-csharp/packages.lock.json b/samples/samples-csharp/packages.lock.json
index dea9ef800..2ff3a1ec1 100644
--- a/samples/samples-csharp/packages.lock.json
+++ b/samples/samples-csharp/packages.lock.json
@@ -1723,6 +1723,7 @@
           "Microsoft.AspNetCore.Http": "[2.2.2, )",
           "Microsoft.Azure.WebJobs": "[3.0.36, )",
           "Microsoft.Data.SqlClient": "[5.0.1, )",
+          "Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
           "Newtonsoft.Json": "[13.0.2, )",
           "System.Runtime.Caching": "[5.0.0, )",
           "morelinq": "[3.3.2, )"
@@ -1823,6 +1824,12 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
+      "Microsoft.SqlServer.TransactSql.ScriptDom": {
+        "type": "CentralTransitive",
+        "requested": "[161.8817.2, )",
+        "resolved": "161.8817.2",
+        "contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
+      },
       "morelinq": {
         "type": "CentralTransitive",
         "requested": "[3.3.2, )",
diff --git a/samples/samples-outofproc/Microsoft.Azure.WebJobs.Extensions.Sql.SamplesOutOfProc.csproj b/samples/samples-outofproc/Microsoft.Azure.WebJobs.Extensions.Sql.SamplesOutOfProc.csproj
index ea36391ba..65263abda 100644
--- a/samples/samples-outofproc/Microsoft.Azure.WebJobs.Extensions.Sql.SamplesOutOfProc.csproj
+++ b/samples/samples-outofproc/Microsoft.Azure.WebJobs.Extensions.Sql.SamplesOutOfProc.csproj
@@ -14,7 +14,12 @@
     <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
+    <ProjectReference
+      Include="..\..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
+    <!-- We want to build the extension project first since this project references the package
+    produced by building that. But we don't want it as an actual runtime depdendency -->
+    <ProjectReference Include="..\..\src\Microsoft.Azure.WebJobs.Extensions.Sql.csproj"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.Sql.csproj b/src/Microsoft.Azure.WebJobs.Extensions.Sql.csproj
index 6b4e50130..e98b6659e 100644
--- a/src/Microsoft.Azure.WebJobs.Extensions.Sql.csproj
+++ b/src/Microsoft.Azure.WebJobs.Extensions.Sql.csproj
@@ -9,7 +9,6 @@
     <!-- Default Version for dev -->
     <Version>99.99.99</Version>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Microsoft.Azure.WebJobs.Extensions.Sql</PackageId>
     <PackageTags>Microsoft Azure WebJobs AzureFunctions SQL AzureSQL</PackageTags>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
@@ -20,6 +19,7 @@
     <PackageReference Include="Microsoft.Azure.WebJobs" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" />
     <PackageReference Include="morelinq" />
     <PackageReference Include="System.Runtime.Caching" />
     <PackageReference Include="Newtonsoft.Json" />
@@ -30,24 +30,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- ScriptDom is currently only available officially through the DacFx NuGet package. Rather than referencing DacFx
-    for one ScriptDom API, we are getting the ScriptDom dll from the latest DacFx NuGet package. -->
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom">
-      <HintPath>..\lib\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
-    </Reference>
     <None Include="..\Images\pkgicon.png" Pack="true" PackagePath="" />
-    <None Include="..\lib\Microsoft.SqlServer.TransactSql.ScriptDom.dll" Pack="true" PackagePath="lib/$(TargetFramework)" />
     <None Include="..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
-  <Target Name="CopyNupkg" AfterTargets="Pack">
+  <Target Name="PackAndCopyNupkg" AfterTargets="Build">
+    <!-- Removed the GeneratePackageOnBuild and adding this explicit Pack command to run post build
+    and also adding the copy package to local-packages to be available for the worker extension project. -->
+    <Exec Command="dotnet pack &quot;$(MSBuildProjectDirectory)\$(PackageId).csproj&quot; --no-build --include-symbols -p:Version=$(Version)" />
     <ItemGroup>
       <_Packages Include=".\bin\$(Configuration)\*.nupkg" />
     </ItemGroup>
-    <Copy SourceFiles="@(_Packages)" DestinationFolder="../local-packages" />
+    <Copy SourceFiles="@(_Packages)" DestinationFolder="..\local-packages" />
     <Message Text="Copied sql .nupkg to local-packages" Importance="high" />
   </Target>
   <Target Name="RemoveNugetPackageCache" BeforeTargets="Build">
-    <RemoveDir Directories="$(NugetPackageRoot)/$(PackageId.ToLower())/99.99.99"></RemoveDir>
-    <Message Text="Deleted nuget cache for $(PackageId.ToLower())/99.99.99" Importance="high" />
+    <RemoveDir Directories="$(NugetPackageRoot)\$(PackageId.ToLower())\$(Version)"></RemoveDir>
+    <Message Text="Deleted nuget cache for $(PackageId.ToLower())\$(Version)" Importance="high" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages.lock.json b/src/packages.lock.json
index fbea72fd2..8eb033fbd 100644
--- a/src/packages.lock.json
+++ b/src/packages.lock.json
@@ -79,6 +79,12 @@
           "Microsoft.SourceLink.Common": "1.1.1"
         }
       },
+      "Microsoft.SqlServer.TransactSql.ScriptDom": {
+        "type": "Direct",
+        "requested": "[161.8817.2, )",
+        "resolved": "161.8817.2",
+        "contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
+      },
       "morelinq": {
         "type": "Direct",
         "requested": "[3.3.2, )",
diff --git a/test-outofproc/test-outofproc.csproj b/test-outofproc/test-outofproc.csproj
index e89120870..728ac0c3c 100644
--- a/test-outofproc/test-outofproc.csproj
+++ b/test-outofproc/test-outofproc.csproj
@@ -15,7 +15,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
+    <ProjectReference
+      Include="..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
+    <!-- We want to build the extension project first since this project references the package
+    produced by building that. But we don't want it as an actual runtime depdendency -->
+    <ProjectReference Include="..\src\Microsoft.Azure.WebJobs.Extensions.Sql.csproj"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
@@ -27,6 +32,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext"/>
+    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/packages.lock.json b/test/packages.lock.json
index 5eda640be..c25bddcd6 100644
--- a/test/packages.lock.json
+++ b/test/packages.lock.json
@@ -1869,6 +1869,7 @@
           "Microsoft.AspNetCore.Http": "[2.2.2, )",
           "Microsoft.Azure.WebJobs": "[3.0.36, )",
           "Microsoft.Data.SqlClient": "[5.0.1, )",
+          "Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
           "Newtonsoft.Json": "[13.0.2, )",
           "System.Runtime.Caching": "[5.0.0, )",
           "morelinq": "[3.3.2, )"
@@ -1980,6 +1981,12 @@
           "System.Text.Encodings.Web": "4.7.2"
         }
       },
+      "Microsoft.SqlServer.TransactSql.ScriptDom": {
+        "type": "CentralTransitive",
+        "requested": "[161.8817.2, )",
+        "resolved": "161.8817.2",
+        "contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
+      },
       "morelinq": {
         "type": "CentralTransitive",
         "requested": "[3.3.2, )",