Scripting and container build fixes (#473)

* Fixes #469 * Fixed GitHub action for container-build
mmckechney · Feb 14, 2024 · a425317 · a425317
1 parent 73f6dbc
commit a425317
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SQL Build Manager Change Log
 
+### Version 15.6.1
+- *FIXED:* [GitHub Issue #469](https://github.com/mmckechney/SqlBuildManager/issues/469) - New tables with foreign key constraints not generating the CREATE TABLE statements
+- *FIXED:* GitHub Action for container build
+
 ### Version 15.6.0
 - *UPDATED:* Now targets .NET 8.0 
 - *UPDATED:* Simplified data object classes and regenerated typed DataSet classes

diff --git a/scripts/templates/Modules/containerappenv.bicep b/scripts/templates/Modules/containerappenv.bicep
@@ -1,9 +1,15 @@
 param containerAppEnvName string
 param logAnalyticsClientId string
-param logAnalyticsKey string
+param logAnalyticsWorkspaceName string
 param location string = resourceGroup().location
 param subnetId string = ''
 
+
+resource logAnalyticsWorkspaceResource 'Microsoft.OperationalInsights/workspaces@2021-06-01' existing = {
+  name:logAnalyticsWorkspaceName
+
+}
+
 resource containerAppEnvWithSubnet 'Microsoft.App/managedEnvironments@2022-11-01-preview' =  if(subnetId != '') {
   name: containerAppEnvName
   location: location
@@ -12,7 +18,8 @@ resource containerAppEnvWithSubnet 'Microsoft.App/managedEnvironments@2022-11-01
       destination: 'log-analytics'
       logAnalyticsConfiguration: {
         customerId: logAnalyticsClientId
-        sharedKey: logAnalyticsKey
+        sharedKey: logAnalyticsWorkspaceResource.listkeys().primarySharedKey
+
       }
     }
     workloadProfiles: [
@@ -35,7 +42,7 @@ resource containerAppEnvNoSubnet 'Microsoft.App/managedEnvironments@2022-11-01-p
       destination: 'log-analytics'
       logAnalyticsConfiguration: {
         customerId: logAnalyticsClientId
-        sharedKey: logAnalyticsKey
+        sharedKey: logAnalyticsWorkspaceResource.listkeys().primarySharedKey
       }
     }
     workloadProfiles: [

diff --git a/scripts/templates/Modules/database.bicep b/scripts/templates/Modules/database.bicep
@@ -56,6 +56,7 @@ resource sqlserverAResource 'Microsoft.Sql/servers@2021-11-01' = {
     administratorLoginPassword: sqladminpassword
     publicNetworkAccess: 'Enabled'
     restrictOutboundNetworkAccess: 'Disabled'
+    minimalTlsVersion: '1.2'
     administrators: {
       administratorType: 'ActiveDirectory'
       principalType: 'Application'
@@ -136,6 +137,7 @@ resource sqlserverBResource 'Microsoft.Sql/servers@2021-11-01' = {
     administratorLoginPassword: sqladminpassword
     publicNetworkAccess: 'Enabled'
     restrictOutboundNetworkAccess: 'Disabled'
+    minimalTlsVersion: '1.2'
     administrators: {
       administratorType: 'ActiveDirectory'
       principalType: 'Application'

diff --git a/scripts/templates/azuredeploy_main.bicep b/scripts/templates/azuredeploy_main.bicep
@@ -133,7 +133,7 @@ module containerAppEnv './Modules/containerappenv.bicep' = if(deployContainerApp
   params: { 
     containerAppEnvName: containerAppEnvNameVar
     logAnalyticsClientId: logAnalyticsWorkspaceResource.properties.customerId
-    logAnalyticsKey: logAnalyticsWorkspaceResource.listkeys().primarySharedKey
+    logAnalyticsWorkspaceName: logAnalyticsWorkspaceVar
     subnetId: networkResource.outputs.containerAppSubnetId
     location: location
 

diff --git a/src/AssemblyVersioning.cs b/src/AssemblyVersioning.cs
@@ -6,8 +6,8 @@
 // associated with an assembly.
 //
 [assembly: AssemblyCompany("Michael McKechney - www.mckechney.com")]
-[assembly: AssemblyCopyright("Copyright © Michael McKechney 2004-2023")]
-[assembly: AssemblyTrademark("Copyright © Michael McKechney 2004-2023")]
+[assembly: AssemblyCopyright("Copyright © Michael McKechney 2004-2024")]
+[assembly: AssemblyTrademark("Copyright © Michael McKechney 2004-2024")]
 
 //
 // Version information for an assembly consists of the following four values:
@@ -24,5 +24,5 @@
 //   2) Update the installer version to match the AssemblyVersion below.
 //   These can be found in SqlBuildManager.Setup -> Organize Your Setup -> General Information
 
-[assembly: AssemblyVersion("15.6.0")]
-[assembly: AssemblyFileVersion("15.6.0")]
+[assembly: AssemblyVersion("15.6.1")]
+[assembly: AssemblyFileVersion("15.6.1")]
diff --git a/...BuildManager.Console.Dependent.UnitTest/SqlBuildManager.Console.Dependent.UnitTest.csproj b/...BuildManager.Console.Dependent.UnitTest/SqlBuildManager.Console.Dependent.UnitTest.csproj
@@ -62,9 +62,9 @@
 
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
 
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlBuildManager.Console.ExternalTest/SqlBuildManager.Console.ExternalTest.csproj b/src/SqlBuildManager.Console.ExternalTest/SqlBuildManager.Console.ExternalTest.csproj
@@ -8,15 +8,15 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+    <PackageReference Include="YamlDotNet" Version="15.1.1" />
   </ItemGroup>
   <ItemGroup>
     <!--<ProjectReference Include="..\..\..\command-line-api\src\System.CommandLine\System.CommandLine.csproj" />-->

diff --git a/src/SqlBuildManager.Console.UnitTest/SqlBuildManager.Console.UnitTest.csproj b/src/SqlBuildManager.Console.UnitTest/SqlBuildManager.Console.UnitTest.csproj
@@ -32,9 +32,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlBuildManager.Console/sbm.csproj b/src/SqlBuildManager.Console/sbm.csproj
@@ -29,10 +29,10 @@
 	<ItemGroup>
 		<PackageReference Include="Azure.Core" Version="1.37.0" />
 		<PackageReference Include="Azure.Identity" Version="1.10.4" />
-		<PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
-		<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
-		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.17.2" />
-		<PackageReference Include="Azure.ResourceManager" Version="1.10.0" />
+		<PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.0" />
+		<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.0" />
+		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.17.3" />
+		<PackageReference Include="Azure.ResourceManager" Version="1.10.1" />
 		<PackageReference Include="Azure.ResourceManager.AppContainers" Version="1.1.1" />
 		<PackageReference Include="Azure.ResourceManager.Batch" Version="1.3.0" />
 		<PackageReference Include="Azure.ResourceManager.ContainerInstance" Version="1.2.0" />
@@ -64,9 +64,9 @@
 		<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
 		<PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
 		<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Azure.Batch" Version="16.0.0" />
+		<PackageReference Include="Microsoft.Azure.Batch" Version="16.1.0" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
-		<PackageReference Include="YamlDotNet" Version="15.1.0" />
+		<PackageReference Include="YamlDotNet" Version="15.1.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="Aci\aci_arm_template.json">

diff --git a/src/SqlBuildManager.Enterprise.UnitTest/SqlBuildManager.Enterprise.UnitTest.csproj b/src/SqlBuildManager.Enterprise.UnitTest/SqlBuildManager.Enterprise.UnitTest.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlBuildManager.Logging/SqlBuildManager.Logging.csproj b/src/SqlBuildManager.Logging/SqlBuildManager.Logging.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
 	<PackageReference Include="Azure.Identity" Version="1.10.4" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />

diff --git a/src/SqlBuildManager.ScriptHandling.UnitTest/SqlBuildManager.ScriptHandling.UnitTest.csproj b/src/SqlBuildManager.ScriptHandling.UnitTest/SqlBuildManager.ScriptHandling.UnitTest.csproj
@@ -10,9 +10,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.Connection.Dependent.UnitTest/SqlSync.Connection.Dependent.UnitTest.csproj b/src/SqlSync.Connection.Dependent.UnitTest/SqlSync.Connection.Dependent.UnitTest.csproj
@@ -13,9 +13,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.Connection.UnitTest/SqlSync.Connection.UnitTest.csproj b/src/SqlSync.Connection.UnitTest/SqlSync.Connection.UnitTest.csproj
@@ -13,9 +13,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.Connection/SqlSync.Connection.csproj b/src/SqlSync.Connection/SqlSync.Connection.csproj
@@ -6,7 +6,7 @@
     <Compile Include="..\AssemblyVersioning.cs" Link="Properties\AssemblyVersioning.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/SqlSync.DbInformation.Dependent.UnitTest/SqlSync.DbInformation.Dependent.UnitTest.csproj b/src/SqlSync.DbInformation.Dependent.UnitTest/SqlSync.DbInformation.Dependent.UnitTest.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.ObjectScript.Dependent.UnitTest/SqlSync.ObjectScript.Dependent.UnitTest.csproj b/src/SqlSync.ObjectScript.Dependent.UnitTest/SqlSync.ObjectScript.Dependent.UnitTest.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.ObjectScript.UnitTest/SqlSync.ObjectScript.UnitTest.csproj b/src/SqlSync.ObjectScript.UnitTest/SqlSync.ObjectScript.UnitTest.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.SprocTest/SqlSync.SprocTest.csproj b/src/SqlSync.SprocTest/SqlSync.SprocTest.csproj
@@ -6,11 +6,11 @@
     <Deterministic>false</Deterministic>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.SqlBuild.Dependent.UnitTest/SqlSync.SqlBuild.Dependent.UnitTest.csproj b/src/SqlSync.SqlBuild.Dependent.UnitTest/SqlSync.SqlBuild.Dependent.UnitTest.csproj
@@ -31,11 +31,11 @@
     <EmbeddedResource Include="Resources\XmlWithNoNamespace.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.SqlBuild.UnitTest/SqlSync.SqlBuild.UnitTest.csproj b/src/SqlSync.SqlBuild.UnitTest/SqlSync.SqlBuild.UnitTest.csproj
@@ -22,11 +22,11 @@
     <EmbeddedResource Include="Resources\serialized_multidb_xml.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/SqlSync.SqlBuild/DacPacHelper.cs b/src/SqlSync.SqlBuild/DacPacHelper.cs
@@ -240,7 +240,9 @@ internal static DacpacDeltasStatus CleanDacPacScript(string dacPacGeneratedScrip
 
             //look for the database settings header 
             endMatchs = Regex.Matches(cleanedScript, Regex.Escape("$(DatabaseName)"));
-            endMatch = endMatchs.Cast<Match>().LastOrDefault();
+            endMatch = endMatchs.Cast<Match>().FirstOrDefault();
+
+           //remove anything before the first match
             if (endMatch != null && endMatch.Index != -1)
             {
                 matchFound = true;
@@ -249,6 +251,12 @@ internal static DacpacDeltasStatus CleanDacPacScript(string dacPacGeneratedScrip
                 cleanedScript = cleanedScript.Substring(index);
             }
 
+            //Just remove any remaining USE statements
+            if(endMatchs.Count > 0)
+            {
+               cleanedScript = cleanedScript.Replace("USE [$(DatabaseName)];", "");
+            }
+
             if (!matchFound)
             {
                 log.LogInformation("Unable to find script headers, nothing to update?");

diff --git a/src/SqlSync.SqlBuild/SQLSync.SqlBuild.csproj b/src/SqlSync.SqlBuild/SQLSync.SqlBuild.csproj
@@ -16,10 +16,10 @@
     <EmbeddedResource Include="Status\Xml\ServerReport_summary.xslt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.1.172" />
-    <PackageReference Include="Polly" Version="8.2.1" />
+    <PackageReference Include="Polly" Version="8.3.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/SqlSync.SqlBuild/SqlSync.SqlBuild.csproj b/src/SqlSync.SqlBuild/SqlSync.SqlBuild.csproj
@@ -16,10 +16,10 @@
     <EmbeddedResource Include="Status\Xml\ServerReport_summary.xslt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.SqlServer.DacFx" Version="162.1.172" />
-    <PackageReference Include="Polly" Version="8.2.1" />
+    <PackageReference Include="Polly" Version="8.3.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>