Skip to content

Commit

Permalink
Issue 3460 (#3462)
Browse files Browse the repository at this point in the history
Fixes #3460

Co-authored-by: freddydk <freddydk@users.noreply.github.com>
  • Loading branch information
freddydk and freddydk committed Apr 4, 2024
1 parent 43c9155 commit c57eae7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
18 changes: 6 additions & 12 deletions ContainerHandling/New-NavContainer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1657,8 +1657,8 @@ if (!(Test-Path "c:\navpfiles\*")) {
if ($assignPremiumPlan -and !$restoreBakFolder -and !$skipDatabase) {
if (!(Test-Path -Path "$myfolder\SetupNavUsers.ps1")) {
('# Invoke default behavior
. (Join-Path $runPath $MyInvocation.MyCommand.Name)
') | Set-Content -Path "$myfolder\SetupNavUsers.ps1"
. "c:\run\SetupNavUsers.ps1"
') | Set-Content -Path "$myfolder\SetupNavUsers.ps1"
}

if ($version.Major -ge 15) {
Expand Down Expand Up @@ -1698,13 +1698,13 @@ Get-NavServerUser -serverInstance $ServerInstance -tenant default |? LicenseType

if (!(Test-Path -Path "$myfolder\SetupVariables.ps1")) {
('# Invoke default behavior
. (Join-Path $runPath $MyInvocation.MyCommand.Name)
') | Set-Content -Path "$myfolder\SetupVariables.ps1"
. "c:\run\SetupVariables.ps1"
') | Set-Content -Path "$myfolder\SetupVariables.ps1"
}
if (!(Test-Path -Path "$myfolder\HelperFunctions.ps1")) {
('# Invoke default behavior
. (Join-Path $runPath $MyInvocation.MyCommand.Name)
') | Set-Content -Path "$myfolder\HelperFunctions.ps1"
. "c:\run\HelperFunctions.ps1"
') | Set-Content -Path "$myfolder\HelperFunctions.ps1"
}

if ($version.Major -ge 24 -and $genericTag -eq [System.Version]"1.0.2.15") {
Expand All @@ -1716,12 +1716,6 @@ Get-NavServerUser -serverInstance $ServerInstance -tenant default |? LicenseType
Download-File -source "https://raw.githubusercontent.com/microsoft/nav-docker/4123cbcd197df57a5d94fa15b976356c11f4bcac/generic/Run/navstart.ps1" -destinationFile (Join-Path $myFolder "navstart.ps1")
}

if ($version.Major -ge 24) {
('
if (!(Get-Command "invoke-sqlcmd" -ErrorAction SilentlyContinue)) { try { Write-Host "Installing SqlServer module"; Install-package SqlServer -Force -RequiredVersion 21.1.18256 | Out-Null } catch { Write-Host "Failed to install SqlServer module" } }
') | Add-Content -Path "$myfolder\HelperFunctions.ps1"
}

if ($version.Major -ge 15 -and $version.Major -le 18 -and $genericTag -ge [System.Version]"1.0.2.15") {
Write-Host "Patching container to install ASP.NET Core 1.1"
Download-File -source "https://download.microsoft.com/download/6/F/B/6FB4F9D2-699B-4A40-A674-B7FF41E0E4D2/DotNetCore.1.0.7_1.1.4-WindowsHosting.exe" -destinationFile (Join-Path $myFolder "dotnetcore.exe")
Expand Down
1 change: 1 addition & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Issue 3452 Error when running Run-AlValidation : Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information.
Issue 3454 DockerDo : Cannot bind argument to parameter 'imageName' because it is an empty string.
Issue 3354 Regression : Compile Folder removal of symbols folder fails: The process cannot access the file
Issue 3460 Do not install SqlServer PowerShell module

6.0.12
Issue 3432 New-BcContainerWizard stopped working after generic images with ltsc2016, ltsc2019 and ltsc2022 was introduced
Expand Down

0 comments on commit c57eae7

Please sign in to comment.