Small bug fixes (#3480)

Bump version to 6.0.16
Fixes #3477
Fixes #3478

---------

Co-authored-by: freddydk <[email protected]>

Author: freddydk

HelperFunctions.ps1

@@ -528,7 +528,7 @@ function CopyAppFilesToFolder {
             }
         }
         elseif (Test-Path $appFile -PathType Container) {
-            Get-ChildItem $appFile -Recurse | ForEach-Object {
+            Get-ChildItem $appFile -Recurse -File | ForEach-Object {
                 CopyAppFilesToFolder -appFile $_.FullName -folder $folder
             }
         }
@@ -553,10 +553,11 @@ function CopyAppFilesToFolder {
                         if ($copied) { Remove-Item -Path $appFile -Force }
                     }
                 }
-                else {
-                    $destFile = Join-Path $folder "$([System.IO.Path]::GetFileNameWithoutExtension($appFile)).app"
+                elseif ($appFile -like "*.app") {
+                    $destFileName = [System.IO.Path]::GetFileName($appFile)
+                    $destFile = Join-Path $folder $destFileName
                     if (Test-Path $destFile) {
-                        Write-Host -ForegroundColor Yellow "::WARNING::$([System.IO.Path]::GetFileName($destFile)) already exists, it looks like you have multiple app files with the same name. App filenames must be unique."
+                        Write-Host -ForegroundColor Yellow "::WARNING::$destFileName already exists, it looks like you have multiple app files with the same name. App filenames must be unique."
                     }
                     Copy-Item -Path $appFile -Destination $destFile -Force
                     $destFile

ReleaseNotes.txt

@@ -1,3 +1,7 @@
+6.0.16
+Issue 3477 Regression: Error: App filenames must be unique
+Issue 3478 New-bccontainer fails on BC24 using option -UseNewDatabase
+
 6.0.15
 Issue 3467 Can't create a backup of a container with the Backup-BCContainerDatabases commandlet
 Use PowerShell 5 in places where invoke-sqlcmd or other functions from the SqlServer PowerShell module are used

TenantHandling/New-NavContainerTenant.ps1

@@ -46,7 +46,7 @@ try {
         throw "You cannot add a tenant called tenant"
     }
 
-    Invoke-ScriptInBcContainer -containerName $containerName -ScriptBlock { Param($containerName, $tenantId, [PSCredential]$sqlCredential, $sourceDatabase, $destinationDatabase, $alternateId, $doNotCopyDatabase, $allowAppDatabaseWrite, $applicationInsightsKey)
+    Invoke-ScriptInBcContainer -containerName $containerName -usePwsh:$false -ScriptBlock { Param($containerName, $tenantId, [PSCredential]$sqlCredential, $sourceDatabase, $destinationDatabase, $alternateId, $doNotCopyDatabase, $allowAppDatabaseWrite, $applicationInsightsKey)
 
         $customConfigFile = Join-Path (Get-Item "C:\Program Files\Microsoft Dynamics NAV\*\Service").FullName "CustomSettings.config"
         [xml]$customConfig = [System.IO.File]::ReadAllText($customConfigFile)

Version.txt

@@ -1 +1 @@
-6.0.15-dev
+6.0.16-dev