diff --git a/Modules/Capa.PowerShell.Module.PowerPack.Reg/Prod/Capa.PowerShell.Module.PowerPack.Reg.psd1 b/Modules/Capa.PowerShell.Module.PowerPack.Reg/Prod/Capa.PowerShell.Module.PowerPack.Reg.psd1 index ab5337a0..3151e624 100644 --- a/Modules/Capa.PowerShell.Module.PowerPack.Reg/Prod/Capa.PowerShell.Module.PowerPack.Reg.psd1 +++ b/Modules/Capa.PowerShell.Module.PowerPack.Reg/Prod/Capa.PowerShell.Module.PowerPack.Reg.psd1 @@ -12,7 +12,7 @@ RootModule = '.\Capa.PowerShell.Module.PowerPack.Reg.psm1' # Version number of this module. -ModuleVersion = '1.15.0' + ModuleVersion = '1.14.0' # Supported PSEditions # CompatiblePSEditions = @() @@ -70,10 +70,10 @@ ProcessorArchitecture = 'None' # NestedModules = @() # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. -FunctionsToExport = 'Reg_DeleteVariable', 'Reg_CreateKey', 'Reg_DeleteTree', 'Reg_EnumKey', - 'Reg_ExistKey', 'Reg_ExistVariable', 'Reg_GetString', 'Reg_SetDword', - 'Reg_SetExpandString', 'Reg_SetInteger', 'Reg_SetString', - 'Set-PpRegistryValue', 'Reg_GetExpandString', 'Reg_GetInteger', +FunctionsToExport = 'Reg_DeleteVariable', 'Reg_CreateKey', 'Reg_DeleteTree', 'Reg_EnumKey', + 'Reg_ExistKey', 'Reg_ExistVariable', 'Reg_GetString', 'Reg_SetDword', + 'Reg_SetExpandString', 'Reg_SetInteger', 'Reg_SetString', + 'Set-PpRegistryValue', 'Reg_GetExpandString', 'Reg_GetInteger', 'Reg_GetMultiString', 'Reg_SetQword' # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. diff --git a/Publish.ps1 b/Publish.ps1 index 3aa21d07..25fb42a7 100644 --- a/Publish.ps1 +++ b/Publish.ps1 @@ -1,29 +1,32 @@ +Import-Module Microsoft.PowerShell.PSResourceGet + $ModulesPath = Join-Path $PSScriptRoot 'Modules' $Modules = Get-ChildItem -Path $ModulesPath -Directory | Sort-Object { $_.Name.Length } -Descending $VersionPath = Join-Path $PSScriptRoot 'version.txt' $Version = (Get-Content -Path $VersionPath).Trim() if ($Version -like '*-*') { - $FullVersion = $Version - $Version = $FullVersion.Split('-')[0] - $PrereleaseVersion = ($FullVersion -split '-', 2)[1] - $PrereleaseVersion = $PrereleaseVersion.Replace('.', '') - $Version = "$Version-$PrereleaseVersion" + $FullVersion = $Version + $Version = $FullVersion.Split('-')[0] + $PrereleaseVersion = ($FullVersion -split '-', 2)[1] + $PrereleaseVersion = $PrereleaseVersion.Replace('.', '') + $Version = "$Version-$PrereleaseVersion" } Write-Host "Publishing version $Version" foreach ($Module in $Modules) { - Write-Host "Publishing module $($Module.Name)" - $ModulePath = Join-Path $ModulesPath $Module.Name 'Prod' - $PsdPath = Join-Path $ModulePath "$($Module.Name).psd1" - - if (Find-Module -Name $Module.Name -RequiredVersion $Version -ErrorAction SilentlyContinue -AllowPrerelease) { - Write-Host "Module $($Module.Name) version $Version already published. Skipping" -ForegroundColor Green - continue - } - - try { - Publish-PSResource -Path $ModulePath -ApiKey $env:APIKEY -SkipDependenciesCheck -SkipModuleManifestValidate + Write-Host "Publishing module $($Module.Name)" + $ModulePath = Join-Path $ModulesPath $Module.Name 'Prod' + $PsdPath = Join-Path $ModulePath "$($Module.Name).psd1" + + $Exist = Find-PSResource -Name $Module.Name -Type Module -Version $Version -Repository 'PSGallery' -Prerelease -ErrorAction SilentlyContinue + if ($Exist) { + Write-Host "Module $($Module.Name) version $Version already published. Skipping" -ForegroundColor Green + continue + } + + try { + Publish-PSResource -Path $ModulePath -ApiKey $env:APIKEY -SkipDependenciesCheck -SkipModuleManifestValidate -Repository 'PSGallery' } catch { Write-Host "Failed to publish module $($Module.Name)" -ForegroundColor Red Write-Host $_.Exception.Message