refactor for functions subfolders and psm file construction

PowerShell · bmanikm · Apr 3, 2018 · Mar 10, 2018 · Mar 10, 2018 · Mar 21, 2018
commit e9c72ef4918abfb8c166170b7f9a275b228c6b97
diff --git a/PowerShellGet/PSModule.psm1 b/PowerShellGet/PSModule.psm1
@@ -833,22 +833,28 @@ $(if($script:IsSafeX509ChainHandleAvailable)
 
 #endregion
 
+#region private functions imported via build script
 
-#region Load of module functions after split from main .psm1 file issue Fix#37
+#buildScriptPrivateFunctionsGoHere
 
-$PublicFunctions = @( Get-ChildItem -Path $PSScriptRoot\public\*.ps1 -ErrorAction SilentlyContinue )
-$PrivateFunctions = @( Get-ChildItem -Path $PSScriptRoot\private\*.ps1 -ErrorAction SilentlyContinue )
+#endregion
 
-# Load the separate function files from the private and public folders.
-$AllFunctions = $PublicFunctions + $PrivateFunctions
-foreach($function in $AllFunctions) {
-    try {
-        . $function.Fullname
-    }
-    catch {
-        Write-Error -Message "Failed to import function $($function.fullname): $_"
-    }
-}
+#region public functions imported via build script
+
+#buildScriptPublicFunctionsGoHere
+
+#endregion
+
+#region module exports
+Set-Alias -Name fimo -Value Find-Module
+Set-Alias -Name inmo -Value Install-Module
+Set-Alias -Name upmo -Value Update-Module
+Set-Alias -Name pumo -Value Publish-Module
+Set-Alias -Name uimo -Value Uninstall-Module
+
+Export-ModuleMember -Alias fimo, inmo, upmo, pumo, uimo
+
+#buildScriptExportFunctionsGoHere
 
 #endregion
 
@@ -879,28 +885,3 @@ if(-not (Microsoft.PowerShell.Management\Test-Path -Path $script:MyDocumentsInst
                                                      -Confirm:$false `
                                                      -WhatIf:$false
 }
-
-#region private functions imported via build script
-
-#buildScriptPrivateFunctionsGoHere
-
-#endregion
-
-#region public functions imported via build script
-
-#buildScriptPublicFunctionsGoHere
-
-#endregion
-
-#region module exports
-Set-Alias -Name fimo -Value Find-Module
-Set-Alias -Name inmo -Value Install-Module
-Set-Alias -Name upmo -Value Update-Module
-Set-Alias -Name pumo -Value Publish-Module
-Set-Alias -Name uimo -Value Uninstall-Module
-
-Export-ModuleMember -Alias fimo, inmo, upmo, pumo, uimo
-
-#buildScriptExportFunctionsGoHere
-
-#endregion
diff --git a/PowerShellGet/PowerShellGet.psd1 b/PowerShellGet/PowerShellGet.psd1
@@ -1,38 +1,14 @@
 @{
 RootModule = 'PSModule.psm1'
-ModuleVersion = '1.6.1'
+ModuleVersion = '1.6.3'
 GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
 Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'
 Copyright = '(c) Microsoft Corporation. All rights reserved.'
 Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
 PowerShellVersion = '3.0'
 FormatsToProcess = 'PSGet.Format.ps1xml'
-FunctionsToExport = @('Install-Module',
-                      'Find-Module',
-                      'Save-Module',
-                      'Update-Module',
-                      'Publish-Module',
-                      'Get-InstalledModule',
-                      'Uninstall-Module',
-                      'Find-Command',
-                      'Find-DscResource',
-                      'Find-RoleCapability',
-                      'Install-Script',
-                      'Find-Script',
-                      'Save-Script',
-                      'Update-Script',
-                      'Publish-Script',
-                      'Get-InstalledScript',
-                      'Uninstall-Script',
-                      'Test-ScriptFileInfo',
-                      'New-ScriptFileInfo',
-                      'Update-ScriptFileInfo',
-                      'Get-PSRepository',
-                      'Set-PSRepository',
-                      'Register-PSRepository',
-                      'Unregister-PSRepository',
-                      'Update-ModuleManifest')
+FunctionsToExport = @()
 VariablesToExport = "*"
 AliasesToExport = @('inmo','fimo','upmo','pumo')
 FileList = @('PSModule.psm1',

diff --git a/PowerShellGet/public/Add-PackageSource.ps1 → ...c/providerfunctions/Add-PackageSource.ps1 b/PowerShellGet/public/Add-PackageSource.ps1 → ...c/providerfunctions/Add-PackageSource.ps1
diff --git a/PowerShellGet/public/Download-Package.ps1 → ...ic/providerfunctions/Download-Package.ps1 b/PowerShellGet/public/Download-Package.ps1 → ...ic/providerfunctions/Download-Package.ps1
diff --git a/PowerShellGet/public/Find-Package.ps1 → ...public/providerfunctions/Find-Package.ps1 b/PowerShellGet/public/Find-Package.ps1 → ...public/providerfunctions/Find-Package.ps1
diff --git a/PowerShellGet/public/Get-DynamicOptions.ps1 → .../providerfunctions/Get-DynamicOptions.ps1 b/PowerShellGet/public/Get-DynamicOptions.ps1 → .../providerfunctions/Get-DynamicOptions.ps1
diff --git a/PowerShellGet/public/Get-Feature.ps1 → .../public/providerfunctions/Get-Feature.ps1 b/PowerShellGet/public/Get-Feature.ps1 → .../public/providerfunctions/Get-Feature.ps1
diff --git a/...rShellGet/public/Get-InstalledPackage.ps1 → ...roviderfunctions/Get-InstalledPackage.ps1 b/...rShellGet/public/Get-InstalledPackage.ps1 → ...roviderfunctions/Get-InstalledPackage.ps1
diff --git a/...ellGet/public/Get-PackageProviderName.ps1 → ...iderfunctions/Get-PackageProviderName.ps1 b/...ellGet/public/Get-PackageProviderName.ps1 → ...iderfunctions/Get-PackageProviderName.ps1
diff --git a/PowerShellGet/public/Initialize-Provider.ps1 → ...providerfunctions/Initialize-Provider.ps1 b/PowerShellGet/public/Initialize-Provider.ps1 → ...providerfunctions/Initialize-Provider.ps1
diff --git a/PowerShellGet/public/Install-Package.ps1 → ...lic/providerfunctions/Install-Package.ps1 b/PowerShellGet/public/Install-Package.ps1 → ...lic/providerfunctions/Install-Package.ps1
diff --git a/...rShellGet/public/Remove-PackageSource.ps1 → ...roviderfunctions/Remove-PackageSource.ps1 b/...rShellGet/public/Remove-PackageSource.ps1 → ...roviderfunctions/Remove-PackageSource.ps1
diff --git a/...ShellGet/public/Resolve-PackageSource.ps1 → ...oviderfunctions/Resolve-PackageSource.ps1 b/...ShellGet/public/Resolve-PackageSource.ps1 → ...oviderfunctions/Resolve-PackageSource.ps1
diff --git a/PowerShellGet/public/Uninstall-Package.ps1 → ...c/providerfunctions/Uninstall-Package.ps1 b/PowerShellGet/public/Uninstall-Package.ps1 → ...c/providerfunctions/Uninstall-Package.ps1
diff --git a/PowerShellGet/public/Find-Command.ps1 → ...et/public/psgetfunctions/Find-Command.ps1 b/PowerShellGet/public/Find-Command.ps1 → ...et/public/psgetfunctions/Find-Command.ps1
@@ -1,7 +1,7 @@
 function Find-Command
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri = 'https://go.microsoft.com/fwlink/?LinkId=733636')]
     [outputtype('PSCustomObject[]')]

diff --git a/PowerShellGet/public/Find-DSCResource.ps1 → ...ublic/psgetfunctions/Find-DSCResource.ps1 b/PowerShellGet/public/Find-DSCResource.ps1 → ...ublic/psgetfunctions/Find-DSCResource.ps1
@@ -1,7 +1,7 @@
 function Find-DscResource
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri = 'https://go.microsoft.com/fwlink/?LinkId=517196')]
     [outputtype('PSCustomObject[]')]

diff --git a/PowerShellGet/public/Find-Module.ps1 → ...Get/public/psgetfunctions/Find-Module.ps1 b/PowerShellGet/public/Find-Module.ps1 → ...Get/public/psgetfunctions/Find-Module.ps1
@@ -1,7 +1,7 @@
 function Find-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkID=398574')]
     [outputtype("PSCustomObject[]")]

diff --git a/PowerShellGet/public/Find-RoleCapability.ps1 → ...ic/psgetfunctions/Find-RoleCapability.ps1 b/PowerShellGet/public/Find-RoleCapability.ps1 → ...ic/psgetfunctions/Find-RoleCapability.ps1
@@ -1,7 +1,7 @@
 function Find-RoleCapability
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri = 'https://go.microsoft.com/fwlink/?LinkId=718029')]
     [outputtype('PSCustomObject[]')]

diff --git a/PowerShellGet/public/Find-Script.ps1 → ...Get/public/psgetfunctions/Find-Script.ps1 b/PowerShellGet/public/Find-Script.ps1 → ...Get/public/psgetfunctions/Find-Script.ps1
@@ -1,7 +1,7 @@
 function Find-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkId=619785')]
     [outputtype("PSCustomObject[]")]

diff --git a/PowerShellGet/public/Get-InstalledModule.ps1 → ...ic/psgetfunctions/Get-InstalledModule.ps1 b/PowerShellGet/public/Get-InstalledModule.ps1 → ...ic/psgetfunctions/Get-InstalledModule.ps1
@@ -1,7 +1,7 @@
 function Get-InstalledModule
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkId=526863')]
     Param

diff --git a/PowerShellGet/public/Get-InstalledScript.ps1 → ...ic/psgetfunctions/Get-InstalledScript.ps1 b/PowerShellGet/public/Get-InstalledScript.ps1 → ...ic/psgetfunctions/Get-InstalledScript.ps1
@@ -1,7 +1,7 @@
 function Get-InstalledScript
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkId=619790')]
     Param

diff --git a/PowerShellGet/public/Get-PSRepository.ps1 → ...ublic/psgetfunctions/Get-PSRepository.ps1 b/PowerShellGet/public/Get-PSRepository.ps1 → ...ublic/psgetfunctions/Get-PSRepository.ps1
@@ -1,7 +1,7 @@
 function Get-PSRepository
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkID=517127')]
     Param

diff --git a/PowerShellGet/public/Install-Module.ps1 → .../public/psgetfunctions/Install-Module.ps1 b/PowerShellGet/public/Install-Module.ps1 → .../public/psgetfunctions/Install-Module.ps1
@@ -1,7 +1,7 @@
 function Install-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameParameterSet',
                    HelpUri='https://go.microsoft.com/fwlink/?LinkID=398573',

diff --git a/PowerShellGet/public/Install-Script.ps1 → .../public/psgetfunctions/Install-Script.ps1 b/PowerShellGet/public/Install-Script.ps1 → .../public/psgetfunctions/Install-Script.ps1
@@ -1,7 +1,7 @@
 function Install-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameParameterSet',
                    HelpUri='https://go.microsoft.com/fwlink/?LinkId=619784',

diff --git a/PowerShellGet/public/New-ScriptFileInfo.ps1 → ...lic/psgetfunctions/New-ScriptFileInfo.ps1 b/PowerShellGet/public/New-ScriptFileInfo.ps1 → ...lic/psgetfunctions/New-ScriptFileInfo.ps1
@@ -1,7 +1,7 @@
 function New-ScriptFileInfo
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(PositionalBinding=$false,
                    SupportsShouldProcess=$true,

diff --git a/PowerShellGet/public/Publish-Module.ps1 → .../public/psgetfunctions/Publish-Module.ps1 b/PowerShellGet/public/Publish-Module.ps1 → .../public/psgetfunctions/Publish-Module.ps1
@@ -1,7 +1,7 @@
 function Publish-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(SupportsShouldProcess=$true,
                    PositionalBinding=$false,

diff --git a/PowerShellGet/public/Publish-Script.ps1 → .../public/psgetfunctions/Publish-Script.ps1 b/PowerShellGet/public/Publish-Script.ps1 → .../public/psgetfunctions/Publish-Script.ps1
@@ -1,7 +1,7 @@
 function Publish-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(SupportsShouldProcess=$true,
                    PositionalBinding=$false,

diff --git a/...ShellGet/public/Register-PSRepository.ps1 → .../psgetfunctions/Register-PSRepository.ps1 b/...ShellGet/public/Register-PSRepository.ps1 → .../psgetfunctions/Register-PSRepository.ps1
@@ -1,7 +1,7 @@
 function Register-PSRepository
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameParameterSet',
                    HelpUri='https://go.microsoft.com/fwlink/?LinkID=517129')]

diff --git a/PowerShellGet/public/Save-Module.ps1 → ...Get/public/psgetfunctions/Save-Module.ps1 b/PowerShellGet/public/Save-Module.ps1 → ...Get/public/psgetfunctions/Save-Module.ps1
@@ -1,7 +1,7 @@
 function Save-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameAndPathParameterSet',
                    HelpUri='https://go.microsoft.com/fwlink/?LinkId=531351',

diff --git a/PowerShellGet/public/Save-Script.ps1 → ...Get/public/psgetfunctions/Save-Script.ps1 b/PowerShellGet/public/Save-Script.ps1 → ...Get/public/psgetfunctions/Save-Script.ps1
@@ -1,7 +1,7 @@
 function Save-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameAndPathParameterSet',
                    HelpUri='https://go.microsoft.com/fwlink/?LinkId=619786',

diff --git a/PowerShellGet/public/Set-PSRepository.ps1 → ...ublic/psgetfunctions/Set-PSRepository.ps1 b/PowerShellGet/public/Set-PSRepository.ps1 → ...ublic/psgetfunctions/Set-PSRepository.ps1
@@ -1,7 +1,7 @@
 function Set-PSRepository
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(PositionalBinding=$false,
                    HelpUri='https://go.microsoft.com/fwlink/?LinkID=517128')]

diff --git a/PowerShellGet/public/Test-ScriptFileInfo.ps1 → ...ic/psgetfunctions/Test-ScriptFileInfo.ps1 b/PowerShellGet/public/Test-ScriptFileInfo.ps1 → ...ic/psgetfunctions/Test-ScriptFileInfo.ps1
@@ -1,7 +1,7 @@
 function Test-ScriptFileInfo
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(PositionalBinding=$false,
                    DefaultParameterSetName='PathParameterSet',

diff --git a/PowerShellGet/public/Uninstall-Module.ps1 → ...ublic/psgetfunctions/Uninstall-Module.ps1 b/PowerShellGet/public/Uninstall-Module.ps1 → ...ublic/psgetfunctions/Uninstall-Module.ps1
@@ -1,7 +1,7 @@
 function Uninstall-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameParameterSet',
                    SupportsShouldProcess=$true,

diff --git a/PowerShellGet/public/Uninstall-Script.ps1 → ...ublic/psgetfunctions/Uninstall-Script.ps1 b/PowerShellGet/public/Uninstall-Script.ps1 → ...ublic/psgetfunctions/Uninstall-Script.ps1
@@ -1,7 +1,7 @@
 function Uninstall-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(DefaultParameterSetName='NameParameterSet',
                    SupportsShouldProcess=$true,

diff --git a/...ellGet/public/Unregister-PSRepository.ps1 → ...sgetfunctions/Unregister-PSRepository.ps1 b/...ellGet/public/Unregister-PSRepository.ps1 → ...sgetfunctions/Unregister-PSRepository.ps1
@@ -1,7 +1,7 @@
 function Unregister-PSRepository
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(HelpUri='https://go.microsoft.com/fwlink/?LinkID=517130')]
     Param

diff --git a/PowerShellGet/public/Update-Module.ps1 → ...t/public/psgetfunctions/Update-Module.ps1 b/PowerShellGet/public/Update-Module.ps1 → ...t/public/psgetfunctions/Update-Module.ps1
@@ -1,7 +1,7 @@
 function Update-Module
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(SupportsShouldProcess=$true,
                    HelpUri='https://go.microsoft.com/fwlink/?LinkID=398576')]

diff --git a/...ShellGet/public/Update-ModuleManifest.ps1 → .../psgetfunctions/Update-ModuleManifest.ps1 b/...ShellGet/public/Update-ModuleManifest.ps1 → .../psgetfunctions/Update-ModuleManifest.ps1
@@ -1,7 +1,7 @@
 function Update-ModuleManifest
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(SupportsShouldProcess=$true,
                    PositionalBinding=$false,

diff --git a/PowerShellGet/public/Update-Script.ps1 → ...t/public/psgetfunctions/Update-Script.ps1 b/PowerShellGet/public/Update-Script.ps1 → ...t/public/psgetfunctions/Update-Script.ps1
@@ -1,7 +1,7 @@
 function Update-Script
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(SupportsShouldProcess=$true,
                    HelpUri='https://go.microsoft.com/fwlink/?LinkId=619787')]

diff --git a/...ShellGet/public/Update-ScriptFileInfo.ps1 → .../psgetfunctions/Update-ScriptFileInfo.ps1 b/...ShellGet/public/Update-ScriptFileInfo.ps1 → .../psgetfunctions/Update-ScriptFileInfo.ps1
@@ -1,7 +1,7 @@
 function Update-ScriptFileInfo
 {
     <#
-    .ExternalHelp ..\PSModule-help.xml
+    .ExternalHelp PSModule-help.xml
     #>
     [CmdletBinding(PositionalBinding=$false,
                    DefaultParameterSetName='PathParameterSet',