Fix more WIndows PS problems

Author: Jaykul

Source/Private/CompressToBase64.ps1

@@ -36,12 +36,21 @@ function CompressToBase64 {
     process {
         foreach ($File in $Path | Convert-Path) {
             $Source = [System.IO.MemoryStream][System.IO.File]::ReadAllBytes($File)
-            $OutputStream = [System.IO.Compression.DeflateStream]::new(
-                [System.IO.MemoryStream]::new(),
-                [System.IO.Compression.CompressionMode]::Compress)
-            $Source.CopyTo($OutputStream)
-            $OutputStream.Flush()
-            $ByteArray = $OutputStream.BaseStream.ToArray()
+            # Write-Debug "Read $($Source.Length) bytes from $File"
+
+            $MemoryStream = [System.IO.MemoryStream]::new()
+            $DeflateStream = [System.IO.Compression.DeflateStream]::new(
+                $MemoryStream,
+                [System.IO.Compression.CompressionMode]::Compress,
+                $true)
+            $Source.CopyTo($DeflateStream)
+            # Framework 4.x (Windows PS) doesn't flush until we close the DeflateStream
+            $DeflateStream.Dispose()
+            $ByteArray = $MemoryStream.ToArray()
+            $MemoryStream.Dispose()
+            $Source.Dispose()
+            # Write-Debug "Compressed to $($ByteArray.Length) bytes"
+
             if (!$ExpandScript) {
                 [Convert]::ToBase64String($ByteArray)
             } else {

Tests/Public/Move-UsingStatement.Tests.ps1

@@ -71,7 +71,7 @@ Describe "Move-UsingStatement" {
         It '<TestCaseName>' -TestCases $TestCases {
             param($TestCaseName, $PSM1File, $ErrorBefore, $ErrorAfter, $ExpectedResult)
 
-            $testModuleFile = "$TestDrive\MyModule.psm1"
+            $testModuleFile = Join-Path $TestDrive "MyModule.psm1"
             Set-Content $testModuleFile -Value $PSM1File -Encoding UTF8 -NoNewline
 
             # Verify parse errors exist before applying the generator
@@ -97,7 +97,7 @@ Describe "Move-UsingStatement" {
             $ErrorFound.Count | Should -Be $ErrorAfter
 
             if ($ExpectedResult) {
-                $result.Trim() | Should -Be $ExpectedResult -Because "there should be no duplicate using statements in:`n$result"
+                $result.Trim() -split "[\r\n]+" -match "^\s*using" | Should -Be ($ExpectedResult.Trim() -split "[\r\n]+" -match "^\s*using")
             }
         }
     }

Tests/Public/Update-AliasesToExport.Tests.ps1

@@ -1,7 +1,7 @@
 #requires -Module ModuleBuilder
 Describe "Update-AliasesToExport" {
     BeforeAll {
-        $ManifestPath = "$TestDrive\TestModule.psd1"
+        $ManifestPath = Join-Path $TestDrive "TestModule.psd1"
     }
 
     Context "Parsing [Alias()] attributes on functions" {
@@ -234,25 +234,22 @@ Describe "Update-AliasesToExport" {
         It "Writes a warning and does not throw" {
             # Minimal manifest without AliasesToExport
             New-ModuleManifest -Path $ManifestPath
-            (Get-Content $ManifestPath).ForEach{
-                if ($_ -match 'AliasesToExport') {
-                    '# ' + $_
-                } else {
-                    $_
+            (Get-Content $ManifestPath) -replace "^(.*AliasesToExport.*)$", '# $1' | Set-Content $ManifestPath
+
+            Mock Write-Warning -ModuleName ModuleBuilder
+            Mock Update-Metadata -ModuleName ModuleBuilder
+
+            Invoke-ScriptGenerator -Code {
+                function Test-Alias {
+                    [Alias("TA")] param()
                 }
-            } | Set-Content $ManifestPath
+            } -Generator Update-AliasesToExport -Parameters @{ ModuleManifest = $ManifestPath }
 
-            try {
-                Invoke-ScriptGenerator -Code {
-                    function Test-Alias {
-                        [Alias("TA")] param()
-                    }
-                } -Generator Update-AliasesToExport -Parameters @{ ModuleManifest = $ManifestPath } -WarningAction Stop
-            } catch {
-                $FAILURE = $_
-            }
-            $FAILURE | Should -Match 'the preference variable "WarningPreference" or common parameter is set to Stop'
-            $FAILURE | Should -Match "Can't update AliasesToExport"
+            Assert-MockCalled Write-Warning -ModuleName ModuleBuilder -Exactly 1 -Scope It
+            # It does not even try to update the metadata
+            Assert-MockCalled Update-Metadata -ModuleName ModuleBuilder -Exactly 0 -Scope It
+            # It does not, in fact, update the AliasesToExport
+            Get-Metadata -Path $ManifestPath -PropertyName AliasesToExport -ErrorAction Ignore | Should -BeNullOrEmpty
         }
     }