Added "Configuration" as dependency in the manifest

Added the dependency without hardcoding a version. This allows for using the latest version of the module. This might have to be revisted if Configurations instroduces a breaking change.
RamblingCookieMonster · May 1, 2018 · a602f6c · a602f6c
1 parent 2da8fce
commit a602f6c
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 78 deletions.
diff --git a/BuildHelpers/BuildHelpers.psd1 b/BuildHelpers/BuildHelpers.psd1
@@ -1,111 +1,113 @@
 @{
 
-# Script module or binary module file associated with this manifest.
-RootModule = 'BuildHelpers.psm1'
+    # Script module or binary module file associated with this manifest.
+    RootModule        = 'BuildHelpers.psm1'
 
-# Version number of this module.
-ModuleVersion = '1.1.0'
+    # Version number of this module.
+    ModuleVersion     = '1.1.0'
 
-# ID used to uniquely identify this module
-GUID = 'ec079170-28b7-40b4-aaae-f8ebf76850ab'
+    # ID used to uniquely identify this module
+    GUID              = 'ec079170-28b7-40b4-aaae-f8ebf76850ab'
 
-# Author of this module
-Author = 'Warren Frame'
+    # Author of this module
+    Author            = 'Warren Frame'
 
-# Company or vendor of this module
-#CompanyName = 'Unknown'
+    # Company or vendor of this module
+    #CompanyName = 'Unknown'
 
-# Copyright statement for this module
-Copyright = '(c) 2016 Warren F. All rights reserved.'
+    # Copyright statement for this module
+    Copyright         = '(c) 2016 Warren F. All rights reserved.'
 
-# Description of the functionality provided by this module
-Description = 'Helper functions for PowerShell CI/CD scenarios.'
+    # Description of the functionality provided by this module
+    Description       = 'Helper functions for PowerShell CI/CD scenarios.'
 
-# Minimum version of the Windows PowerShell engine required by this module
-PowerShellVersion = '3.0'
+    # Minimum version of the Windows PowerShell engine required by this module
+    PowerShellVersion = '3.0'
 
-# Name of the Windows PowerShell host required by this module
-# PowerShellHostName = ''
+    # Name of the Windows PowerShell host required by this module
+    # PowerShellHostName = ''
 
-# Minimum version of the Windows PowerShell host required by this module
-# PowerShellHostVersion = ''
+    # Minimum version of the Windows PowerShell host required by this module
+    # PowerShellHostVersion = ''
 
-# Minimum version of Microsoft .NET Framework required by this module
-# DotNetFrameworkVersion = ''
+    # Minimum version of Microsoft .NET Framework required by this module
+    # DotNetFrameworkVersion = ''
 
-# Minimum version of the common language runtime (CLR) required by this module
-# CLRVersion = ''
+    # Minimum version of the common language runtime (CLR) required by this module
+    # CLRVersion = ''
 
-# Processor architecture (None, X86, Amd64) required by this module
-# ProcessorArchitecture = ''
+    # Processor architecture (None, X86, Amd64) required by this module
+    # ProcessorArchitecture = ''
 
-# Modules that must be imported into the global environment prior to importing this module
-# RequiredModules = @()
+    # Modules that must be imported into the global environment prior to importing this module
+    RequiredModules   = @(
+        "Configuration"
+    )
 
-# Assemblies that must be loaded prior to importing this module
-# RequiredAssemblies = @()
+    # Assemblies that must be loaded prior to importing this module
+    # RequiredAssemblies = @()
 
-# Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+    # Script files (.ps1) that are run in the caller's environment prior to importing this module.
+    # ScriptsToProcess = @()
 
-# Type files (.ps1xml) to be loaded when importing this module
-# TypesToProcess = @()
+    # Type files (.ps1xml) to be loaded when importing this module
+    # TypesToProcess = @()
 
-# Format files (.ps1xml) to be loaded when importing this module
-#FormatsToProcess = '.Format.ps1xml'
+    # Format files (.ps1xml) to be loaded when importing this module
+    #FormatsToProcess = '.Format.ps1xml'
 
-# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-# NestedModules = @()
+    # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+    # NestedModules = @()
 
-# Functions to export from this module
-FunctionsToExport = '*'
+    # Functions to export from this module
+    FunctionsToExport = '*'
 
-# Cmdlets to export from this module
-CmdletsToExport = '*'
+    # Cmdlets to export from this module
+    CmdletsToExport   = '*'
 
-# Variables to export from this module
-VariablesToExport = '*'
+    # Variables to export from this module
+    VariablesToExport = '*'
 
-# Aliases to export from this module
-AliasesToExport = 'Set-BuildVariable'
+    # Aliases to export from this module
+    AliasesToExport   = 'Set-BuildVariable'
 
-# DSC resources to export from this module
-# DscResourcesToExport = @()
+    # DSC resources to export from this module
+    # DscResourcesToExport = @()
 
-# List of all modules packaged with this module
-# ModuleList = @()
+    # List of all modules packaged with this module
+    # ModuleList = @()
 
-# List of all files packaged with this module
-# FileList = @()
+    # List of all files packaged with this module
+    # FileList = @()
 
-# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
-PrivateData = @{
+    # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+    PrivateData       = @{
 
-    PSData = @{
+        PSData = @{
 
-        # Tags applied to this module. These help with module discovery in online galleries.
-         Tags = @('Continuous', 'Delivery', 'Deployment', 'Integration', 'DevOps', 'Jenkins', 'GitLab', 'CI', 'VSTS', 'AppVeyor')
+            # Tags applied to this module. These help with module discovery in online galleries.
+            Tags       = @('Continuous', 'Delivery', 'Deployment', 'Integration', 'DevOps', 'Jenkins', 'GitLab', 'CI', 'VSTS', 'AppVeyor')
 
-        # A URL to the license for this module.
-         LicenseUri = 'https://github.com/RamblingCookieMonster/BuildHelpers/blob/master/LICENSE'
+            # A URL to the license for this module.
+            LicenseUri = 'https://github.com/RamblingCookieMonster/BuildHelpers/blob/master/LICENSE'
 
-        # A URL to the main website for this project.
-         ProjectUri = 'https://github.com/RamblingCookieMonster/BuildHelpers/'
+            # A URL to the main website for this project.
+            ProjectUri = 'https://github.com/RamblingCookieMonster/BuildHelpers/'
 
-        # A URL to an icon representing this module.
-        # IconUri = ''
+            # A URL to an icon representing this module.
+            # IconUri = ''
 
-        # ReleaseNotes of this module
-        # ReleaseNotes = ''
+            # ReleaseNotes of this module
+            # ReleaseNotes = ''
 
-    } # End of PSData hashtable
+        } # End of PSData hashtable
 
-} # End of PrivateData hashtable
+    } # End of PrivateData hashtable
 
-# HelpInfo URI of this module
-# HelpInfoURI = ''
+    # HelpInfo URI of this module
+    # HelpInfoURI = ''
 
-# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
-# DefaultCommandPrefix = ''
+    # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+    # DefaultCommandPrefix = ''
 
 }
diff --git a/BuildHelpers/BuildHelpers.psm1 b/BuildHelpers/BuildHelpers.psm1
@@ -1,7 +1,6 @@
 #Get public and private function definition files.
     $Public  = @( Get-ChildItem -Path $PSScriptRoot\Public\*.ps1 -ErrorAction SilentlyContinue )
     $Private = @( Get-ChildItem -Path $PSScriptRoot\Private\*.ps1 -ErrorAction SilentlyContinue )
-    $ModuleRoot = $PSScriptRoot
 
 #Dot source the files
     Foreach($import in @($Public + $Private))
@@ -16,13 +15,7 @@
         }
     }
 
-# Load dependencies. TODO: Move to module dependency once the bug that
-# causes this is fixed: https://ci.appveyor.com/project/RamblingCookieMonster/buildhelpers/build/1.0.22
-# Thanks to Joel Bennett for this!
-    Import-Module $PSScriptRoot\Private\Modules\Configuration
-
 Export-ModuleMember -Function $Public.Basename
-Export-ModuleMember -Function Get-Metadata, Update-Metadata, Export-Metadata
 
 # Set aliases (#10)
 Set-Alias -Name Set-BuildVariable -Value $PSScriptRoot\Scripts\Set-BuildVariable.ps1