Merge pull request #4 from santisq/3-$using-statements-require-lower-…

…case `$using` statements require lower case
santisq · Jan 2, 2023 · 4a6b473 · 4a6b473
2 parents 942d6bc + 08cb911
commit 4a6b473
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/ondemand publish.yml b/.github/workflows/ondemand publish.yml
@@ -16,6 +16,6 @@ jobs:
 
     - name: Publish to Gallery
       shell: pwsh
-      run: .\publish.ps1
+      run: .\publish.ps1 PSParallelPipeline
       env:
         PSGALLERY_TOKEN: ${{ secrets.PSGALLERY_TOKEN }}
diff --git a/.github/workflows/release publish.yml b/.github/workflows/release publish.yml
@@ -20,6 +20,6 @@ jobs:
 
     - name: Publish to Gallery
       shell: pwsh
-      run: .\publish.ps1
+      run: .\publish.ps1 PSParallelPipeline
       env:
         PSGALLERY_TOKEN: ${{ secrets.PSGALLERY_TOKEN }}
diff --git a/PSParallelPipeline.psd1 → PSParallelPipeline/PSParallelPipeline.psd1 b/PSParallelPipeline.psd1 → PSParallelPipeline/PSParallelPipeline.psd1
@@ -12,7 +12,7 @@
 RootModule = 'PSParallelPipeline.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.0.1'
+ModuleVersion = '1.0.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/PSParallelPipeline.psm1 → PSParallelPipeline/PSParallelPipeline.psm1 b/PSParallelPipeline.psm1 → PSParallelPipeline/PSParallelPipeline.psm1
@@ -148,15 +148,15 @@ function Invoke-Parallel {
 
             $usingParams = @{}
 
+            # Credits to mklement0 for catching up a bug here. Thank you!
+            # https://github.com/mklement0
             foreach($usingstatement in $ScriptBlock.Ast.FindAll({ $args[0] -is [UsingExpressionAst] }, $true)) {
                 $varText = $usingstatement.Extent.Text
                 $varPath = $usingstatement.SubExpression.VariablePath.UserPath
 
-                # Credits to mklement0 for catching up a bug here. Thank you!
-                # https://github.com/mklement0
-                $key = [Convert]::ToBase64String([Encoding]::Unicode.GetBytes($varText))
+                $key = [Convert]::ToBase64String([Encoding]::Unicode.GetBytes($varText.ToLower()))
                 if(-not $usingParams.ContainsKey($key)) {
-                    $usingParams.Add($key, $ExecutionContext.SessionState.PSVariable.Get($varPath).Value)
+                    $usingParams.Add($key, $ExecutionContext.SessionState.PSVariable.GetValue($varPath))
                 }
             }
 
@@ -177,7 +177,8 @@ function Invoke-Parallel {
                 $args[0].InvokeWithContext($null, [psvariable]::new('_', $args[1]))
             }).AddArgument($ScriptBlock.Ast.GetScriptBlock()).AddArgument($InputObject)
 
-            # This is how `Start-Job` does it's magic. Credits to Jordan Borean for his help here.
+            # This is how `Start-Job` does it's magic.
+            # Credits to Jordan Borean for his help here.
             # https://github.com/jborean93
 
             # Reference in the source code:

diff --git a/publish.ps1 b/publish.ps1
@@ -1 +1,4 @@
-Publish-Module -Path $PSScriptRoot -NuGetApiKey $env:PSGALLERY_TOKEN
+param([string] $ModuleName)
+
+$path = Join-Path $PSScriptRoot -ChildPath $ModuleName
+Publish-Module -Path $path -NuGetApiKey $env:PSGALLERY_TOKEN