Merge branch 'main' into fix-nuget-packet-id-shortening

MoritzTSR · web-flow · commit 0e673978ad84 · 2025-09-01T11:13:56.000+02:00
diff --git a/AppHandling/Extract-AppFileToFolder.ps1 b/AppHandling/Extract-AppFileToFolder.ps1
@@ -84,6 +84,42 @@ try {
         $memoryStream = [System.IO.MemoryStream]::new($content)
         $zipArchive = [System.IO.Compression.ZipArchive]::new($memoryStream, [System.IO.Compression.ZipArchiveMode]::Read)
         $prevdir = ""
+
+        # If the app file is a ready-to-run app, it has a readytorunappmanifest.json file inside the archive
+        $readyToRunAppManifest = $zipArchive.Entries | Where-Object { $_.FullName -eq "readytorunappmanifest.json" }
+        if ($readyToRunAppManifest) {
+            # Create a temporary folder to extract the ready-to-run app manifest
+            $tmpFolder = Join-Path ([System.IO.Path]::GetTempPath()) ([Guid]::NewGuid().ToString())
+            New-Item -Path $tmpFolder -ItemType Directory -Force | Out-Null
+
+            # Extract the ready-to-run app manifest and get the embedded app file name
+            $fullname = Join-Path $tmpFolder "readytorunappmanifest.json"
+            [System.IO.Compression.ZipFileExtensions]::ExtractToFile($readyToRunAppManifest, $fullname)
+            $embeddedAppFileName = (Get-Content -Path $fullname -Raw | ConvertFrom-Json).EmbeddedAppFileName
+            $embeddedAppFile = $zipArchive.Entries | Where-Object { $_.FullName -eq $embeddedAppFileName }
+            if (-not $embeddedAppFile) {
+                throw "Unable to find embedded app file '$embeddedAppFile' in the ready-to-run app."
+            }
+
+            # Create a temporary folder to extract the app file to
+            $fullname = Join-Path $tmpFolder ([Uri]::UnescapeDataString($embeddedAppFile.FullName))
+            [System.IO.Compression.ZipFileExtensions]::ExtractToFile($embeddedAppFile, $fullname)
+
+            # Close stream and binary reader before recursive call
+            $binaryReader.Close()
+            $filestream.Close()
+            $memoryStream.Close()
+
+            try {
+                # Call the Extract-AppFileToFolder function again to extract the content of the app file
+                Extract-AppFileToFolder -appFilename $fullname -appFolder $appFolder -generateAppJson:$generateAppJson -excludeRuntimeProperty:$excludeRuntimeProperty -latestSupportedRuntimeVersion:$latestSupportedRuntimeVersion -openFolder:$openFolder
+            } finally {
+                # Clean up the temporary folder
+                Remove-Item $tmpFolder -Recurse -Force -ErrorAction SilentlyContinue
+            }
+            return
+        }
+
         $zipArchive.Entries | ForEach-Object {
             $fullname = Join-Path $appFolder ([Uri]::UnescapeDataString($_.FullName))
             $dir = [System.IO.Path]::GetDirectoryName($fullname)
diff --git a/AppHandling/Run-AlPipeline.ps1 b/AppHandling/Run-AlPipeline.ps1
@@ -2925,13 +2925,22 @@ $pageScriptingTests | ForEach-Object {
     Write-Host "Running Page Scripting Tests for $testSpec (test name: $name)"
     $resultsFolder = Join-Path $pageScriptingTestResultsFolder $name
     New-Item -Path $resultsFolder -ItemType Directory | Out-Null
-    pwsh -command {
-        npx replay $args[0] -ResultDir $args[1] -StartAddress $args[2] -Authentication UserPassword -usernameKey 'containerUsername' -passwordkey 'containerPassword'
-    } -args $path, $resultsFolder, $startAddress
-    if ($? -ne "True") {
+    try {
+        pwsh -command {
+            npx replay $args[0] -ResultDir $args[1] -StartAddress $args[2] -Authentication UserPassword -usernameKey 'containerUsername' -passwordkey 'containerPassword'
+        } -args $path, $resultsFolder, $startAddress
+        if ($? -ne "True") {
+            Write-Host "Page Scripting Tests failed for $testSpec"
+            $thisFailed = $true
+        }
+    } catch {
+        $thisFailed = $true
+        Write-Host -ForegroundColor Red "Page Scripting Tests failed for $testSpec : $($_.Exception.Message)"
+    }
+
+    if ($thisFailed) {
         Write-Host "Page Scripting Tests failed for $testSpec"
         $allPassed = $false
-        $thisFailed = $true
     }
     $testResultsFile = Join-Path $resultsFolder "results.xml"
     $playwrightReportFolder = Join-Path $resultsFolder 'playwright-report'
diff --git a/Artifacts/Download-Artifacts.ps1 b/Artifacts/Download-Artifacts.ps1
@@ -127,27 +127,48 @@ try {
             $appUri = [Uri]::new($artifactUrl)
     
             $appArtifactPath = Join-Path $basePath $appUri.AbsolutePath
+            $appManifestPath = Join-Path $appArtifactPath "manifest.json"
             $exists = Test-Path $appArtifactPath
+
+            # if the force switch is set, we remove the existing artifact and redownload it
             if ($exists -and $force) {
                 Remove-Item $appArtifactPath -Recurse -Force
                 $exists = $false
             }
+
+            # If the artifact exists and includePlatform or forceRedirection is set, we also need the manifest file
+            if ($exists -and ($includePlatform -or $forceRedirection) -and (-not (Test-Path $appManifestPath))) {
+                Remove-Item $appArtifactPath -Recurse -Force
+                $exists = $false
+            }
+
+            # Test if the manifest file exists and is not corrupt
+            if ($exists -and (Test-Path $appManifestPath)) {
+                try {
+                    Get-Content $appManifestPath | ConvertFrom-Json | Out-Null
+                }
+                catch {
+                    Write-Host "ERROR: Manifest file is corrupt, removing $appArtifactPath and redownloading"
+                    Remove-Item $appArtifactPath -Recurse -Force
+                    $exists = $false
+                }
+            }
+
             if ($exists -and $forceRedirection) {
-                $appManifestPath = Join-Path $appArtifactPath "manifest.json"
                 $appManifest = Get-Content $appManifestPath | ConvertFrom-Json
                 if ($appManifest.PSObject.Properties.name -eq "applicationUrl") {
                     # redirect artifacts are always downloaded
                     Remove-Item $appArtifactPath -Recurse -Force
                     $exists = $false
                 }
             }
+
             if (-not $exists) {
                 Write-Host "Downloading artifact $($appUri.AbsolutePath)"
                 DownloadPackage -artifactUrl $artifactUrl -destinationPath $appArtifactPath -timeout $timeout | Out-Null
             }
             try { [System.IO.File]::WriteAllText((Join-Path $appArtifactPath 'lastused'), "$([datetime]::UtcNow.Ticks)") } catch {}
 
-            $appManifestPath = Join-Path $appArtifactPath "manifest.json"
             if (Test-Path $appManifestPath) {
                 $appManifest = Get-Content $appManifestPath | ConvertFrom-Json
 
diff --git a/ContainerHandling/Flush-ContainerHelperCache.ps1 b/ContainerHandling/Flush-ContainerHelperCache.ps1
@@ -63,8 +63,19 @@ try {
                     $exitedDaysAgo = [DateTime]::Now.Subtract($finishedAt).Days
                     if ($exitedDaysAgo -ge $keepDays) {
                         if (($inspect.Config.Labels.psobject.Properties.Match('maintainer').Count -ne 0 -and $inspect.Config.Labels.maintainer -eq "Dynamics SMB")) {
-                            Write-Host "Removing container $containerName"
-                            docker rm $containerID -f
+                            if ($caches.Contains('algocontainersonly')) {
+                                if ($inspect.Config.Labels.psobject.Properties.Match('creator').Count -ne 0 -and $inspect.Config.Labels.creator -eq "AL-Go") {
+                                    Write-Host "Removing AL-Go container $containerName"
+                                    docker rm $containerID -f
+                                } 
+                                else {
+                                    Write-Host "Container $containerName (exited $exitedDaysAgo day$(if($exitedDaysAgo -ne 1){'s'}) ago) is recognized as a Business Central Container, but was not created by AL-Go - not removing"
+                                }
+                            } 
+                            else {
+                                Write-Host "Removing container $containerName"
+                                docker rm $containerID -f
+                            }   
                         }
                         else {
                             Write-Host "Container $containerName (exited $exitedDaysAgo day$(if($exitedDaysAgo -ne 1){'s'}) ago) is not recognized as a Business Central Container - not removing"
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,9 +1,13 @@
+6.1.8
+
+
 6.1.7
 Issue 3952 Get-AlLanguageExtensionFromArtifacts fails on new BC artifacts
 Add support for TestType field when running tests
 Issue 3943 Error downloading symbols for Microsoft_System
 Add support for RequiredTestIsolation field when running tests
 Fix package ID length adjustment logic in Get-BcNuGetPackageId function
+Catch errors when page scripting tests are failing
 
 6.1.6
 Added a new outcome to failOn = newWarning. For BcContainerHelper it will work as error - in AL-Go for GitHub it will have a meaning.
diff --git a/Tests/GetAndRunTests (version 9).Tests.ps1 b/Tests/GetAndRunTests (version 9).Tests.ps1
@@ -16,7 +16,7 @@ AfterAll {
     . (Join-Path $PSScriptRoot '_RemoveNavContainer.ps1')
 }
 
-Describe 'AppHandling' {
+Describe 'AppHandling' -Skip {
 
     It 'Get/RunTests' {
         $artifactUrl = Get-BCArtifactUrl -type OnPrem -version "$runTestsInVersion" -country "w1" -select Latest
@@ -53,4 +53,5 @@ Describe 'AppHandling' {
         }
         $resultsFile | Should -Exist
     }
-}
+
+}
diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-6.1.7-dev
+6.1.8-dev

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ AfterAll {`
`16`	`16`	`. (Join-Path $PSScriptRoot '_RemoveNavContainer.ps1')`
`17`	`17`	`}`
`18`	`18`
`19`		`-Describe 'AppHandling' {`
	`19`	`+Describe 'AppHandling' -Skip {`
`20`	`20`
`21`	`21`	`It 'Get/RunTests' {`
`22`	`22`	`$artifactUrl = Get-BCArtifactUrl -type OnPrem -version "$runTestsInVersion" -country "w1" -select Latest`
`@@ -53,4 +53,5 @@ Describe 'AppHandling' {`
`53`	`53`	`}`
`54`	`54`	`$resultsFile \| Should -Exist`
`55`	`55`	`}`
`56`		`-}`
	`56`	`+`
	`57`	`+}`