Skip to content

Commit 6b983a2

Browse files
authored
Move the tool detection so only done if DACPACs found (#2052)
1 parent c8d4244 commit 6b983a2

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

Extensions/Versioning/VersionDacpacTask/src/Update-DacPacVersionNumber.ps1

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,29 +240,27 @@ else {
240240
}
241241
Write-Verbose "Version: $NewVersion"
242242

243-
244-
$ToolPath = Get-Toolpath -ToolPath $ToolPath -VSVersion $VSVersion -SDKVersion $SDKVersion
245-
246-
243+
Write-Host "Scanning for DACPAC files under $PATH." -Verbose
247244
$DacPacFiles = Get-ChildItem -Path $Path -Include *.dacpac -Exclude master.dacpac, msdb.dacpac -Recurse
248245
Write-Host "Found $($DacPacFiles.Count) DACPAC files." -Verbose
249246

250247
if (($DacPacFiles.Count -gt 0) -and ([System.Convert]::ToBoolean($SkipDacPac) -eq $false)) {
248+
Write-Host "Finding DACPAC Tools to process the $($DacPacFiles.Count) DACPAC files." -Verbose
249+
$ToolPath = Get-Toolpath -ToolPath $ToolPath -VSVersion $VSVersion -SDKVersion $SDKVersion
250+
251251
Write-Host "Apply updated version number $NewVersion to each DACPAC file." -Verbose
252-
253252
Foreach ($DacPac in $DacPacFiles) {
254253
Update-DacpacVerion -Path $DacPac.FullName -VersionNumber ([System.Version]::Parse($NewVersion)) -ToolPath $ToolPath
255254
}
256255
}
257256
else {
258-
Write-Host "Found no DACPAC files, or SkipDacPac parameter is set. Checking for sqlproj files to version instead" -Verbose
257+
Write-Host "Found no DACPAC files, or SkipDacPac parameter is set. Checking for .SQLPROJ files to version instead" -Verbose
259258
$SqlProjFiles = Get-ChildItem -Path $Path -Include *.sqlproj -Recurse
260259

261260
if ($SqlProjFiles) {
262261
Write-Host "Found $($SqlProjFiles.Count) sqlproj files. Adding or updating DacVersion field." -Verbose
263-
264262
foreach ($SqlProj in $SqlProjFiles) {
265-
Write-Host "Updating $($SqlProj.Basename) SQL Proj file."
263+
Write-Host "Updating $($SqlProj.Basename) .SQLProj file."
266264
Update-SqlProjVersion -Path $SqlProj.Fullname -VersionNumber ([System.Version]::Parse($NewVersion)) -RegexPattern $VersionRegex
267265
}
268266
}

0 commit comments

Comments
 (0)