Updated

Merge pull request #755 from jhoneill/master
Latest updates
2025-12-06 00:23:20 +00:00 · 2019-12-21 11:46:05 -05:00 · 2019-12-21 11:10:52 -05:00 · 2019-12-19 18:37:41 +00:00 · 2019-12-15 23:34:55 +00:00 · 2019-12-15 22:54:31 +00:00
273 changed files with 42589 additions and 6007 deletions
--- a/AddDataValidation.ps1
+++ b/AddDataValidation.ps1
@@ -1,99 +0,0 @@
-Function Add-ExcelDataValidationRule {
-    <#
-      .Synopsis
-        Adds data validation to a range of cells
-      .Example
-        >
-        >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'E2:E1001' -ValidationType Integer -Operator between -Value 0 -Value2 100 `
-             -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody 'Percentage must be a whole number between 0 and 100'
-
-        This defines a validation rule on cells E2-E1001; it is an integer rule and requires a number between 0 and 100
-        If a value is input with a fraction, negative number, or positive number > 100 a stop dialog box appears.
-      .Example
-        >
-        >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'B2:B1001' -ValidationType List  -Formula 'values!$a$2:$a$1000'
-               -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody 'You must select an item from the list'
-        This defines a list rule on Cells B2:1001, and the posible values are in a sheet named "values" at cells A2 to A1000
-        Blank cells in this range are ignored. If $ signs are left out of the fomrmula B2 would be checked against A2-A1000
-        B3, against A3-A1001, B4 against A4-A1002 up to B1001 beng checked against A1001-A1999
-       .Example
-       >
-       >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'I2:N1001' -ValidationType List    -ValueSet @('yes','YES','Yes')
-               -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody "Select Yes or leave blank for no"
-        Similar to the previous example but this time provides a value set; Excel comparisons are case sesnsitive, hence 3 versions of Yes.
-    #>
-
-    [CmdletBinding()]
-    Param(
-        #The range of cells to be validate, e.g. "B2:C100"
-        [Parameter(ValueFromPipeline = $true,Position=0)]
-        [Alias("Address")]
-        $Range ,
-        #The worksheet where the cells should be validated
-        [OfficeOpenXml.ExcelWorksheet]$WorkSheet ,
-        #An option corresponding to a choice from the 'Allow' pull down on the settings page in the Excel dialog. Any means "any allowed" i.e. no Validation
-        [ValidateSet('Any','Custom','DateTime','Decimal','Integer','List','TextLength','Time')]
-        $ValidationType,
-        #The operator to apply to Decimal, Integer, TextLength, DateTime and time fields, e.g. equal, between
-        [OfficeOpenXml.DataValidation.ExcelDataValidationOperator]$Operator = [OfficeOpenXml.DataValidation.ExcelDataValidationOperator]::equal ,
-        #For Decimal, Integer, TextLength, DateTime the [first] data value
-        $Value,
-        #When using the between operator, the second data  value
-        $Value2,
-        #The [first] data value as a formula. Use absolute formulas $A$1 if (e.g.) you want all cells to check against the same list
-        $Formula,
-        #When using the between operator, the second data value as a formula
-        $Formula2,
-        #When using the list validation type, a set of values (rather than refering to Sheet!B$2:B$100 )
-        $ValueSet,
-        #Corresponds to the the 'Show Error alert ...' check box on error alert page in the Excel dialog
-        [switch]$ShowErrorMessage,
-        #Stop, Warning, or Infomation, corresponding to to the style setting in the Excel dialog
-        [OfficeOpenXml.DataValidation.ExcelDataValidationWarningStyle]$ErrorStyle,
-        #The title for the message box  corresponding to to the title setting in the Excel dialog
-        [String]$ErrorTitle,
-        #The error message corresponding to to the Error message setting in the Excel dialog
-        [String]$ErrorBody,
-        #Corresponds to the the 'Show Input message ...' check box on input message  page in the Excel dialog
-        [switch]$ShowPromptMessage,
-        #The prompt message corresponding to to the Input message setting in the Excel dialog
-        [String]$PromptBody,
-        #The title for the message box  corresponding to to the title setting in the Excel dialog
-        [String]$PromptTitle,
-        #By default the 'Ignore blank' option will be selected, unless NoBlank is sepcified.
-        [String]$NoBlank
-    )
-    if  ($Range -is [Array])  {
-        $null = $PSBoundParameters.Remove("Range")
-        $Range | Add-ExcelDataValidationRule @PSBoundParameters
-    }
-    else {
-        #We should accept, a worksheet and a name of a range or a cell address; a table; the address of a table; a named range; a row, a column or .Cells[ ]
-        if      (-not $WorkSheet -and $Range.worksheet) {$WorkSheet = $Range.worksheet}
-        if      ($Range.Address)   {$Range = $Range.Address}
-
-        if      ($Range -isnot [string] -or -not $WorkSheet) {Write-Warning -Message "You need to provide a worksheet and range of cells." ;return}
-       #else we assume Range is a range.
-
-        $validation = $WorkSheet.DataValidations."Add$ValidationType`Validation"($Range)
-        if     ($validation.AllowsOperator) {$validation.Operator = $Operator}
-        if     ($PSBoundParameters.ContainsKey('value')) {
-                            $validation.Formula.Value          = $Value
-        }
-        elseif ($Formula)     {$validation.Formula.ExcelFormula   = $Formula}
-        elseif ($ValueSet)    {Foreach ($v in $ValueSet) {$validation.Formula.Values.Add($V)}}
-        if     ($PSBoundParameters.ContainsKey('Value2')) {
-            $validation.Formula2.Value         = $Value2
-        }
-        elseif ($Formula2)    {$validation.Formula2.ExcelFormula  = $Formula}
-        $validation.ShowErrorMessage = [bool]$ShowErrorMessage
-        $validation.ShowInputMessage = [bool]$ShowPromptMessage
-        $validation.AllowBlank      = -not $NoBlank
-
-        if ($PromptTitle) {$validation.PromptTitle = $PromptTitle}
-        if ($ErrorTitle)  {$validation.ErrorTitle  = $ErrorTitle}
-        if ($PromptBody)  {$validation.Prompt      = $PromptBody}
-        if ($ErrorBody)   {$validation.Error       = $ErrorBody}
-        if ($ErrorStyle)  {$validation.ErrorStyle  = $ErrorStyle}
-    }
- }
--- a/tests/CI.ps1
+++ b/tests/CI.ps1
@@ -11,7 +11,9 @@ param
    # AppVeyor Only - Upload results to AppVeyor "Tests" tab.
    [Switch]$Finalize,
    # AppVeyor and Azure - Upload module as AppVeyor Artifact.
-    [Switch]$Artifact
+    [Switch]$Artifact,
+    # Azure - Runs PsScriptAnalyzer against one or more folders and pivots the results to form a report.
+    [Switch]$Analyzer
 )
 $ErrorActionPreference = 'Stop'
 if ($Initialize) {
@@ -93,7 +95,7 @@ if (-not $VersionFilePath) {
    '[Info] Testing On:'
    Get-EnvironmentInfo
    '[Progress] Installing Module.'
-    . .\Install.ps1
+    . .\CI\Install.ps1
    '[Progress] Invoking Pester.'
    Invoke-Pester -OutputFile ('TestResultsPS{0}.xml' -f $PSVersionTable.PSVersion)
 }
@@ -139,4 +141,68 @@ if ($Artifact) {
        #Write-Host "##vso[task.setvariable variable=ModuleName]$ModuleName"
        Copy-Item -Path $ModulePath -Destination $env:Build_ArtifactStagingDirectory -Recurse
    }
+}
+if ($Analyzer) {
+    if (!(Get-Module -Name PSScriptAnalyzer -ListAvailable)) {
+        '[Progress] Installing PSScriptAnalyzer.'
+        Install-Module -Name PSScriptAnalyzer -Force
+    }
+
+    if ($env:System_PullRequest_TargetBranch) {
+        '[Progress] Get target branch.'
+        $TempGitClone = Join-Path ([IO.Path]::GetTempPath()) (New-Guid)
+        Copy-Item -Path $PWD -Destination $TempGitClone -Recurse
+        (Get-Item (Join-Path $TempGitClone '.git')).Attributes += 'Hidden'
+        "[Progress] git clean."
+        git -C $TempGitClone clean -f
+        "[Progress] git reset."
+        git -C $TempGitClone reset --hard
+        "[Progress] git checkout."
+        git -C $TempGitClone checkout -q $env:System_PullRequest_TargetBranch
+
+        $DirsToProcess = @{ 'Pull Request' = $PWD ; $env:System_PullRequest_TargetBranch = $TempGitClone }
+    }
+    else {
+        $DirsToProcess = @{ 'GitHub' = $PWD }
+    }
+
+    "[Progress] Running Script Analyzer."
+    $AnalyzerResults = $DirsToProcess.GetEnumerator() | ForEach-Object {
+        $DirName = $_.Key
+        Write-Verbose "[Progress] Running Script Analyzer on $DirName."
+        Invoke-ScriptAnalyzer -Path $_.Value -Recurse -ErrorAction SilentlyContinue |
+        Add-Member -MemberType NoteProperty -Name Location -Value $DirName -PassThru
+    }
+
+    if ($AnalyzerResults) {
+        if (!(Get-Module -Name ImportExcel -ListAvailable)) {
+            '[Progress] Installing ImportExcel.'
+            Install-Module -Name ImportExcel -Force
+        }
+        '[Progress] Creating ScriptAnalyzer.xlsx.'
+        $ExcelParams = @{
+            Path          = 'ScriptAnalyzer.xlsx'
+            WorksheetName = 'FullResults'
+            Now           = $true
+            Activate      = $true
+            Show          = $false
+        }
+        $PivotParams = @{
+            PivotTableName = 'BreakDown'
+            PivotData      = @{RuleName = 'Count' }
+            PivotRows      = 'Severity', 'RuleName'
+            PivotColumns   = 'Location'
+            PivotTotals    = 'Rows'
+        }
+        Remove-Item -Path $ExcelParams['Path'] -ErrorAction SilentlyContinue
+
+        $PivotParams['PivotChartDefinition'] = New-ExcelChartDefinition -ChartType 'BarClustered' -Column (1 + $DirsToProcess.Count) -Title "Script analysis" -LegendBold
+        $ExcelParams['PivotTableDefinition'] = New-PivotTableDefinition @PivotParams
+
+        $AnalyzerResults | Export-Excel @ExcelParams
+        '[Progress] Analyzer finished.'
+    }
+    else {
+        "[Info] Invoke-ScriptAnalyzer didn't return any problems."
+    }
 }
--- a/CI/Install.ps1
+++ b/CI/Install.ps1
@@ -4,7 +4,7 @@
    File must not have BOM for GitHub deploy to work.
 #>
 [CmdletBinding(DefaultParameterSetName = 'Default')]
-Param (
+param(
    # Path to install the module to, if not provided -Scope used.
    [Parameter(Mandatory, ParameterSetName = 'ModulePath')]
    [ValidateNotNullOrEmpty()]
@@ -22,53 +22,28 @@ Param (
 )
 # Set Files and Folders patterns to Include/Exclude.
 $IncludeFiles = @(
-    '*.dll',
+    'EPPlus.dll',
    '*.psd1',
    '*.psm1',
-    'AddConditionalFormatting.ps1',
-    'AddDataValidation.ps1',
-    'Charting.ps1',
-    'ColorCompletion.ps1',
-    'Compare-WorkSheet.ps1',
-    'ConvertExcelToImageFile.ps1',
-    'ConvertFromExcelData.ps1',
-    'ConvertFromExcelToSQLInsert.ps1',
-    'ConvertToExcelXlsx.ps1',
-    'Copy-ExcelWorkSheet.ps1',
-    'Export-Excel.ps1',
-    'Export-ExcelSheet.ps1',
-    'Export-StocksToExcel.ps1',
-    'Get-ExcelColumnName.ps1',
-    'Get-ExcelSheetInfo.ps1',
-    'Get-ExcelWorkbookInfo.ps1',
-    'Get-HtmlTable.ps1',
-    'Get-Range.ps1',
-    'Get-XYRange.ps1',
-    'Import-Html.ps1',
-    'InferData.ps1',
-    'Invoke-Sum.ps1',
-    'Join-Worksheet.ps1',
-    'Merge-Worksheet.ps1',
-    'New-ConditionalFormattingIconSet.ps1',
-    'New-ConditionalText.ps1',
-    'New-ExcelChart.ps1',
-    'New-PSItem.ps1',
-    'Open-ExcelPackage.ps1',
-    'Pivot.ps1',
-    'PivotTable.ps1',
-    'Plot.ps1',
-    'RemoveWorksheet.ps1',
-    'Send-SQLDataToExcel.ps1',
-    'Set-CellStyle.ps1',
-    'Set-Column.ps1',
-    'Set-Row.ps1',
-    'Set-WorkSheetProtection.ps1',
-    'SetFormat.ps1',
-    'TrackingUtils.ps1',
-    'Update-FirstObjectProperties.ps1'
-)
+    '*.ps1'
+    'Charting',
+    'en-US',
+    'Examples',
+    'Public',
+    'Private',
+    'images',
+    'InferData',
+    'InternalFunctions',
+    'Pivot',
+    'spikes',
+    'Testimonials',
+    'README.md',
+    'LICENSE.txt'
+    )
 $ExcludeFiles = @(
-    'Install.ps1'
+    'Install.ps1',
+    'InstallModule.ps1',
+    'PublishToGallery.PS1'
 )


@@ -106,8 +81,9 @@ function Invoke-MultiLike {
    }
 }

-Try {
-    Write-Verbose -Message 'Module installation started'
+Push-Location "$PSScriptRoot\.."
+try {
+    Write-Verbose -Message "Module installation started. Installing from $PWD"

    if (!$ModulePath) {
        if ($Scope -eq 'CurrentUser') {
@@ -124,6 +100,7 @@ Try {
        }
        $ModulePath = ($env:PSModulePath -split $ModulePathSeparator)[$ModulePathIndex]
    }
+    Write-Verbose -Message "Installing to $ModulePath"

    # Get $ModuleName, $TargetPath, [$Links]
    if ($FromGitHub) {
@@ -140,8 +117,8 @@ Try {
        $ModuleVersion = (. ([Scriptblock]::Create((Invoke-WebRequest -Uri ($Links | Where-Object { $_.name -eq "$ModuleName.psd1" }).download_url)))).ModuleVersion
    }
    else {
-        $ModuleName = [System.IO.Path]::GetFileNameWithoutExtension((Get-ChildItem -File -Filter *.psm1 -Name -Path $PSScriptRoot))
-        $ModuleVersion = (. ([Scriptblock]::Create((Get-Content -Path (Join-Path $PSScriptRoot "$ModuleName.psd1") | Out-String)))).ModuleVersion
+        $ModuleName = [System.IO.Path]::GetFileNameWithoutExtension((Get-ChildItem -File -Filter *.psm1 -Name -Path $PWD))
+        $ModuleVersion = (. ([Scriptblock]::Create((Get-Content -Path (Join-Path $PWD "$ModuleName.psd1") | Out-String)))).ModuleVersion
    }
    $TargetPath = Join-Path -Path $ModulePath -ChildPath $ModuleName
    $TargetPath = Join-Path -Path $TargetPath -ChildPath $ModuleVersion
@@ -185,7 +162,7 @@ Try {
        }
    }
    else {
-        Get-ChildItem -Path $PSScriptRoot -Exclude $ExcludeFiles | Where-Object { LikeAny $_.Name $IncludeFiles } | ForEach-Object {
+        Get-ChildItem -Path $PWD -Exclude $ExcludeFiles | Where-Object { LikeAny $_.Name $IncludeFiles } | ForEach-Object {
            if ($_.Attributes -ne 'Directory') {
                Copy-Item -Path $_ -Destination $TargetPath
                Write-Verbose -Message ('Installed module file "{0}"' -f $_)
@@ -202,7 +179,7 @@ Try {
    Import-Module -Name $ModuleName -Force
    Write-Verbose -Message "Module installed"
 }
-Catch {
+catch {
    throw ('Failed installing module "{0}". Error: "{1}" in Line {2}' -f $ModuleName, $_, $_.InvocationInfo.ScriptLineNumber)
 }
 finally {
@@ -210,4 +187,5 @@ finally {
    #    [Net.ServicePointManager]::SecurityProtocol = $SecurityProtocol
    #}
    Write-Verbose -Message 'Module installation end'
+    Pop-Location
 }
--- a/tests/InstallPowerShell.ps1
+++ b/tests/InstallPowerShell.ps1
@@ -6,11 +6,15 @@
 Param
 (
    # Version to install in the format from the .msi, for example "7.0.0-preview.1"
-    [Parameter(Mandatory)]
    [String]$Version
 )
 $ErrorActionPreference = 'Stop'

+if (-not $Version) {
+    $Version = (Invoke-RestMethod https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json).StableReleaseTag
+}
+$Version = $Version -replace "^v",""
+
 '[Progress] Downloading PowerShell Core.'
 $MsiPath = Join-Path $env:TEMP "PowerShell-$Version-win-x64.msi"
 [System.Net.WebClient]::new().DownloadFile("https://github.com/PowerShell/PowerShell/releases/download/v$Version/PowerShell-$Version-win-x64.msi", $MsiPath)
--- a/CI/PS-CI.ps1
+++ b/CI/PS-CI.ps1
@@ -0,0 +1,255 @@
+[cmdletbinding(DefaultParameterSetName='Scope')]
+Param(
+    [Parameter(Mandatory = $true, ParameterSetName = 'ModulePath')]
+    [ValidateNotNullOrEmpty()]
+    [String]$ModulePath,
+
+    # Path to install the module to, PSModulePath "CurrentUser" or "AllUsers", if not provided "CurrentUser" used.
+    [Parameter(ParameterSetName = 'Scope')]
+    [ValidateSet('CurrentUser', 'AllUsers')]
+    [string]
+    $Scope = 'CurrentUser',
+
+    [Parameter(Mandatory=$true, ParameterSetName = 'PreCheckOnly')]
+    [switch]$PreCheckOnly,
+    [Parameter(ParameterSetName = 'ModulePath')]
+    [Parameter(ParameterSetName = 'Scope')]
+    [switch]$SkipPreChecks,
+    [Parameter(ParameterSetName = 'ModulePath')]
+    [Parameter(ParameterSetName = 'Scope')]
+    [switch]$SkipPostChecks,
+    [Parameter(ParameterSetName = 'ModulePath')]
+    [Parameter(ParameterSetName = 'Scope')]
+    [switch]$SkipPesterTests,
+    [Parameter(ParameterSetName = 'ModulePath')]
+    [Parameter(ParameterSetName = 'Scope')]
+    [switch]$SkipHelp,
+    [Parameter(ParameterSetName = 'ModulePath')]
+    [Parameter(ParameterSetName = 'Scope')]
+    [switch]$CleanModuleDir
+)
+Function Show-Warning {
+    param(
+        [Parameter(Position=0,ValueFromPipeline=$true)]
+        $message
+    )
+    process {
+        write-output "##vso[task.logissue type=warning]File $message"
+        $message >> $script:warningfile
+    }
+}
+
+if ($PSScriptRoot) {
+    $workingdir = Split-Path -Parent $PSScriptRoot
+    Push-Location $workingdir
+}
+$psdpath = Get-Item "*.psd1"
+if (-not $psdpath -or $psdpath.count -gt 1) {
+    if ($PSScriptRoot) { Pop-Location }
+    throw "Did not find a unique PSD file "
+}
+else {
+    try   {$null        = Test-ModuleManifest -Path $psdpath -ErrorAction stop}
+    catch {throw $_ ; return}
+    $ModuleName         = $psdpath.Name -replace '\.psd1$' , ''
+    $Settings           = $(& ([scriptblock]::Create(($psdpath | Get-Content -Raw))))
+    $approvedVerbs      = Get-Verb | Select-Object -ExpandProperty verb
+    $script:warningfile = Join-Path -Path $pwd -ChildPath "warnings.txt"
+}
+
+#pre-build checks - manifest found, files in it found, public functions and aliases loaded in it. Public functions correct.
+if (-not $SkipPreChecks) {
+
+    #Check files in the manifest are present
+    foreach ($file in $Settings.FileList) {
+        if (-not (Test-Path $file)) {
+           Show-Warning "File $file in the manifest file list is not present"
+        }
+    }
+
+    #Check files in public have Approved_verb-noun names and are 1 function using the file name as its name with
+    #  its name and any alias names in the manifest; function should have a param block and help should be in an MD file
+    # We will want a regex which captures from "function verb-noun {" to its closing "}"
+    # need to match each { to a } - $reg is based on https://stackoverflow.com/questions/7898310/using-regex-to-balance-match-parenthesis
+    $reg  = [Regex]::new(@"
+        function\s*[-\w]+\s*{ # The function name and opening '{'
+            (?:
+            [^{}]+                  # Match all non-braces
+            |
+            (?<open>  { )           # Match '{', and capture into 'open'
+            |
+            (?<-open> } )           # Match '}', and delete the 'open' capture
+            )*
+            (?(open)(?!))           # Fails if 'open' stack isn't empty
+        }                         # Functions closing '}'
+"@, 57)  # 57 = compile,multi-line ignore case and white space.
+    foreach ($file in (Get-Item .\Public\*.ps1)) {
+        $name = $file.name -replace(".ps1","")
+        if ($name -notmatch ("(\w+)-\w+"))         {Show-Warning "$name in the public folder is not a verb-noun name"}
+        elseif ($Matches[1] -notin $approvedVerbs) {Show-Warning "$name in the public folder does not start with an approved verb"}
+        if(-not ($Settings.FunctionsToExport -ceq $name)) {
+            Show-Warning ('File {0} in the public folder does not match an exported function in the manifest' -f $file.name)
+        }
+        else {
+            $fileContent = Get-Content $file -Raw
+            $m    = $reg.Matches($fileContent)
+            if     ($m.Count -eq 0)                         {Show-Warning ('Could not find {0} function in {1}'  -f $name, $file.name); continue}
+            elseif ($m.Count -ge 2)                         {Show-Warning ('Multiple functions in {0}' -f $item.name)         ; Continue}
+            elseif ($m[0] -imatch "^\function\s" -and
+                    $m[0] -cnotmatch "^\w+\s+$name")        {Show-Warning ('function name does not match file name for {0}' -f $file.name)}
+            #$m[0] runs form the f of function to its final }  -find the section up to param, check for aliases & comment-based help
+            $m2 = [regex]::Match($m[0],"^.*?param",17) # 17 = multi-line, ignnore case
+            if (-not $m2.Success)                           {Show-Warning "function $name has no param() block"}
+            else {
+                if ($m2.value -match "(?<!#\s*)\[\s*Alias\(\s*.([\w-]+).\s*\)\s*\]") {
+                    foreach ($a in  ($Matches[1] -split '\s*,\s*')) {
+                        $a = $a -replace "'",""  -replace '"',''
+                        if (-not ($Settings.AliasesToExport   -eq $a)) {
+                            Show-Warning "Function $name has alias $a which is not in the manifest"
+                        }
+                     }
+                }
+                if ($m2.value -match "\.syopsis|\.Description|\.Example") {
+                            Show-Warning "Function $name appears to have comment based help."
+                }
+            }
+        }
+    }
+
+    #Warn about functions which are exported but not found in public
+    $notFromPublic = $Settings.FunctionsToExport.Where({-not (Test-Path ".\public\$_.ps1")})
+    If ($notFromPublic) {Show-Warning ('Exported function(s) {0} are not loaded from the Public folder' -f ($notFromPublic -join ', '))}
+}
+
+if ($PreCheckOnly) {return}
+
+#region build, determine module path if necessary, create target directory if necessary, copy files based on manifest, build help
+try     {
+    if ($ModulePath) {
+        $ModulePath = $ModulePath -replace "\\$|/$",""
+    }
+    else {
+        if ($IsLinux -or $IsMacOS)      {$ModulePathSeparator = ':' }
+        else                            {$ModulePathSeparator = ';' }
+        if ($Scope   -eq 'CurrentUser') {$dir =  [System.Environment]::GetFolderPath([System.Environment+SpecialFolder]::UserProfile) }
+        else                            {$dir =  [System.Environment]::GetFolderPath([System.Environment+SpecialFolder]::ProgramFiles) }
+        $ModulePath = ($env:PSModulePath -split $ModulePathSeparator).where({$_ -like "$dir*"},"First",1)
+        $ModulePath = Join-Path -Path $ModulePath -ChildPath $ModuleName
+        $ModulePath = Join-Path -Path $ModulePath -ChildPath $Settings.ModuleVersion
+    }
+    # Clean-up / Create Directory
+    if (-not  (Test-Path -Path $ModulePath)) {
+        $null = New-Item -Path $ModulePath -ItemType Directory -ErrorAction Stop
+        'Created module folder: "{0}"' -f $ModulePath
+    }
+    elseif ($CleanModuleDir) {
+        '{0} exists - cleaning before copy' -f $ModulePath
+        Get-ChildItem -Path $ModulePath | Remove-Item -Force -Recurse
+    }
+    'Copying files to:      "{0}"' -f $ModulePath
+    $outputFile = $psdpath | Copy-Item -Destination $ModulePath -PassThru
+    $outputFile.fullname
+    foreach ($file in $Settings.FileList) {
+        if  ($file -like '.\*') {
+             $dest = ($file -replace '\.\\',"$ModulePath\")
+             if (-not (Test-Path -PathType Container (Split-Path -Parent $dest))) {
+                $null = New-item -Type Directory -Path (Split-Path -Parent $dest)
+             }
+        }
+        else  {$dest = $ModulePath }
+        Copy-Item -Path $file  -Destination $dest -Force -Recurse
+    }
+
+    if ((Test-Path -PathType Container "mdHelp") -and -not $SkipHelp) {
+        if (-not (Get-Module -ListAvailable platyPS)) {
+            'Installing Platyps to build help files'
+            Install-Module -Name platyPS -Force -SkipPublisherCheck
+        }
+        $platypsInfo = Import-Module platyPS  -PassThru -force
+        Get-ChildItem .\mdHelp -Directory | ForEach-Object {
+           'Building help for language ''{0}'', using {1} V{2}.' -f $_.Name,$platypsInfo.Name, $platypsInfo.Version
+            $Null = New-ExternalHelp -Path $_.FullName  -OutputPath (Join-Path $ModulePath $_.Name) -Force
+        }
+    }
+    #Leave module path for things which follow.
+    $env:PSNewBuildModule = $ModulePath
+}
+catch   {
+    if ($PSScriptRoot) { Pop-Location }
+    throw ('Failed installing module "{0}". Error: "{1}" in Line {2}' -f $ModuleName, $_, $_.InvocationInfo.ScriptLineNumber)
+}
+finally {
+    if (-not $outputFile -or -not (Test-Path $outputFile)) { throw "Failed to create module"}
+}
+#endregion
+
+if ($env:Build_ArtifactStagingDirectory) {
+    Copy-Item -Path (split-path -Parent $ModulePath) -Destination $env:Build_ArtifactStagingDirectory -Recurse
+}
+
+#Check valid command names, help, run script analyzer over the files in the module directory
+if (-not $SkipPostChecks) {
+    try   {$outputFile | Import-Module -Force -ErrorAction stop }
+    catch {
+            if ($PSScriptRoot) { Pop-Location }
+            throw "New module failed to load"
+    }
+    $commands = Get-Command -Module $ModuleName -CommandType function,Cmdlet
+    $commands.where({$_.name -notmatch "(\w+)-\w+" -or $Matches[1] -notin $approvedVerbs}) | ForEach-Object {
+        Show-Warning ('{0} does not meet the ApprovedVerb-Noun naming rules' -f $_.name)
+    }
+    $helpless = $commands | Get-Help | Where-Object {$_.Synopsis -match "^\s+$($_.name)\s+\["} | Select-Object -ExpandProperty name
+    foreach ($command in $helpless ) {
+        Show-Warning ('On-line help is missing for {0}.' -f $command)
+    }
+    if (-not (Get-Module -Name PSScriptAnalyzer -ListAvailable)) {
+        Install-Module -Name PSScriptAnalyzer -Force
+    }
+    $PSSAInfo = Import-module -Name PSScriptAnalyzer  -PassThru -force
+    "Running {1} V{2} against '{0}' " -f $ModulePath , $PSSAInfo.name, $PSSAInfo.Version
+    $AnalyzerResults = Invoke-ScriptAnalyzer -Path $ModulePath -Recurse -ErrorAction SilentlyContinue
+    if ($AnalyzerResults) {
+        if (-not (Get-Module -Name ImportExcel -ListAvailable)) {
+            #ironically we use this to build import-excel Shouldn't need this there!
+            'Installing ImportExcel.'
+            Install-Module -Name ImportExcel -Force
+        }
+        $chartDef = New-ExcelChartDefinition -ChartType 'BarClustered' -Column 2 -Title "Script analysis" -LegendBold
+        $ExcelParams = @{
+            Path                 = (Join-Path $pwd  'ScriptAnalyzer.xlsx')
+            WorksheetName        = 'FullResults'
+            TableStyle           = 'Medium6'
+            AutoSize             = $true
+            Activate             = $true
+            PivotTableDefinition = @{BreakDown = @{
+                PivotData            = @{RuleName = 'Count' }
+                PivotRows            = 'Severity', 'RuleName'
+                PivotTotals          = 'Rows'
+                PivotChartDefinition = $chartDef }}
+        }
+        Remove-Item -Path $ExcelParams['Path'] -ErrorAction SilentlyContinue
+        $AnalyzerResults | Export-Excel @ExcelParams
+        if (Test-Path $ExcelParams['Path']) {
+            "Try to uploadfile     {0}" -f $ExcelParams['Path']
+            "##vso[task.uploadfile]{0}" -f $ExcelParams['Path']
+        }
+    }
+}
+
+if (Test-Path $script:warningfile) {
+    "Try to uploadfile     {0}" -f $script:warningfile
+    "##vso[task.uploadfile]{0}" -f $script:warningfile
+}
+
+#if there are test files, run pester (unless told not to)
+if (-not $SkipPesterTests -and (Get-ChildItem -Recurse *.tests.ps1)) {
+    Import-Module -Force $outputFile
+    if (-not (Get-Module -ListAvailable pester | Where-Object -Property version -ge ([version]::new(4,4,1)))) {
+        Install-Module Pester -Force -SkipPublisherCheck
+    }
+    Import-Module Pester
+    $PesterOutputPath = Join-Path $pwd  -ChildPath ('TestResultsPS{0}.xml' -f $PSVersionTable.PSVersion)
+    if ($PSScriptRoot) { Pop-Location }
+    Invoke-Pester -OutputFile $PesterOutputPath
+}
+elseif ($PSScriptRoot) { Pop-Location }
--- a/tests/Publish.ps1
+++ b/tests/Publish.ps1
@@ -2,6 +2,7 @@
    .SYNOPSIS
    Deploy module to PowerShellGallery.
 #>
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseDeclaredVarsMoreThanAssignments", "Success")]
 [CmdletBinding(DefaultParameterSetName = 'ModuleName')]
 Param
 (
--- a/CI/PublishToGallery.ps1
+++ b/CI/PublishToGallery.ps1
--- a/CI/Test-SingleFunctions.ps1
+++ b/CI/Test-SingleFunctions.ps1
@@ -0,0 +1,54 @@
+
+function Test-SingleFunction {
+    param (
+    [parameter(ValueFromPipeline=$true)]
+    $path )
+    begin {
+        $psd = Get-Content -Raw "$PSScriptRoot\..\ImportExcel.psd1"
+        $exportedFunctions =  (Invoke-Command ([scriptblock]::Create($psd))).functionsToExport
+        $reg  = [Regex]::new(@"
+          function\s*[-\w]+\s*{ # The function name and opening '{'
+            (?:
+            [^{}]+                  # Match all non-braces
+            |
+            (?<open>  { )           # Match '{', and capture into 'open'
+            |
+            (?<-open> } )           # Match '}', and delete the 'open' capture
+            )*
+            (?(open)(?!))           # Fails if 'open' stack isn't empty
+          }                         # Functions closing '}'
+"@, 57)  # 41 = compile ignore case and white space.
+$reg2  = [Regex]::new(@"
+    ^function\s*[-\w]+\s*{     # The function name and opening '{'
+    (
+        \#.*?[\r\n]+             # single line comment
+        |                        #  or
+        \s*<\#.*?\#>             # <#comment block#>
+        |                        #  or
+        \s*\[.*?\]               # [attribute tags]
+    )*
+"@, 57)
+# 43 = compile, multi-line, ignore case and white space.
+    }
+    process {
+        $item = Get-item $Path
+        $name = $item.Name -replace "\.\w+$",""
+        Write-Verbose $name
+        $file = Get-Content $item -Raw
+        $m    = $reg.Matches($file)
+
+        #based on https://stackoverflow.com/questions/7898310/using-regex-to-balance-match-parenthesis
+        if     ($m.Count -eq 0)                         {return "Could not find $name function in $($item.name)"}
+        elseif ($m.Count -ge 2)                         {return "Multiple functions in $($item.name)"}
+        elseif ($exportedFunctions -cnotcontains $name) {return "$name not exported (or in the wrong case)"}
+        elseif ($m[0] -cnotmatch "^\w+\s+$name")        {return "function $name in wrong case"}
+        $m2 = [regex]::Match($m[0],"param",[System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
+        if (-not $m2.Success)                           {return "No param block in $name"}
+    #    elseif ($m[0] -inotmatch "(?s)^function\s*$name\s*{(\s*<\#.*?\#>|\s*\[.*?\])*\s*param")
+    #    elseif ($reg2.IsMatch($m[0].Value))             {return "function $name has comment-based help"}
+        elseif ($m[0] -inotmatch "\[CmdletBinding\(" -and
+                $m[0] -inotmatch "\[parameter\("   )    {return "$name has is not an advanced function"}
+        #elseif (-not (& $Name -?).synopsis)             {return "$name has no help"}
+        else   {Write-Verbose "$name OK"}
+    }
+}
--- a/CI/build.ps1
+++ b/CI/build.ps1
@@ -0,0 +1,80 @@
+[CmdletBinding(DefaultParameterSetName = 'Default')]
+param(
+    # Path to install the module to, if not provided -Scope used.
+    [Parameter(Mandatory, ParameterSetName = 'ModulePath')]
+    [ValidateNotNullOrEmpty()]
+    [String]$ModulePath,
+
+    # Path to install the module to, PSModulePath "CurrentUser" or "AllUsers", if not provided "CurrentUser" used.
+    [Parameter(Mandatory, ParameterSetName = 'Scope')]
+    [ValidateSet('CurrentUser', 'AllUsers')]
+    [string]
+    $Scope = 'CurrentUser',
+    [switch]$Passthru
+)
+
+if ($PSScriptRoot) { Push-Location "$PSScriptRoot\.." }
+
+$psdpath = Get-Item "*.psd1"
+if (-not $psdpath -or $psdpath.count -gt 1) {
+    throw "Did not find a unique PSD file "
+}
+else {
+    $ModuleName = $psdpath.Name -replace '\.psd1$' , ''
+    $Settings   = $(& ([scriptblock]::Create(($psdpath | Get-Content -Raw))))
+}
+
+try {
+    Write-Verbose -Message 'Module installation started'
+
+    if (!$ModulePath) {
+        if ($IsLinux -or $IsMacOS) {$ModulePathSeparator = ':' }
+        else                       {$ModulePathSeparator = ';' }
+
+        if ($Scope -eq 'CurrentUser') { $dir =  [System.Environment]::GetFolderPath([System.Environment+SpecialFolder]::UserProfile) }
+        else                          { $dir =  [System.Environment]::GetFolderPath([System.Environment+SpecialFolder]::ProgramFiles) }
+        $ModulePath = ($env:PSModulePath -split $ModulePathSeparator).where({$_ -like "$dir*"},"First",1)
+        $ModulePath = Join-Path -Path $ModulePath -ChildPath $ModuleName
+        $ModulePath = Join-Path -Path $ModulePath -ChildPath $Settings.ModuleVersion
+    }
+
+    # Create Directory
+    if (-not  (Test-Path -Path $ModulePath)) {
+        $null = New-Item -Path $ModulePath -ItemType Directory -ErrorAction Stop
+        Write-Verbose -Message ('Created module folder: "{0}"' -f $ModulePath)
+    }
+
+    Write-Verbose -Message ('Copying files to "{0}"' -f $ModulePath)
+    $outputFile = $psdpath | Copy-Item -Destination $ModulePath -PassThru
+    Foreach ($file in $Settings.FileList) {
+        if  ($file -like '.\*') {
+             $dest = ($file -replace '\.\\',"$ModulePath\")
+             if (-not (Test-Path -PathType Container (Split-Path -Parent $dest))) {
+                $null = New-item -Type Directory -Path (Split-Path -Parent $dest)
+             }
+        }
+        else  {$dest = $ModulePath }
+        Copy-Item $file  -Destination $dest -Force -Recurse
+    }
+
+    if (Test-Path -PathType Container "mdHelp") {
+        if (-not (Get-Module -ListAvailable platyPS)) {
+            Write-Verbose-Message ('Installing Platyps to build help files')
+            Install-Module -Name platyPS -Force -SkipPublisherCheck
+        }
+        Import-Module platyPS
+        Get-ChildItem .\mdHelp -Directory | ForEach-Object {
+            New-ExternalHelp -Path $_.FullName  -OutputPath (Join-Path $ModulePath $_.Name) -Force -Verbose
+        }
+    }
+    $env:PSNewBuildModule = $ModulePath
+
+    if ($Passthru) {$outputFile}
+}
+catch {
+    throw ('Failed installing module "{0}". Error: "{1}" in Line {2}' -f $ModuleName, $_, $_.InvocationInfo.ScriptLineNumber)
+}
+finally {
+    if ($PSScriptRoot) { Pop-Location }
+    Write-Verbose -Message 'Module installation end'
+}
--- a/CI/pipeline.yml
+++ b/CI/pipeline.yml
@@ -0,0 +1,75 @@
+# https://aka.ms/yaml
+
+trigger:
+  branches:
+    include:
+    - '*'
+    # - master
+    # - releases/*
+  paths:
+    exclude:
+    - README.md
+    - CHANGELOG.md
+
+jobs:
+  - job: 'Windows_PowerShell_all_options'
+    pool:
+      vmImage: 'windows-latest'
+    steps:
+    - powershell: 'Install-Module -Name Pester -Force -SkipPublisherCheck'
+      displayName: 'Update Pester'
+    - powershell: './CI/PS-CI.ps1 '
+      displayName: 'Check Build Check Pack Test'
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
+    - task: PublishPipelineArtifact@1
+      inputs:
+        targetPath: '$(Build.ArtifactStagingDirectory)/ImportExcel'
+        artifact: 'ImportExcel'
+
+  - job: 'PowerShell_Core_on_Windows_Build_and_Pester_only'
+    pool:
+      vmImage: 'windows-latest'
+    steps:
+    - pwsh: 'Install-Module -Name Pester -Force'
+      displayName: 'Update Pester'
+    - pwsh: '.\CI\PS-CI.ps1 -SkipPreChecks -SkipHelp -SkipPostChecks'
+      displayName: 'Install and Test'
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
+
+  - job: 'Ubuntu_Build_and_Pester_Only'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+    - powershell: 'Install-Module -Name Pester -Force'
+      displayName: 'Update Pester'
+    - powershell: './CI/PS-CI.ps1 -SkipPreChecks -SkipHelp -SkipPostChecks   '
+      displayName: 'Install and Test'
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
+
+  - job: 'macOS_Build_and_Pester_Only'
+    pool:
+      vmImage: 'macOS-latest'
+    steps:
+    - script: brew install mono-libgdiplus
+      displayName: 'Install mono-libgdiplus'
+    - powershell: 'Install-Module -Name Pester -Force'
+      displayName: 'Update Pester'
+    - powershell: './CI/PS-CI.ps1 -SkipPreChecks -SkipHelp -SkipPostChecks'
+      displayName: 'Install and Test'
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'NUnit'
+        testResultsFiles: '**/TestResults*.xml'
+        failTaskOnFailedTests: true
--- a/Charting/BarChart.md
+++ b/Charting/BarChart.md
@@ -0,0 +1,137 @@
+---
+external help file: ImportExcel-help.xml
+Module Name: ImportExcel
+online version:
+schema: 2.0.0
+---
+
+# BarChart
+
+## SYNOPSIS
+{{ Fill in the Synopsis }}
+
+## SYNTAX
+
+```
+BarChart [[-targetData] <Object>] [[-title] <Object>] [[-ChartType] <eChartType>] [-NoLegend] [-ShowCategory]
+ [-ShowPercent] [<CommonParameters>]
+```
+
+## DESCRIPTION
+{{ Fill in the Description }}
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> {{ Add example code here }}
+```
+
+{{ Add example description here }}
+
+## PARAMETERS
+
+### -ChartType
+{{ Fill ChartType Description }}
+
+```yaml
+Type: eChartType
+Parameter Sets: (All)
+Aliases:
+Accepted values: Area, Line, Pie, Bubble, ColumnClustered, ColumnStacked, ColumnStacked100, ColumnClustered3D, ColumnStacked3D, ColumnStacked1003D, BarClustered, BarStacked, BarStacked100, BarClustered3D, BarStacked3D, BarStacked1003D, LineStacked, LineStacked100, LineMarkers, LineMarkersStacked, LineMarkersStacked100, PieOfPie, PieExploded, PieExploded3D, BarOfPie, XYScatterSmooth, XYScatterSmoothNoMarkers, XYScatterLines, XYScatterLinesNoMarkers, AreaStacked, AreaStacked100, AreaStacked3D, AreaStacked1003D, DoughnutExploded, RadarMarkers, RadarFilled, Surface, SurfaceWireframe, SurfaceTopView, SurfaceTopViewWireframe, Bubble3DEffect, StockHLC, StockOHLC, StockVHLC, StockVOHLC, CylinderColClustered, CylinderColStacked, CylinderColStacked100, CylinderBarClustered, CylinderBarStacked, CylinderBarStacked100, CylinderCol, ConeColClustered, ConeColStacked, ConeColStacked100, ConeBarClustered, ConeBarStacked, ConeBarStacked100, ConeCol, PyramidColClustered, PyramidColStacked, PyramidColStacked100, PyramidBarClustered, PyramidBarStacked, PyramidBarStacked100, PyramidCol, XYScatter, Radar, Doughnut, Pie3D, Line3D, Column3D, Area3D
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoLegend
+{{ Fill NoLegend Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowCategory
+{{ Fill ShowCategory Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowPercent
+{{ Fill ShowPercent Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -targetData
+{{ Fill targetData Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByValue)
+Accept wildcard characters: False
+```
+
+### -title
+{{ Fill title Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### System.Object
+
+## OUTPUTS
+
+### System.Object
+## NOTES
+
+## RELATED LINKS
--- a/Charting/Charting.ps1
+++ b/Charting/Charting.ps1
--- a/Charting/ColumnChart.md
+++ b/Charting/ColumnChart.md
@@ -0,0 +1,137 @@
+---
+external help file: ImportExcel-help.xml
+Module Name: ImportExcel
+online version:
+schema: 2.0.0
+---
+
+# ColumnChart
+
+## SYNOPSIS
+{{ Fill in the Synopsis }}
+
+## SYNTAX
+
+```
+ColumnChart [[-targetData] <Object>] [[-title] <Object>] [[-ChartType] <eChartType>] [-NoLegend]
+ [-ShowCategory] [-ShowPercent] [<CommonParameters>]
+```
+
+## DESCRIPTION
+{{ Fill in the Description }}
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> {{ Add example code here }}
+```
+
+{{ Add example description here }}
+
+## PARAMETERS
+
+### -ChartType
+{{ Fill ChartType Description }}
+
+```yaml
+Type: eChartType
+Parameter Sets: (All)
+Aliases:
+Accepted values: Area, Line, Pie, Bubble, ColumnClustered, ColumnStacked, ColumnStacked100, ColumnClustered3D, ColumnStacked3D, ColumnStacked1003D, BarClustered, BarStacked, BarStacked100, BarClustered3D, BarStacked3D, BarStacked1003D, LineStacked, LineStacked100, LineMarkers, LineMarkersStacked, LineMarkersStacked100, PieOfPie, PieExploded, PieExploded3D, BarOfPie, XYScatterSmooth, XYScatterSmoothNoMarkers, XYScatterLines, XYScatterLinesNoMarkers, AreaStacked, AreaStacked100, AreaStacked3D, AreaStacked1003D, DoughnutExploded, RadarMarkers, RadarFilled, Surface, SurfaceWireframe, SurfaceTopView, SurfaceTopViewWireframe, Bubble3DEffect, StockHLC, StockOHLC, StockVHLC, StockVOHLC, CylinderColClustered, CylinderColStacked, CylinderColStacked100, CylinderBarClustered, CylinderBarStacked, CylinderBarStacked100, CylinderCol, ConeColClustered, ConeColStacked, ConeColStacked100, ConeBarClustered, ConeBarStacked, ConeBarStacked100, ConeCol, PyramidColClustered, PyramidColStacked, PyramidColStacked100, PyramidBarClustered, PyramidBarStacked, PyramidBarStacked100, PyramidCol, XYScatter, Radar, Doughnut, Pie3D, Line3D, Column3D, Area3D
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoLegend
+{{ Fill NoLegend Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowCategory
+{{ Fill ShowCategory Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowPercent
+{{ Fill ShowPercent Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -targetData
+{{ Fill targetData Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByValue)
+Accept wildcard characters: False
+```
+
+### -title
+{{ Fill title Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### System.Object
+
+## OUTPUTS
+
+### System.Object
+## NOTES
+
+## RELATED LINKS
--- a/Charting/LineChart.md
+++ b/Charting/LineChart.md
@@ -0,0 +1,137 @@
+---
+external help file: ImportExcel-help.xml
+Module Name: ImportExcel
+online version: https://github.com/dfinke/ImportExcel
+schema: 2.0.0
+---
+
+# LineChart
+
+## SYNOPSIS
+{{ Fill in the Synopsis }}
+
+## SYNTAX
+
+```
+LineChart [[-targetData] <Object>] [[-title] <Object>] [[-ChartType] <eChartType>] [-NoLegend] [-ShowCategory]
+ [-ShowPercent] [<CommonParameters>]
+```
+
+## DESCRIPTION
+{{ Fill in the Description }}
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> {{ Add example code here }}
+```
+
+{{ Add example description here }}
+
+## PARAMETERS
+
+### -ChartType
+{{ Fill ChartType Description }}
+
+```yaml
+Type: eChartType
+Parameter Sets: (All)
+Aliases:
+Accepted values: Area, Line, Pie, Bubble, ColumnClustered, ColumnStacked, ColumnStacked100, ColumnClustered3D, ColumnStacked3D, ColumnStacked1003D, BarClustered, BarStacked, BarStacked100, BarClustered3D, BarStacked3D, BarStacked1003D, LineStacked, LineStacked100, LineMarkers, LineMarkersStacked, LineMarkersStacked100, PieOfPie, PieExploded, PieExploded3D, BarOfPie, XYScatterSmooth, XYScatterSmoothNoMarkers, XYScatterLines, XYScatterLinesNoMarkers, AreaStacked, AreaStacked100, AreaStacked3D, AreaStacked1003D, DoughnutExploded, RadarMarkers, RadarFilled, Surface, SurfaceWireframe, SurfaceTopView, SurfaceTopViewWireframe, Bubble3DEffect, StockHLC, StockOHLC, StockVHLC, StockVOHLC, CylinderColClustered, CylinderColStacked, CylinderColStacked100, CylinderBarClustered, CylinderBarStacked, CylinderBarStacked100, CylinderCol, ConeColClustered, ConeColStacked, ConeColStacked100, ConeBarClustered, ConeBarStacked, ConeBarStacked100, ConeCol, PyramidColClustered, PyramidColStacked, PyramidColStacked100, PyramidBarClustered, PyramidBarStacked, PyramidBarStacked100, PyramidCol, XYScatter, Radar, Doughnut, Pie3D, Line3D, Column3D, Area3D
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoLegend
+{{ Fill NoLegend Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowCategory
+{{ Fill ShowCategory Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowPercent
+{{ Fill ShowPercent Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -targetData
+{{ Fill targetData Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByValue)
+Accept wildcard characters: False
+```
+
+### -title
+{{ Fill title Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### System.Object
+
+## OUTPUTS
+
+### System.Object
+## NOTES
+
+## RELATED LINKS
--- a/Charting/PieChart.md
+++ b/Charting/PieChart.md
@@ -0,0 +1,137 @@
+---
+external help file: ImportExcel-help.xml
+Module Name: ImportExcel
+online version:
+schema: 2.0.0
+---
+
+# PieChart
+
+## SYNOPSIS
+{{ Fill in the Synopsis }}
+
+## SYNTAX
+
+```
+PieChart [[-targetData] <Object>] [[-title] <Object>] [[-ChartType] <eChartType>] [-NoLegend] [-ShowCategory]
+ [-ShowPercent] [<CommonParameters>]
+```
+
+## DESCRIPTION
+{{ Fill in the Description }}
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> {{ Add example code here }}
+```
+
+{{ Add example description here }}
+
+## PARAMETERS
+
+### -ChartType
+{{ Fill ChartType Description }}
+
+```yaml
+Type: eChartType
+Parameter Sets: (All)
+Aliases:
+Accepted values: Area, Line, Pie, Bubble, ColumnClustered, ColumnStacked, ColumnStacked100, ColumnClustered3D, ColumnStacked3D, ColumnStacked1003D, BarClustered, BarStacked, BarStacked100, BarClustered3D, BarStacked3D, BarStacked1003D, LineStacked, LineStacked100, LineMarkers, LineMarkersStacked, LineMarkersStacked100, PieOfPie, PieExploded, PieExploded3D, BarOfPie, XYScatterSmooth, XYScatterSmoothNoMarkers, XYScatterLines, XYScatterLinesNoMarkers, AreaStacked, AreaStacked100, AreaStacked3D, AreaStacked1003D, DoughnutExploded, RadarMarkers, RadarFilled, Surface, SurfaceWireframe, SurfaceTopView, SurfaceTopViewWireframe, Bubble3DEffect, StockHLC, StockOHLC, StockVHLC, StockVOHLC, CylinderColClustered, CylinderColStacked, CylinderColStacked100, CylinderBarClustered, CylinderBarStacked, CylinderBarStacked100, CylinderCol, ConeColClustered, ConeColStacked, ConeColStacked100, ConeBarClustered, ConeBarStacked, ConeBarStacked100, ConeCol, PyramidColClustered, PyramidColStacked, PyramidColStacked100, PyramidBarClustered, PyramidBarStacked, PyramidBarStacked100, PyramidCol, XYScatter, Radar, Doughnut, Pie3D, Line3D, Column3D, Area3D
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoLegend
+{{ Fill NoLegend Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowCategory
+{{ Fill ShowCategory Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowPercent
+{{ Fill ShowPercent Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -targetData
+{{ Fill targetData Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: True (ByValue)
+Accept wildcard characters: False
+```
+
+### -title
+{{ Fill title Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### System.Object
+
+## OUTPUTS
+
+### System.Object
+## NOTES
+
+## RELATED LINKS
--- a/Charting/doChart.md
+++ b/Charting/doChart.md
@@ -0,0 +1,134 @@
+---
+external help file: ImportExcel-help.xml
+Module Name: ImportExcel
+online version:
+schema: 2.0.0
+---
+
+# DoChart
+
+## SYNOPSIS
+{{ Fill in the Synopsis }}
+
+## SYNTAX
+
+```
+DoChart [[-targetData] <Object>] [[-title] <Object>] [[-ChartType] <eChartType>] [-NoLegend] [-ShowCategory]
+ [-ShowPercent]
+```
+
+## DESCRIPTION
+{{ Fill in the Description }}
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> {{ Add example code here }}
+```
+
+{{ Add example description here }}
+
+## PARAMETERS
+
+### -ChartType
+{{ Fill ChartType Description }}
+
+```yaml
+Type: eChartType
+Parameter Sets: (All)
+Aliases:
+Accepted values: Area, Line, Pie, Bubble, ColumnClustered, ColumnStacked, ColumnStacked100, ColumnClustered3D, ColumnStacked3D, ColumnStacked1003D, BarClustered, BarStacked, BarStacked100, BarClustered3D, BarStacked3D, BarStacked1003D, LineStacked, LineStacked100, LineMarkers, LineMarkersStacked, LineMarkersStacked100, PieOfPie, PieExploded, PieExploded3D, BarOfPie, XYScatterSmooth, XYScatterSmoothNoMarkers, XYScatterLines, XYScatterLinesNoMarkers, AreaStacked, AreaStacked100, AreaStacked3D, AreaStacked1003D, DoughnutExploded, RadarMarkers, RadarFilled, Surface, SurfaceWireframe, SurfaceTopView, SurfaceTopViewWireframe, Bubble3DEffect, StockHLC, StockOHLC, StockVHLC, StockVOHLC, CylinderColClustered, CylinderColStacked, CylinderColStacked100, CylinderBarClustered, CylinderBarStacked, CylinderBarStacked100, CylinderCol, ConeColClustered, ConeColStacked, ConeColStacked100, ConeBarClustered, ConeBarStacked, ConeBarStacked100, ConeCol, PyramidColClustered, PyramidColStacked, PyramidColStacked100, PyramidBarClustered, PyramidBarStacked, PyramidBarStacked100, PyramidCol, XYScatter, Radar, Doughnut, Pie3D, Line3D, Column3D, Area3D
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoLegend
+{{ Fill NoLegend Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowCategory
+{{ Fill ShowCategory Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ShowPercent
+{{ Fill ShowPercent Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -targetData
+{{ Fill targetData Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 0
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -title
+{{ Fill title Description }}
+
+```yaml
+Type: Object
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+## INPUTS
+
+### None
+
+## OUTPUTS
+
+### System.Object
+## NOTES
+
+## RELATED LINKS
--- a/ColorCompletion.ps1
+++ b/ColorCompletion.ps1
@@ -1,44 +0,0 @@
-Function ColorCompletion {
-    param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameter)
-    [System.Drawing.KnownColor].GetFields() | Where-Object {$_.IsStatic -and $_.name -like "$wordToComplete*" } |
-        Sort-Object name | ForEach-Object {New-CompletionResult $_.name $_.name
-    }
-}
-
-if (Get-Command -Name register-argumentCompleter -ErrorAction SilentlyContinue) {
-    Register-ArgumentCompleter -CommandName Export-Excel               -ParameterName TitleBackgroundColor   -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Add-ConditionalFormatting  -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Add-ConditionalFormatting  -ParameterName DataBarColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Add-ConditionalFormatting  -ParameterName ForeGroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Add-ConditionalFormatting  -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Compare-Worksheet          -ParameterName AllDataBackgroundColor -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Compare-Worksheet          -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Compare-Worksheet          -ParameterName FontColor              -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Compare-Worksheet          -ParameterName TabColor               -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Join-Worksheet             -ParameterName TitleBackgroundColor   -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-Worksheet            -ParameterName AddBackgroundColor     -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-Worksheet            -ParameterName ChangeBackgroundColor  -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-Worksheet       `    -ParameterName DeleteBackgroundColor  -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-MulipleSheets        -ParameterName KeyFontColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-MulipleSheets        -ParameterName AddBackgroundColor     -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-MulipleSheets        -ParameterName ChangeBackgroundColor  -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-MulipleSheets   `    -ParameterName DeleteBackgroundColor  -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Merge-MulipleSheets        -ParameterName KeyFontColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ConditionalText        -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ConditionalText        -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ConditionalText        -ParameterName ConditionalTextColor   -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ExcelStyle             -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ExcelStyle             -ParameterName FontColor              -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ExcelStyle             -ParameterName BorderColor            -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName New-ExcelStyle             -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRange             -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRange             -ParameterName FontColor              -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRange             -ParameterName BorderColor            -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRange             -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelColumn            -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelColumn            -ParameterName FontColor              -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelColumn            -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRow               -ParameterName BackgroundColor        -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRow               -ParameterName FontColor              -ScriptBlock $Function:ColorCompletion
-    Register-ArgumentCompleter -CommandName Set-ExcelRow               -ParameterName PatternColor           -ScriptBlock $Function:ColorCompletion
-}
--- a/ConvertFromExcelToSQLInsert.ps1
+++ b/ConvertFromExcelToSQLInsert.ps1
@@ -1,118 +0,0 @@
-function ConvertFrom-ExcelToSQLInsert {
-    <#
-      .SYNOPSIS
-        Generate SQL insert statements from Excel spreadsheet.
-      .DESCRIPTION
-        Generate SQL insert statements from Excel spreadsheet.
-      .PARAMETER TableName
-        Name of the target database table.
-      .PARAMETER Path
-        Path to an existing .XLSX file
-        This parameter is passed to Import-Excel as is.
-      .PARAMETER WorkSheetname
-        Specifies the name of the worksheet in the Excel workbook to import. By default, if no name is provided, the first worksheet will be imported.
-        This parameter is passed to Import-Excel as is.
-      .PARAMETER StartRow
-        The row from where we start to import data, all rows above the StartRow are disregarded. By default this is the first row.
-        When the parameters ‘-NoHeader’ and ‘-HeaderName’ are not provided, this row will contain the column headers that will be used as property names. When one of both parameters are provided, the property names are automatically created and this row will be treated as a regular row containing data.
-      .PARAMETER Header
-        Specifies custom property names to use, instead of the values defined in the column headers of the TopRow.
-        If you provide fewr header names than there is data in the worksheet, then only the data with a corresponding header name will be imported and the data without header name will be disregarded.
-        If you provide more header names than there is data in the worksheet, then all data will be imported and all objects will have all the property names you defined in the header names. As such, the last properties will be blank as there is no data for them.
-      .PARAMETER NoHeader
-        Automatically generate property names (P1, P2, P3, ..) instead of the ones defined in the column headers of the TopRow.
-        This switch is best used when you want to import the complete worksheet ‘as is’ and are not concerned with the property names.
-      .PARAMETER DataOnly
-        Import only rows and columns that contain data, empty rows and empty columns are not imported.
-      .PARAMETER ConvertEmptyStringsToNull
-        If specified, cells without any data are replaced with NULL, instead of an empty string.
-        This is to address behviors in certain DBMS where an empty string is insert as 0 for INT column, instead of a NULL value.
-
-      .EXAMPLE
-        Generate SQL insert statements from Movies.xlsx file, leaving blank cells as empty strings:
-
-        ----------------------------------------------------------
-        | File: Movies.xlsx            -           Sheet: Sheet1 |
-        ----------------------------------------------------------
-        |           A            B            C                  |
-        |1     Movie Name      Year         Rating               |
-        |2     The Bodyguard   1992           9                  |
-        |3     The Matrix      1999           8                  |
-        |4     Skyfall         2012           9                  |
-        |5     The Avengers    2012                              |
-        ----------------------------------------------------------
-
-        PS C:\> Import-Excel -TableName "Movies" -Path 'C:\Movies.xlsx'
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Bodyguard', '1992', '9');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Matrix', '1999', '8');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('Skyfall', '2012', '9');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Avengers', '2012', '');
-
-      .EXAMPLE
-        Generate SQL insert statements from Movies.xlsx file, specify NULL instead of an empty string.
-
-        ----------------------------------------------------------
-        | File: Movies.xlsx            -           Sheet: Sheet1 |
-        ----------------------------------------------------------
-        |           A            B            C                  |
-        |1     Movie Name      Year         Rating               |
-        |2     The Bodyguard   1992           9                  |
-        |3     The Matrix      1999           8                  |
-        |4     Skyfall         2012           9                  |
-        |5     The Avengers    2012                              |
-        ----------------------------------------------------------
-
-        PS C:\> ConvertFrom-ExcelToSQLInsert -TableName "Movies" -Path "C:\Movies.xlsx" -ConvertEmptyStringsToNull
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Bodyguard', '1992', '9');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Matrix', '1999', '8');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('Skyfall', '2012', '9');
-        INSERT INTO Movies ('Movie Name', 'Year', 'Rating') Values('The Avengers', '2012', NULL);
-
-    #>
-    [CmdletBinding()]
-    param(
-        [Parameter(Mandatory = $true)]
-        $TableName,
-        [Alias("FullName")]
-        [Parameter(ValueFromPipelineByPropertyName = $true, ValueFromPipeline = $true, Mandatory = $true)]
-        [ValidateScript( { Test-Path $_ -PathType Leaf })]
-        $Path,
-        [Alias("Sheet")]
-        $WorkSheetname = 1,
-        [Alias('HeaderRow', 'TopRow')]
-        [ValidateRange(1, 9999)]
-        [Int]$StartRow,
-        [string[]]$Header,
-        [switch]$NoHeader,
-        [switch]$DataOnly,
-        [switch]$ConvertEmptyStringsToNull,
-        [switch]$UseMSSQLSyntax
-    )
-
-    $null = $PSBoundParameters.Remove('TableName')
-    $null = $PSBoundParameters.Remove('ConvertEmptyStringsToNull')
-    $null = $PSBoundParameters.Remove('UseMSSQLSyntax')
-
-    $params = @{} + $PSBoundParameters
-
-    ConvertFrom-ExcelData @params {
-        param($propertyNames, $record)
-
-        $ColumnNames = "'" + ($PropertyNames -join "', '") + "'"
-        if($UseMSSQLSyntax) {
-            $ColumnNames = "[" + ($PropertyNames -join "], [") + "]"
-        }
-
-        $values = foreach ($propertyName in $PropertyNames) {
-            if ($ConvertEmptyStringsToNull.IsPresent -and [string]::IsNullOrEmpty($record.$propertyName)) {
-                'NULL'
-            }
-            else {
-                "'" + $record.$propertyName + "'"
-            }
-        }
-        $targetValues = ($values -join ", ")
-
-        "INSERT INTO {0} ({1}) Values({2});" -f $TableName, $ColumnNames, $targetValues
-    }
-}
--- a/Examples/AddWorkSheet/AddMultiWorkSheet.ps1
+++ b/Examples/AddWorkSheet/AddMultiWorkSheet.ps1
@@ -1,15 +1,15 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlSourcefile = "$env:TEMP\Source.xlsx"
-write-host "Save location: $xlSourcefile"
+Write-Verbose -Verbose -Message  "Save location: $xlSourcefile"

 Remove-Item $xlSourcefile -ErrorAction Ignore

 #Put some simple data in a worksheet and Get an excel package object to represent the file
-$TabData1 = 1..5 | Export-Excel $xlSourcefile -WorksheetName 'Tab 1' -AutoSize -AutoFilter
+1..5 | Export-Excel $xlSourcefile -WorksheetName 'Tab1' -AutoSize -AutoFilter

 #Add another tab.  Replace the $TabData2 with your data
-$TabData2 = 1..10 | Export-Excel $xlSourcefile -WorksheetName 'Tab 2' -AutoSize -AutoFilter
+1..10 | Export-Excel $xlSourcefile -WorksheetName 'Tab 2' -AutoSize -AutoFilter

 #Add another tab.  Replace the $TabData3 with your data
-$TabData3 = 1..15  | Export-Excel $xlSourcefile -WorksheetName 'Tab 3' -AutoSize -AutoFilter -Show
+1..15  | Export-Excel $xlSourcefile -WorksheetName 'Tab 3' -AutoSize -AutoFilter -Show
--- a/Examples/AddWorkSheet/AddWorkSheet.ps1
+++ b/Examples/AddWorkSheet/AddWorkSheet.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlSourcefile = "$env:TEMP\Source.xlsx"

@@ -7,6 +7,6 @@ Remove-Item $xlSourcefile -ErrorAction Ignore
 #Put some simple data in a worksheet and Get an excel package object to represent the file
 $excel = 1..10 | Export-Excel $xlSourcefile -PassThru
 #Add a new worksheet named 'NewSheet' and copying the sheet that was just made (Sheet1) to the new sheet
-Add-WorkSheet -ExcelPackage $excel -WorkSheetname "NewSheet" -CopySource $excel.Workbook.Worksheets["Sheet1"]
+Add-Worksheet -ExcelPackage $excel -WorkSheetname "NewSheet" -CopySource $excel.Workbook.Worksheets["Sheet1"]
 #Save and open in Excel
 Close-ExcelPackage -ExcelPackage $excel -Show
--- a/Examples/Charts/MultiSeries.ps1
+++ b/Examples/Charts/MultiSeries.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item temp.xlsx -ErrorAction Ignore

--- a/Examples/Charts/MultiSeries1.ps1
+++ b/Examples/Charts/MultiSeries1.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item temp.xlsx -ErrorAction Ignore

--- a/Examples/Charts/MultipleCharts.ps1
+++ b/Examples/Charts/MultipleCharts.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item -Path Tools.xlsx

--- a/Examples/Charts/plot.ps1
+++ b/Examples/Charts/plot.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 function plot {
    param(
@@ -25,4 +25,4 @@ function plot {

 function pi {[math]::pi}

-plot {[math]::Tan($args[0])} (pi) (3*(pi)/2-.01)
+plot -f {[math]::Tan($args[0])} -minx (pi) -maxx (3*(pi)/2-.01)
--- a/Examples/ConditionalFormatting/CodeGenExamples.ps1
+++ b/Examples/ConditionalFormatting/CodeGenExamples.ps1
@@ -1,9 +1,9 @@
-echo Last7Days LastMonth LastWeek NextMonth NextWeek ThisMonth ThisWeek Today Tomorrow Yesterday |
+"Last7Days", "LastMonth", "LastWeek", "NextMonth", "NextWeek", "ThisMonth", "ThisWeek", "Today", "Tomorrow", "Yesterday" |
    Foreach-Object {
    $text = @"
 `$f = ".\testExport.xlsx"

-rm `$f -ErrorAction Ignore
+remove-item `$f -ErrorAction Ignore

 .\GenDates.ps1 |
    Export-Excel `$f -Show -AutoSize -ConditionalText `$(
--- a/Examples/ConditionalFormatting/ConditionalText.ps1
+++ b/Examples/ConditionalFormatting/ConditionalText.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "$env:temp\conditionalTextFormatting.xlsx"
 Remove-Item $file -ErrorAction Ignore
--- a/Examples/ConditionalFormatting/ContainsBlanks.ps1
+++ b/Examples/ConditionalFormatting/ContainsBlanks.ps1
@@ -1,10 +1,10 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 #Define a "Contains blanks" rule. No format is specified so it default to dark-red text on light-pink background.
 $ContainsBlanks = New-ConditionalText -ConditionalType ContainsBlanks

 $data = $(
-    New-PSItem a b c (echo p1 p2 p3)
+    New-PSItem a b c @('p1', 'p2', 'p3')
    New-PSItem
    New-PSItem d e f
    New-PSItem
--- a/Examples/ConditionalFormatting/Databar.ps1
+++ b/Examples/ConditionalFormatting/Databar.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $path = "$env:temp\test.xlsx"
 Remove-Item -Path $path -ErrorAction Ignore
@@ -10,23 +10,23 @@ $excel = Get-Process |

 $sheet = $excel.Workbook.Worksheets["Processes"]

-#Apply fixed formatting to columns. Set-Format is an Alias for Set-Excel Range, -NFormat is an alias for numberformat
+#Apply fixed formatting to columns.  -NFormat is an alias for numberformat
 $sheet.Column(1) | Set-ExcelRange -Bold -AutoFit
-$sheet.Column(2) | Set-Format -Width 29 -WrapText
-$sheet.Column(3) | Set-Format -HorizontalAlignment Right -NFormat "#,###"
+$sheet.Column(2) | Set-ExcelRange -Width 29 -WrapText
+$sheet.Column(3) | Set-ExcelRange -HorizontalAlignment Right -NFormat "#,###"

 Set-ExcelRange -Range -Address $sheet.Cells["E1:H1048576"]  -HorizontalAlignment Right -NFormat "#,###"
-#Set-Format is an alias for Set-ExcelRange
-Set-Format -Range   $sheet.Column(4)  -HorizontalAlignment Right -NFormat "#,##0.0" -Bold
-#In Set-ExcelRange / Set-Format "-Address" is an alias for "-Range"
-Set-Format -Address $sheet.Row(1) -Bold -HorizontalAlignment Center
+
+Set-ExcelRange -Range   $sheet.Column(4)  -HorizontalAlignment Right -NFormat "#,##0.0" -Bold
+#In Set-ExcelRange   "-Address" is an alias for "-Range"
+Set-ExcelRange -Address $sheet.Row(1) -Bold -HorizontalAlignment Center

 #Create a Red Data-bar for the values in Column D
-Add-ConditionalFormatting -WorkSheet $sheet -Address "D2:D1048576" -DataBarColor Red
+Add-ConditionalFormatting -Worksheet $sheet -Address "D2:D1048576" -DataBarColor Red
 # Conditional formatting applies to "Addreses" aliases allow either "Range" or "Address" to be used in Set-ExcelRange or Add-Conditional formatting.
-Add-ConditionalFormatting -WorkSheet $sheet -Range  "G2:G1048576" -RuleType GreaterThan -ConditionValue "104857600"  -ForeGroundColor Red
+Add-ConditionalFormatting -Worksheet $sheet -Range  "G2:G1048576" -RuleType GreaterThan -ConditionValue "104857600"  -ForeGroundColor Red

-foreach ($c in 5..9) {Set-Format -Address $sheet.Column($c)  -AutoFit }
+foreach ($c in 5..9) {Set-ExcelRange -Address $sheet.Column($c)  -AutoFit }

 #Create a pivot and save the file.
 Export-Excel -ExcelPackage $excel -WorkSheetname "Processes" -IncludePivotChart -ChartType ColumnClustered -NoLegend -PivotRows company  -PivotData @{'Name'='Count'}  -Show
--- a/Examples/ConditionalFormatting/FormatCalculations.ps1
+++ b/Examples/ConditionalFormatting/FormatCalculations.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = "$env:TEMP\testExport.xlsx"

@@ -6,7 +6,7 @@ Remove-Item $f -ErrorAction Ignore

 $data = $(

-    New-PSItem North 111 (echo Region Amount )
+    New-PSItem North 111 @( 'Region', 'Amount' )
    New-PSItem East 111
    New-PSItem West 122
    New-PSItem South 200
@@ -21,8 +21,8 @@ $data = $(
    New-PSItem Westerly 120
    New-PSItem SouthWest 118
 )
-# in this example instead of doing $variable = New-Conditional text <parameters> .... ; Export-excel -conditionalText $variable <other parameters>
-# the syntax is used is Export-excel -conditionalText (New-Conditional text <parameters>) <other parameters>
+# in this example instead of doing $variable = New-Conditional text <parameters> .... ; Export-excel -ConditionalText $variable <other parameters>
+# the syntax is used is Export-excel -ConditionalText (New-Conditional text <parameters>) <other parameters>


 #$data  | Export-Excel $f -Show -AutoSize -ConditionalText (New-ConditionalText -ConditionalType AboveAverage)
--- a/Examples/ConditionalFormatting/GenDates.ps1
+++ b/Examples/ConditionalFormatting/GenDates.ps1
@@ -1,6 +1,6 @@
 function Get-DateOffset {
    param($days=0)
-    
+
    (Get-Date).AddDays($days).ToShortDateString()
 }

@@ -8,7 +8,7 @@ function Get-Number {
    Get-Random -Minimum 10 -Maximum 100
 }

-New-PSItem (Get-DateOffset -7)  (Get-Number) 'LastWeek,Last7Days,ThisMonth' (echo Date Amount Label)
+New-PSItem (Get-DateOffset -7)  (Get-Number) 'LastWeek,Last7Days,ThisMonth' @('Date', 'Amount', 'Label')
 New-PSItem (Get-DateOffset)     (Get-Number) 'Today,ThisMonth,ThisWeek'
 New-PSItem (Get-DateOffset -30) (Get-Number) LastMonth
 New-PSItem (Get-DateOffset -1)  (Get-Number) 'Yesterday,ThisMonth,ThisWeek'
--- a/Examples/ConditionalFormatting/GetProcess.ps1
+++ b/Examples/ConditionalFormatting/GetProcess.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item "$env:TEMP\testExport.xlsx" -ErrorAction Ignore

--- a/Examples/ConditionalFormatting/Highlight-Last7Days.ps1
+++ b/Examples/ConditionalFormatting/Highlight-Last7Days.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-LastMonth.ps1
+++ b/Examples/ConditionalFormatting/Highlight-LastMonth.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-LastWeek.ps1
+++ b/Examples/ConditionalFormatting/Highlight-LastWeek.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-NextMonth.ps1
+++ b/Examples/ConditionalFormatting/Highlight-NextMonth.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-NextWeek.ps1
+++ b/Examples/ConditionalFormatting/Highlight-NextWeek.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-ThisMonth.ps1
+++ b/Examples/ConditionalFormatting/Highlight-ThisMonth.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-ThisWeek.ps1
+++ b/Examples/ConditionalFormatting/Highlight-ThisWeek.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-Today.ps1
+++ b/Examples/ConditionalFormatting/Highlight-Today.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-Tomorrow.ps1
+++ b/Examples/ConditionalFormatting/Highlight-Tomorrow.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/Highlight-Yesterday.ps1
+++ b/Examples/ConditionalFormatting/Highlight-Yesterday.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

--- a/Examples/ConditionalFormatting/HighlightDuplicates.ps1
+++ b/Examples/ConditionalFormatting/HighlightDuplicates.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"

@@ -6,7 +6,7 @@ Remove-Item $f -ErrorAction Ignore

 $data = $(

-    New-PSItem North 111 (echo Region Amount )
+    New-PSItem North 111 @('Region', 'Amount' )
    New-PSItem East 11
    New-PSItem West 12
    New-PSItem South 1000
--- a/Examples/ConditionalFormatting/MonthlyTemperatuesDatabar.ps1
+++ b/Examples/ConditionalFormatting/MonthlyTemperatuesDatabar.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item -Path .\test.xlsx -ErrorAction Ignore

@@ -20,6 +20,6 @@ Dec,44,63,46
    Export-Excel -Path .\test.xlsx -WorkSheetname Sheet1 -AutoNameRange -AutoSize -Title "Monthly Temperatures" -PassThru

 $sheet = $excel.Workbook.Worksheets["Sheet1"]
-Add-ConditionalFormatting -WorkSheet $sheet -Range "B1:D14" -DataBarColor CornflowerBlue
+Add-ConditionalFormatting -Worksheet $sheet -Range "B1:D14" -DataBarColor CornflowerBlue

 Close-ExcelPackage $excel -Show
--- a/Examples/ConditionalFormatting/RangeFormatting.ps1
+++ b/Examples/ConditionalFormatting/RangeFormatting.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = ".\testExport.xlsx"
 Remove-Item $f -ErrorAction Ignore
@@ -8,7 +8,7 @@ function Get-DateOffset ($days=0) {
 }

 $(
-    New-PSItem (Get-DateOffset -1) (Get-DateOffset 1) (echo Start End)
+    New-PSItem (Get-DateOffset -1) (Get-DateOffset 1) @("Start", "End")
    New-PSItem (Get-DateOffset) (Get-DateOffset 7)
    New-PSItem (Get-DateOffset -10) (Get-DateOffset -1)
 ) |
--- a/Examples/ConditionalFormatting/SalesReportWithDatabar.ps1
+++ b/Examples/ConditionalFormatting/SalesReportWithDatabar.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item -Path .\test.xlsx -ErrorAction Ignore

@@ -14,9 +14,9 @@ Jun,621
     Export-Excel -Path .\test.xlsx -WorkSheetname Sheet1 -AutoNameRange -PassThru

 $sheet = $excel.Workbook.Worksheets["Sheet1"]
-Add-ConditionalFormatting -WorkSheet $sheet -Range "B1:B7" -DataBarColor LawnGreen
+Add-ConditionalFormatting -Worksheet $sheet -Range "B1:B7" -DataBarColor LawnGreen

-Set-Format -Address $sheet.Cells["A8"] -Value "Total"
-Set-Format -Address $sheet.Cells["B8"] -Formula "=Sum(Sales)"
+Set-ExcelRange -Address $sheet.Cells["A8"] -Value "Total"
+Set-ExcelRange -Address $sheet.Cells["B8"] -Formula "=Sum(Sales)"

 Close-ExcelPackage $excel -Show
--- a/Examples/ConditionalFormatting/TextComparisons.ps1
+++ b/Examples/ConditionalFormatting/TextComparisons.ps1
@@ -1,7 +1,7 @@
-try {ipmo ..\..\ImportExcel.psd1 -Force} catch {}
+try {Import-Module ..\..\ImportExcel.psd1 -Force} catch {throw ; return}

 $data = $(
-    New-PSItem 100 (echo test testx)
+    New-PSItem 100 @('test', 'testx')
    New-PSItem 200
    New-PSItem 300
    New-PSItem 400
@@ -11,8 +11,8 @@ $data = $(
 $file1 = "$env:Temp\tryComparison1.xlsx"
 $file2 = "$env:Temp\tryComparison2.xlsx"

-rm $file1 -ErrorAction Ignore
-rm $file2 -ErrorAction Ignore
+Remove-Item -Path $file1 -ErrorAction Ignore
+Remove-Item -Path  $file2 -ErrorAction Ignore

 $data | Export-Excel $file1 -Show -ConditionalText $(
    New-ConditionalText -ConditionalType GreaterThan 300
--- a/Examples/ConvertFrom/ConvertFrom.ps1
+++ b/Examples/ConvertFrom/ConvertFrom.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 ConvertFrom-ExcelToSQLInsert People .\testSQLGen.xlsx

--- a/Examples/CustomReporting/CustomReport.ps1
+++ b/Examples/CustomReporting/CustomReport.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $f = "$env:temp\dashboard.xlsx"
 Remove-Item $f -ErrorAction Ignore
@@ -22,51 +22,51 @@ $sheet1 = $excel.Workbook.Worksheets["sheet1"]
 $sheet1.View.ShowGridLines = $false
 $sheet1.View.ShowHeaders = $false

-Set-Format -Address $sheet1.Cells["C:C"] -NumberFormat "$#,##0" -WrapText -HorizontalAlignment Center
-Set-Format -Address $sheet1.Cells["D:D"] -NumberFormat "#.#0%"  -WrapText -HorizontalAlignment Center
+Set-ExcelRange -Address $sheet1.Cells["C:C"] -NumberFormat "$#,##0" -WrapText -HorizontalAlignment Center
+Set-ExcelRange -Address $sheet1.Cells["D:D"] -NumberFormat "#.#0%"  -WrapText -HorizontalAlignment Center

-Set-Format -Address $sheet1.Cells["E:E"] -NumberFormat "$#,##0" -WrapText -HorizontalAlignment Center
-Set-Format -Address $sheet1.Cells["F:F"] -NumberFormat "#.#0%"  -WrapText -HorizontalAlignment Center
+Set-ExcelRange -Address $sheet1.Cells["E:E"] -NumberFormat "$#,##0" -WrapText -HorizontalAlignment Center
+Set-ExcelRange -Address $sheet1.Cells["F:F"] -NumberFormat "#.#0%"  -WrapText -HorizontalAlignment Center

-Set-Format -Address $sheet1.Cells["G:H"] -WrapText -HorizontalAlignment Center
+Set-ExcelRange -Address $sheet1.Cells["G:H"] -WrapText -HorizontalAlignment Center

 ## Insert Rows/Columns
 $sheet1.InsertRow(1, 1)

-foreach ($col in Write-Output 2 4 6 8 10 12 14) {
+foreach ($col in @(2, 4, 6, 8, 10, 12, 14)) {
    $sheet1.InsertColumn($col, 1)
    $sheet1.Column($col).width = .75
 }

-Set-Format -Address $sheet1.Cells["E:E"] -Width 12
-Set-Format -Address $sheet1.Cells["I:I"] -Width 12
+Set-ExcelRange -Address $sheet1.Cells["E:E"] -Width 12
+Set-ExcelRange -Address $sheet1.Cells["I:I"] -Width 12

 $BorderBottom = "Thick"
 $BorderColor = "Black"

-Set-Format -Address $sheet1.Cells["A2"]    -BorderBottom $BorderBottom -BorderColor $BorderColor
+Set-ExcelRange -Address $sheet1.Cells["A2"]    -BorderBottom $BorderBottom -BorderColor $BorderColor

-Set-Format -Address $sheet1.Cells["C2"]    -BorderBottom $BorderBottom -BorderColor $BorderColor
-Set-Format -Address $sheet1.Cells["E2:G2"] -BorderBottom $BorderBottom -BorderColor $BorderColor
-Set-Format -Address $sheet1.Cells["I2:K2"] -BorderBottom $BorderBottom -BorderColor $BorderColor
-Set-Format -Address $sheet1.Cells["M2:O2"] -BorderBottom $BorderBottom -BorderColor $BorderColor
+Set-ExcelRange -Address $sheet1.Cells["C2"]    -BorderBottom $BorderBottom -BorderColor $BorderColor
+Set-ExcelRange -Address $sheet1.Cells["E2:G2"] -BorderBottom $BorderBottom -BorderColor $BorderColor
+Set-ExcelRange -Address $sheet1.Cells["I2:K2"] -BorderBottom $BorderBottom -BorderColor $BorderColor
+Set-ExcelRange -Address $sheet1.Cells["M2:O2"] -BorderBottom $BorderBottom -BorderColor $BorderColor

-Set-Format -Address $sheet1.Cells["A2:C8"] -FontColor Gray
+Set-ExcelRange -Address $sheet1.Cells["A2:C8"] -FontColor Gray

 $HorizontalAlignment = "Center"
-Set-Format -Address $sheet1.Cells["F1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Revenue
-Set-Format -Address $sheet1.Cells["J1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Margin
-Set-Format -Address $sheet1.Cells["N1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Passenger
+Set-ExcelRange -Address $sheet1.Cells["F1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Revenue
+Set-ExcelRange -Address $sheet1.Cells["J1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Margin
+Set-ExcelRange -Address $sheet1.Cells["N1"] -HorizontalAlignment $HorizontalAlignment -Bold -Value Passenger

-Set-Format -Address $sheet1.Cells["E2"] -Value '($)'
-Set-Format -Address $sheet1.Cells["G2"] -Value '%'
-Set-Format -Address $sheet1.Cells["I2"] -Value '($)'
-Set-Format -Address $sheet1.Cells["K2"] -Value '%'
+Set-ExcelRange -Address $sheet1.Cells["E2"] -Value '($)'
+Set-ExcelRange -Address $sheet1.Cells["G2"] -Value '%'
+Set-ExcelRange -Address $sheet1.Cells["I2"] -Value '($)'
+Set-ExcelRange -Address $sheet1.Cells["K2"] -Value '%'

-Set-Format -Address $sheet1.Cells["C10"] -HorizontalAlignment Right -Bold -Value "Grand Total Calculation"
-Set-Format -Address $sheet1.Cells["E10"] -Formula "=Sum(E3:E8)" -Bold
-Set-Format -Address $sheet1.Cells["I10"] -Formula "=Sum(I3:I8)" -Bold
-Set-Format -Address $sheet1.Cells["M10"] -Formula "=Sum(M3:M8)" -Bold
-Set-Format -Address $sheet1.Cells["O10"] -Formula "=Sum(O3:O8)" -Bold
+Set-ExcelRange -Address $sheet1.Cells["C10"] -HorizontalAlignment Right -Bold -Value "Grand Total Calculation"
+Set-ExcelRange -Address $sheet1.Cells["E10"] -Formula "=Sum(E3:E8)" -Bold
+Set-ExcelRange -Address $sheet1.Cells["I10"] -Formula "=Sum(I3:I8)" -Bold
+Set-ExcelRange -Address $sheet1.Cells["M10"] -Formula "=Sum(M3:M8)" -Bold
+Set-ExcelRange -Address $sheet1.Cells["O10"] -Formula "=Sum(O3:O8)" -Bold

 Close-ExcelPackage $excel -Show
--- a/Examples/CustomizeExportExcel/Out-Excel.ps1
+++ b/Examples/CustomizeExportExcel/Out-Excel.ps1
@@ -10,7 +10,7 @@
       Preset2 will set AutoFilter and add the Title "Daily Report".
       (see comments and code below).
 #>
-Function Out-Excel {
+function Out-Excel {
    [CmdletBinding(DefaultParameterSetName = 'Default')]
    param(
        [switch]
--- a/Examples/ExcelDataValidation/MutipleValidations.ps1
+++ b/Examples/ExcelDataValidation/MutipleValidations.ps1
@@ -13,7 +13,7 @@
        * Add .01 in column F
 #>

-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $path = "$Env:TEMP\DataValidation.xlsx"
 Remove-Item $path -ErrorAction SilentlyContinue
@@ -39,7 +39,7 @@ $excelPackage = @('Chisel', 'Crowbar', 'Drill', 'Hammer', 'Nails', 'Saw', 'Screw

 #region Creating a list using a PowerShell array
 $ValidationParams = @{
-    WorkSheet        = $excelPackage.sales
+    Worksheet        = $excelPackage.sales
    ShowErrorMessage = $true
    ErrorStyle       = 'stop'
    ErrorTitle       = 'Invalid Data'
--- a/Examples/ExcelToSQLInsert/DemoSQLInsert.ps1
+++ b/Examples/ExcelToSQLInsert/DemoSQLInsert.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 ConvertFrom-ExcelToSQLInsert -TableName "Movies" -Path ".\Movies.xlsx" -ConvertEmptyStringsToNull
 ''
--- a/Examples/Fibonacci/ShowFibonacci.ps1
+++ b/Examples/Fibonacci/ShowFibonacci.ps1
@@ -1,6 +1,6 @@
 param ($fibonacciDigits=10)

-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "fib.xlsx"
 Remove-Item "fib.xlsx" -ErrorAction Ignore
--- a/Examples/FormatCellStyles/ApplyFormatInScriptBlock.ps1
+++ b/Examples/FormatCellStyles/ApplyFormatInScriptBlock.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlfile = "$env:temp\testFmt.xlsx"

--- a/Examples/FormatCellStyles/ApplyStyle.ps1
+++ b/Examples/FormatCellStyles/ApplyStyle.ps1
@@ -16,9 +16,9 @@ $pkg = $data | Export-Excel -Path $f -AutoSize -PassThru

 $ws = $pkg.Workbook.Worksheets["Sheet1"]

-Set-ExcelRange -WorkSheet $ws -Range "A2:C6" -BackgroundColor PeachPuff -FontColor Purple        -FontSize 12 -Width 12
-Set-ExcelRange -WorkSheet $ws -Range "D2:D6" -BackgroundColor WhiteSmoke -FontColor Orange -Bold -FontSize 12 -Width 12
-Set-ExcelRange -WorkSheet $ws -Range "A1:D1" -BackgroundColor BlueViolet -FontColor Wheat        -FontSize 12 -Width 12
-Set-ExcelRange -WorkSheet $ws -Range "A:A"                                                                    -Width 15
+Set-ExcelRange -Worksheet $ws -Range "A2:C6" -BackgroundColor PeachPuff -FontColor Purple        -FontSize 12 -Width 12
+Set-ExcelRange -Worksheet $ws -Range "D2:D6" -BackgroundColor WhiteSmoke -FontColor Orange -Bold -FontSize 12 -Width 12
+Set-ExcelRange -Worksheet $ws -Range "A1:D1" -BackgroundColor BlueViolet -FontColor Wheat        -FontSize 12 -Width 12
+Set-ExcelRange -Worksheet $ws -Range "A:A"                                                                    -Width 15

 Close-ExcelPackage -ExcelPackage $pkg -Show
--- a/Examples/FormatCellStyles/PassInScriptBlock.ps1
+++ b/Examples/FormatCellStyles/PassInScriptBlock.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlfile = "$env:temp\testFmt.xlsx"
 Remove-Item $xlfile -ErrorAction Ignore
@@ -11,7 +11,7 @@ $RandomStyle = {
    )

    2..$totalRows | ForEach-Object{
-        Set-CellStyle $workSheet $_ $LastColumn Solid (Write-Output LightGreen Gray Red|Get-Random)
+        Set-CellStyle $workSheet $_ $LastColumn Solid (Get-Random @("LightGreen", "Gray", "Red"))
    }
 }

--- a/Examples/GenerateData/GenDataForCustomReport.ps1
+++ b/Examples/GenerateData/GenDataForCustomReport.ps1
@@ -1,26 +1,26 @@
-if(!(gcm ig -ErrorAction SilentlyContinue)) {
+if(!(Get-Command ig -ErrorAction SilentlyContinue)) {

    "Use ``Install-Module NameIT`` to get the needed module from the gallery to support running this script"

    return
-} 
+}

-$sign=@{sign=echo + -}
-$location=@{location=echo Atlanta Newark Washington Chicago Philadelphia Houston Phoneix}
+$sign=@{sign=@( "+", "-" )}
+$location=@{location=@("Atlanta", "Newark", "Washington", "Chicago", "Philadelphia", "Houston", "Phoneix")}

 $(1..6 | Foreach-Object {
-    
+
    $from=$to=""
    while($from -eq $to) {
        $from=ig "[location]" -CustomData $location
        $to=ig "[location]" -CustomData $location
-    }    
+    }

    [double]$a=ig "########"
    [double]$b=ig ".####"
    [double]$c=ig "#######"
    [double]$d=ig "[sign].##" -CustomData $sign
-    [double]$e=ig "###" 
+    [double]$e=ig "###"
    [double]$f=ig "[sign]##" -CustomData $sign

    #"{0},{1},{2},{3},{4},{5},{6},{7}" -f $from, $to, $a, $b, $c, $d, $e, $f
--- a/Examples/Grouping/TimestampBucket.ps1
+++ b/Examples/Grouping/TimestampBucket.ps1
@@ -13,7 +13,7 @@ Timestamp,Tenant
 10/29/2018 3:01:40.989,1
 10/29/2018 3:01:50.545,1
 10/29/2018 3:02:00.999,1
-"@ | Select-Object @{n = 'Timestamp'; e = {get-date $_.timestamp}}, tenant, @{n = 'Bucket'; e = { - (get-date $_.timestamp).Second % 30}}
+"@ | Select-Object @{n = 'Timestamp'; e = {Get-date $_.timestamp}}, tenant, @{n = 'Bucket'; e = { - (Get-date $_.timestamp).Second % 30}}

 $f = "$env:temp\pivottest.xlsx"
 Remove-Item $f -ErrorAction SilentlyContinue
--- a/Examples/HyperLinks/Hyperlinks.ps1
+++ b/Examples/HyperLinks/Hyperlinks.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

@"
 site,link
--- a/Examples/ImportHtml/DemoGraphics.ps1
+++ b/Examples/ImportHtml/DemoGraphics.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}


 Import-Html "http://en.wikipedia.org/wiki/Demographics_of_India" 4
--- a/Examples/ImportHtml/PeriodicElements.ps1
+++ b/Examples/ImportHtml/PeriodicElements.ps1
@@ -1,3 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Import-Html "http://www.science.co.il/PTelements.asp" 1
--- a/Examples/ImportHtml/StarTrek.ps1
+++ b/Examples/ImportHtml/StarTrek.ps1
@@ -1,3 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Import-Html "https://en.wikipedia.org/wiki/List_of_Star_Trek:_The_Original_Series_episodes" 2
--- a/Examples/Index
+++ b/Examples/Index
@@ -1,5 +1,5 @@
 #requires -modules "Get-IndexedItem"
-[cmdletbinding()]
+[CmdletBinding()]
 Param()
 Remove-Item ~\documents\music.xlsx -ErrorAction SilentlyContinue
 [System.Diagnostics.Stopwatch]$stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
@@ -22,7 +22,7 @@ $ws    = $excel.Music
 Set-ExcelRow    -Worksheet $ws -Row 1 -Value {($worksheet.cells[$row,$column].value -replace '^SYSTEM\.','') -replace '^MEDIA\.|^AUDIO\.|^MUSIC\.','' }
 Set-ExcelColumn -Worksheet $ws -Column 5 -NumberFormat 'mm:ss.0' -StartRow 2 -Value {$worksheet.cells[$row,$column].value / 864000000000 }
 Write-Verbose -Message ("Cells Reset: " + $stopwatch.Elapsed.TotalSeconds)
-Set-Column      -Worksheet $ws -Column 6 -NumberFormat '#.#,,"MB"'
+Set-ExcelColumn -Worksheet $ws -Column 6 -NumberFormat '#.#,,"MB"'
 Set-ExcelColumn -Worksheet $ws -Column 7 -NumberFormat '0.0,"KHz"'
 $ws.Cells[$ws.Dimension].AutoFitColumns()

--- a/Examples/JoinWorksheet/Join-worksheet-blocks.sample.ps1
+++ b/Examples/JoinWorksheet/Join-worksheet-blocks.sample.ps1
@@ -2,7 +2,7 @@
 $path = "$env:TEMP\Test.xlsx"
 Remove-item -Path $path -ErrorAction SilentlyContinue
 #Export disk volume, and Network adapter to their own sheets.
-Get-WmiObject -Class win32_logicaldisk |
+Get-CimInstance -ClassName Win32_LogicalDisk   |
    Select-Object -Property DeviceId,VolumeName, Size,Freespace |
        Export-Excel -Path $path -WorkSheetname Volumes -NumberFormat "0,000"
 Get-NetAdapter  |
--- a/Examples/JoinWorksheet/JoinSalesData.ps1
+++ b/Examples/JoinWorksheet/JoinSalesData.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlfile = "$env:temp\AllSales.xlsx"

--- a/Examples/JustCharts/CentralLimitTheorem.ps1
+++ b/Examples/JustCharts/CentralLimitTheorem.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 ColumnChart -Title "Central Limit Theorem" -NoLegend ($(
        for ($i = 1; $i -le 500; $i++) {
--- a/Examples/JustCharts/PieChartHandles.ps1
+++ b/Examples/JustCharts/PieChartHandles.ps1
@@ -2,7 +2,7 @@
 # Sum up handles by company
 # Show the Pie Chart

-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 PieChart -Title "Total Handles by Company" `
    (Invoke-Sum (Get-Process | Where-Object company) company handles)
--- a/Examples/JustCharts/PieChartPM.ps1
+++ b/Examples/JustCharts/PieChartPM.ps1
@@ -2,7 +2,7 @@
 # Sum up PM by company
 # Show the Pie Chart

-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 PieChart -Title "Total PM by Company" `
    (Invoke-Sum (Get-Process|Where-Object company) company pm)
--- a/Examples/JustCharts/TargetData.ps1
+++ b/Examples/JustCharts/TargetData.ps1
@@ -1,4 +1,4 @@
-$PropertyNames = echo Cost Date Name
+$PropertyNames = @("Cost", "Date", "Name")

 New-PSItem 1.1  1/1/2015 John $PropertyNames
 New-PSItem 2.1  1/2/2015 Tom
--- a/Examples/JustCharts/TryBarChart.ps1
+++ b/Examples/JustCharts/TryBarChart.ps1
@@ -1,3 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 BarChart (.\TargetData.ps1) "A BarChart"
--- a/Examples/JustCharts/TryColumnChart.ps1
+++ b/Examples/JustCharts/TryColumnChart.ps1
@@ -1,3 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 ColumnChart (.\TargetData.ps1) "A ColumnChart"
--- a/Examples/JustCharts/TryPieChart.ps1
+++ b/Examples/JustCharts/TryPieChart.ps1
@@ -1,3 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 PieChart (.\TargetData.ps1) "A PieChart"
--- a/Examples/MergeWorkSheet/MergeCSV.ps1
+++ b/Examples/MergeWorkSheet/MergeCSV.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlFile = "$env:TEMP\mw.xlsx"

--- a/Examples/MergeWorkSheet/Merge_2_Servers_Services.ps1
+++ b/Examples/MergeWorkSheet/Merge_2_Servers_Services.ps1
@@ -1,7 +1,7 @@
 Remove-Item -Path  "$env:temp\server*.xlsx" , "$env:temp\Combined*.xlsx" -ErrorAction SilentlyContinue

 #Get a subset of services into $s and export them
-[System.Collections.ArrayList]$s = get-service | Select-Object -first 25 -Property *
+[System.Collections.ArrayList]$s = Get-service | Select-Object -first 25 -Property *
 $s | Export-Excel -Path $env:temp\server1.xlsx

 #$s is a zero based array, excel rows are 1 based and excel has a header row so Excel rows will be 2 + index in $s.
--- a/Examples/MergeWorkSheet/Merge_3_Servers_Services.ps1
+++ b/Examples/MergeWorkSheet/Merge_3_Servers_Services.ps1
@@ -1,7 +1,7 @@
 Remove-Item -Path  "$env:temp\server*.xlsx" , "$env:temp\Combined*.xlsx" -ErrorAction SilentlyContinue

 #Get a subset of services into $s and export them
-[System.Collections.ArrayList]$s = get-service | Select-Object -first 25 -Property Name,DisplayName,StartType
+[System.Collections.ArrayList]$s = Get-service | Select-Object -first 25 -Property Name,DisplayName,StartType
 $s | Export-Excel -Path $env:temp\server1.xlsx

 #$s is a zero based array, excel rows are 1 based and excel has a header row so Excel rows will be 2 + index in $s.
--- a/Examples/MortgageCalculator/MortgageCalculator.ps1
+++ b/Examples/MortgageCalculator/MortgageCalculator.ps1
@@ -9,6 +9,7 @@ param(
 )

 function New-CellData {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system state')]
    param(
        $Range,
        $Value,
@@ -16,7 +17,7 @@ function New-CellData {
    )

    $setFormatParams = @{
-        WorkSheet    = $ws
+        Worksheet    = $ws
        Range        = $Range
        NumberFormat = $Format
    }
@@ -28,7 +29,7 @@ function New-CellData {
        $setFormatParams.Value = $Value
    }

-    Set-Format @setFormatParams
+    Set-ExcelRange @setFormatParams
 }

 $f = "$PSScriptRoot\mortgage.xlsx"
@@ -37,19 +38,19 @@ Remove-Item $f -ErrorAction SilentlyContinue
 $pkg = "" | Export-Excel $f -Title 'Fixed Rate Loan Payments' -PassThru -AutoSize
 $ws = $pkg.Workbook.Worksheets["Sheet1"]

-New-CellData A3 'Amount'
-New-CellData B3 $Amount '$#,##0'
+New-CellData -Range A3 -Value 'Amount'
+New-CellData -Range B3 -Value $Amount -Format '$#,##0'

-New-CellData A4 "Interest Rate"
-New-CellData B4 $InterestRate 'Percentage'
+New-CellData -Range A4 -Value "Interest Rate"
+New-CellData -Range B4 -Value $InterestRate -Format 'Percentage'

-New-CellData A5 "Term (Years)"
-New-CellData B5 $Term
+New-CellData -Range A5 -Value "Term (Years)"
+New-CellData -Range B5 -Value $Term

-New-CellData D3 "Monthly Payment"
-New-CellData F3 "=-PMT(F4, B5*12, B3)" '$#,##0.#0'
+New-CellData -Range D3 -Value "Monthly Payment"
+New-CellData -Range F3 -Value "=-PMT(F4, B5*12, B3)" -Format '$#,##0.#0'

-New-CellData D4 "Monthly Rate"
-New-CellData F4 "=((1+B4)^(1/12))-1" 'Percentage'
+New-CellData -Range D4 -Value "Monthly Rate"
+New-CellData -Range F4 -Value "=((1+B4)^(1/12))-1" -Format 'Percentage'

 Close-ExcelPackage $pkg -Show
--- a/Examples/MoveSheets/MoveSheets.ps1
+++ b/Examples/MoveSheets/MoveSheets.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlfile = "$env:TEMP\testThis.xlsx"
 Remove-Item $xlfile -ErrorAction Ignore
--- a/Examples/Nasa/FireBalls.ps1
+++ b/Examples/Nasa/FireBalls.ps1
@@ -1,16 +1,17 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

-$header = echo `
-    'Date/Time - Peak Brightness (UT)' `
-    'Latitude (Deg)' `
-    'Longitude (Deg)' `
-    'Altitude (km)' `
-    'Velocity (km/s)' `
-    'Velocity Components (km/s) vx' `
-    'Velocity Components (km/s) vy' `
-    'Velocity Components (km/s) vz' `
-    'Total Radiated Energy (J)' `
+$header = @(
+    'Date/Time - Peak Brightness (UT)' ,
+    'Latitude (Deg)' ,
+    'Longitude (Deg)' ,
+    'Altitude (km)' ,
+    'Velocity (km/s)' ,
+    'Velocity Components (km/s) vx' ,
+    'Velocity Components (km/s) vy' ,
+    'Velocity Components (km/s) vz' ,
+    'Total Radiated Energy (J)' ,
    'Calculated Total Impact Energy (kt)'
+)

 $splat=@{
    url='http://neo.jpl.nasa.gov/fireballs/'
--- a/Examples/New-PSItem.ps1
+++ b/Examples/New-PSItem.ps1
@@ -1,5 +1,6 @@
 function New-PSItem {
-
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system state')]
+    param()
    $totalArgs = $args.Count

    if($args[-1] -is [array]) {
--- a/Examples/NumberFormat/ColorizeNumbers.ps1
+++ b/Examples/NumberFormat/ColorizeNumbers.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "$env:TEMP\disks.xlsx"

--- a/Examples/NumberFormat/CurrencyFormat.ps1
+++ b/Examples/NumberFormat/CurrencyFormat.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "$env:temp\disks.xlsx"

--- a/Examples/NumberFormat/PercentagFormat.ps1
+++ b/Examples/NumberFormat/PercentagFormat.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "disks.xlsx"

--- a/Examples/NumberFormat/PosNegNumbers.ps1
+++ b/Examples/NumberFormat/PosNegNumbers.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "disks.xlsx"

--- a/Examples/NumberFormat/Win32LogicalDisk.ps1
+++ b/Examples/NumberFormat/Win32LogicalDisk.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "disks.xlsx"

--- a/Examples/NumberFormat/Win32LogicalDiskFormatted.ps1
+++ b/Examples/NumberFormat/Win32LogicalDiskFormatted.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "disks.xlsx"

--- a/Examples/OutTabulator/start-demo.ps1
+++ b/Examples/OutTabulator/start-demo.ps1
@@ -3,10 +3,10 @@
 ## This is an overhaul of Jeffrey Snover's original Start-Demo script by Joel "Jaykul" Bennett
 ##
 ## I've switched it to using ReadKey instead of ReadLine (you don't have to hit Enter each time)
-## As a result, I've changed the names and keys for a lot of the operations, so that they make 
+## As a result, I've changed the names and keys for a lot of the operations, so that they make
 ## sense with only a single letter to tell them apart (sorry if you had them memorized).
 ##
-## I've also been adding features as I come across needs for them, and you'll contribute your 
+## I've also been adding features as I come across needs for them, and you'll contribute your
 ## improvements back to the PowerShell Script repository as well.
 ##################################################################################################
 ## Revision History (version 3.3)
@@ -32,12 +32,14 @@
 ##                 so you have a chance to "go back" after the last line of you demo
 ##################################################################################################
 ##
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingWriteHost', '', Justification='Correct and desirable usage')]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingInvokeExpression', '', Justification='Correct and desirable usage')]
 param(
-  $file=".\demo.txt", 
-  [int]$command=0, 
-  [System.ConsoleColor]$promptColor="Yellow", 
-  [System.ConsoleColor]$commandColor="White", 
-  [System.ConsoleColor]$commentColor="Green", 
+  $file=".\demo.txt",
+  [int]$command=0,
+  [System.ConsoleColor]$promptColor="Yellow",
+  [System.ConsoleColor]$commandColor="White",
+  [System.ConsoleColor]$commentColor="Green",
  [switch]$FullAuto,
  [int]$AutoSpeed = 3,
  [switch]$NoPauseAfterExecute
@@ -46,7 +48,7 @@ param(
 $RawUI = $Host.UI.RawUI
 $hostWidth = $RawUI.BufferSize.Width

-# A function for reading in a character 
+# A function for reading in a character
 function Read-Char() {
  $_OldColor = $RawUI.ForeGroundColor
  $RawUI.ForeGroundColor = "Red"
@@ -93,20 +95,20 @@ Write-Host -nonew -back black -fore $promptColor "for help.$(' ' * ($hostWidth -
 Write-Host -nonew -back black -fore $promptColor $(" " * $hostWidth)

 # We use a FOR and an INDEX ($_i) instead of a FOREACH because
-# it is possible to start at a different location and/or jump 
+# it is possible to start at a different location and/or jump
 # around in the order.
 for ($_i = $Command; $_i -lt $_lines.count; $_i++)
-{  
+{
 	# Put the current command in the Window Title along with the demo duration
 	$Dur = [DateTime]::Now - $_StartTime
-   $RawUI.WindowTitle = "$(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s   {3}" -f 
+   $RawUI.WindowTitle = "$(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s   {3}" -f
                        $dur.Hours, $dur.Minutes, $dur.Seconds, $($_Lines[$_i])

 	# Echo out the commmand to the console with a prompt as though it were real
 	Write-Host -nonew -fore $promptColor "[$_i]$([char]0x2265) "
-	if ($_lines[$_i].Trim(" ").StartsWith("#") -or $_lines[$_i].Trim(" ").Length -le 0) { 
+	if ($_lines[$_i].Trim(" ").StartsWith("#") -or $_lines[$_i].Trim(" ").Length -le 0) {
 		Write-Host -fore $commentColor "$($_Lines[$_i])  "
-		continue 
+		continue
 	} else {
 		Write-Host -nonew -fore $commandColor "$($_Lines[$_i])  "
 	}
@@ -119,7 +121,7 @@ for ($_i = $Command; $_i -lt $_lines.count; $_i++)

 Running demo: $file
 (n) Next       (p) Previous
-(q) Quit       (s) Suspend 
+(q) Quit       (s) Suspend
 (t) Timecheck  (v) View $(split-path $file -leaf)
 (g) Go to line by number
 (f) Find lines by string
@@ -148,15 +150,15 @@ Running demo: $file
 			break;
 		}
 		"v" { # View Source
-			$lines[0..($_i-1)] | Write-Host -Fore Yellow 
+			$lines[0..($_i-1)] | Write-Host -Fore Yellow
 			$lines[$_i]        | Write-Host -Fore Green
-			$lines[($_i+1)..$lines.Count] | Write-Host -Fore Yellow 
+			$lines[($_i+1)..$lines.Count] | Write-Host -Fore Yellow
 			$_i-- # back a line, we're gonna step forward when we loop
 		}
 		"t" { # Time Check
 			 $dur = [DateTime]::Now - $_StartTime
       Write-Host -Fore $promptColor $(
-          "{3} -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s" -f 
+          "{3} -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s" -f
          $dur.Hours, $dur.Minutes, $dur.Seconds, ([DateTime]::Now.ToShortTimeString()))
 			 $_i-- # back a line, we're gonna step forward when we loop
 		}
@@ -170,7 +172,7 @@ Running demo: $file
 			if($i -le $_lines.Count) {
 				if($i -gt 0) {
               # extra line back because we're gonna step forward when we loop
-               $_i = Rewind $_lines $_i (($_i-$i)+1)
+               $_i = Rewind -lines $_lines -index $_i -steps (($_i-$i)+1)
 				} else {
 					$_i = -1 # Start negative, because we step forward when we loop
 				}
@@ -178,18 +180,18 @@ Running demo: $file
 		}
 		"f" { # Find by pattern
 			$match = $_lines | Select-String (Read-Host "search string")
-			if($match -eq $null) {
+			if($null -eq $match) {
 				Write-Host -Fore Red "Can't find a matching line"
 			} else {
-				$match | % { Write-Host -Fore $promptColor $("[{0,2}] {1}" -f ($_.LineNumber - 1), $_.Line) }
+				$match | ForEach-Object { Write-Host -Fore $promptColor $("[{0,2}] {1}" -f ($_.LineNumber - 1), $_.Line) }
 				if($match.Count -lt 1) {
 					$_i = $match.lineNumber - 2  # back a line, we're gonna step forward when we loop
-				} else {               
+				} else {
 					$_i-- # back a line, we're gonna step forward when we loop
 				}
 			}
 		}
-      "c" { 
+      "c" {
         Clear-Host
         $_i-- # back a line, we're gonna step forward when we loop
      }
@@ -197,7 +199,7 @@ Running demo: $file
 			Write-Host
 			trap [System.Exception] {Write-Error $_; continue;}
 			Invoke-Expression ($_lines[$_i]) | out-default
-			if(-not $NoPauseAfterExecute -and -not $FullAuto) { 
+			if(-not $NoPauseAfterExecute -and -not $FullAuto) {
 				$null = $RawUI.ReadKey("NoEcho,IncludeKeyUp")  # Pause after output for no apparent reason... ;)
 			}
 		}
@@ -210,7 +212,7 @@ Running demo: $file
 }
 $dur = [DateTime]::Now - $_StartTime
 Write-Host -Fore $promptColor $(
-   "<Demo Complete -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s>" -f 
+   "<Demo Complete -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s>" -f
   $dur.Hours, $dur.Minutes, $dur.Seconds, [DateTime]::Now.ToLongTimeString())
 Write-Host -Fore $promptColor $([DateTime]::now)
 Write-Host
--- a/Examples/PassThru/TryPassThru.ps1
+++ b/Examples/PassThru/TryPassThru.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $file = "$env:Temp\sales.xlsx"

--- a/Examples/PivotTable/MultiplePivotTables.ps1
+++ b/Examples/PivotTable/MultiplePivotTables.ps1
@@ -20,11 +20,11 @@ $pivotTableParams = @{
    PivotTableName  = "ByRegion"
    Address         = $excel.Sheet1.cells["F1"]
    SourceWorkSheet = $excel.Sheet1
-    PivotRows       = echo Region Fruit Date
+    PivotRows       = @("Region", "Fruit", "Date")
    PivotData       = @{'sold' = 'sum'}
    PivotTableStyle = 'Light21'
    GroupDateRow    = "Date"
-    GroupDatePart   = echo Years Quarters
+    GroupDatePart   = @("Years", "Quarters")
 }

 $pt = Add-PivotTable @pivotTableParams -PassThru
@@ -33,21 +33,21 @@ $pt.RowHeaderCaption = "By " + ($pivotTableParams.PivotRows -join ",")

 $pivotTableParams.PivotTableName = "ByFruit"
 $pivotTableParams.Address = $excel.Sheet1.cells["J1"]
-$pivotTableParams.PivotRows = echo Fruit Region Date
+$pivotTableParams.PivotRows = @("Fruit", "Region", "Date")

 $pt = Add-PivotTable @pivotTableParams -PassThru
 $pt.RowHeaderCaption = "By Fruit,Region"

 $pivotTableParams.PivotTableName = "ByDate"
 $pivotTableParams.Address = $excel.Sheet1.cells["N1"]
-$pivotTableParams.PivotRows = echo Date Region Fruit
+$pivotTableParams.PivotRows = @("Date", "Region", "Fruit")

 $pt = Add-PivotTable @pivotTableParams -PassThru
 $pt.RowHeaderCaption = "By Date,Region,Fruit"

 $pivotTableParams.PivotTableName = "ByYears"
 $pivotTableParams.Address = $excel.Sheet1.cells["S1"]
-$pivotTableParams.GroupDatePart = echo Years
+$pivotTableParams.GroupDatePart = "Years"

 $pt = Add-PivotTable @pivotTableParams -PassThru
 $pt.RowHeaderCaption = "By Years,Region"
--- a/Examples/PivotTable/PivotTableWithName.ps1
+++ b/Examples/PivotTable/PivotTableWithName.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $ExcelParams = @{
    Path              = "$env:TEMP\test1.xlsx"
--- a/Examples/PivotTableFilters/testPivotFilter.ps1
+++ b/Examples/PivotTableFilters/testPivotFilter.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlFile="$env:TEMP\testPivot.xlsx"
 Remove-Item $xlFile -ErrorAction Ignore
--- a/Examples/Plot/PlotCos.ps1
+++ b/Examples/Plot/PlotCos.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $plt = New-Plot
 $plt.Plot((Get-Range 0 5 .02|Foreach-Object {[math]::Cos(2*[math]::pi*$_)}))
--- a/Examples/ReadAllSheets/Get-ExcelSheets.ps1
+++ b/Examples/ReadAllSheets/Get-ExcelSheets.ps1
@@ -10,10 +10,10 @@ $hash = @{ }

 $e = Open-ExcelPackage $path

-foreach ($sheet in $e.workbook.worksheets) { 
-    $hash[$sheet.name] = Import-Excel -ExcelPackage $e -WorksheetName $sheet.name 
-} 
+foreach ($sheet in $e.workbook.worksheets) {
+    $hash[$sheet.name] = Import-Excel -ExcelPackage $e -WorksheetName $sheet.name
+}

-Close-ExcelPackage $e -NoSave 
+Close-ExcelPackage $e -NoSave

 $hash
--- a/Examples/ReadAllSheets/ReadAllSheets.ps1
+++ b/Examples/ReadAllSheets/ReadAllSheets.ps1
@@ -1,4 +1,4 @@
 $xlfile = "$env:TEMP\MultipleSheets.xlsx"

-.\GenerateXlsx.ps1 $xlfile 
-.\Get-ExcelSheets.ps1 $xlfile 
+.\GenerateXlsx.ps1 $xlfile
+.\Get-ExcelSheets.ps1 $xlfile
--- a/Examples/SQL+FillColumns+Pivot/Example.ps1
+++ b/Examples/SQL+FillColumns+Pivot/Example.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $sql           = @"
  SELECT     rootfile.baseName     ,  rootfile.extension   , Image.fileWidth         AS width             ,  image.fileHeight AS height ,
@@ -44,17 +44,17 @@ Remove-Item -Path "~\Documents\temp.xlsx" -ErrorAction SilentlyContinue
 $e = Send-SQLDataToExcel   -Path "~\Documents\temp.xlsx" -WorkSheetname "Sheet1" -Connection "DSN=LR" -SQL $sql -AutoSize -Passthru

 #Add columns, then format them and hide the ones which aren't of interest.
-Set-Column   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 21  -Value $Avalue  -Heading "Apperture"
-Set-Column   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 22  -Value $Svalue  -Heading "Shutter"
-Set-Column   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 23  -Value $Evvalue -Heading "Ev"
-Set-Format   -Address      $e.workbook.Worksheets["sheet1" ].Column(21) -HorizontalAlignment Left  -AutoFit
-Set-Format   -Address      $e.workbook.Worksheets["sheet1" ].Column(22) -HorizontalAlignment Right -AutoFit
+Set-ExcelColumn   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 21  -Value $Avalue  -Heading "Apperture"
+Set-ExcelColumn   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 22  -Value $Svalue  -Heading "Shutter"
+Set-ExcelColumn   -Worksheet    $e.workbook.Worksheets["sheet1"] -Column 23  -Value $Evvalue -Heading "Ev"
+Set-ExcelRange   -Address      $e.workbook.Worksheets["sheet1" ].Column(21) -HorizontalAlignment Left  -AutoFit
+Set-ExcelRange   -Address      $e.workbook.Worksheets["sheet1" ].Column(22) -HorizontalAlignment Right -AutoFit
@(5,6,7,13,15,16,17,18) | ForEach-Object {
-  Set-Format -Address      $e.workbook.Worksheets["sheet1" ].Column($_) -Hidden
+  Set-ExcelRange -Address      $e.workbook.Worksheets["sheet1" ].Column($_) -Hidden
 }

 #Center the column labels.
-Set-Format   -Address      $e.workbook.Worksheets["sheet1" ].Row(1)     -HorizontalAlignment Center
+Set-ExcelRange   -Address      $e.workbook.Worksheets["sheet1" ].Row(1)     -HorizontalAlignment Center

 #Format the data as a nice Table, Create the pivot table & chart defined above, show the file in Excel in excel after saving.
 Export-Excel -ExcelPackage $e      -WorkSheetname "sheet1"  -TableName  "Table" -PivotTableDefinition $pt -Show
@@ -78,11 +78,11 @@ $SQL     =  @"
 #Run the query and put the results in workshet "Winners", autosize the columns and hold on to the ExcelPackage object
 $Excel   =  Send-SQLDataToExcel -SQL $sql -Session $session -path .\demo3.xlsx -WorkSheetname "Winners"   -AutoSize -Passthru
 #Create and format columns for the ratio of Wins to poles and fast laps.
-Set-Column   -ExcelPackage $Excel -WorkSheetname "Winners" -column 6  -Heading "WinsToPoles" -Value {"=D$row/C$row"}
-Set-Column   -ExcelPackage $Excel -WorkSheetname "Winners" -column 7  -Heading "WinsToFast"  -Value {"=E$row/C$row"}
+Set-ExcelColumn   -ExcelPackage $Excel -WorkSheetname "Winners" -column 6  -Heading "WinsToPoles" -Value {"=D$row/C$row"}
+Set-ExcelColumn   -ExcelPackage $Excel -WorkSheetname "Winners" -column 7  -Heading "WinsToFast"  -Value {"=E$row/C$row"}
 6..7 | ForEach-Object {
-    Set-Format -Address    $Excel.Workbook.Worksheets["Winners"].column($_) -NumberFormat "0.0%" -AutoFit }
+    Set-ExcelRange -Address    $Excel.Workbook.Worksheets["Winners"].column($_) -NumberFormat "0.0%" -AutoFit }
 #Define a chart to show the relationship of lest on an XY Grid, create the ranges required in the, add the chart and show the file in Excel in excel after saving.
-$chart = New-ExcelChart -NoLegend -ChartType XYScatter -XRange WinsToFast -YRange WinsToPoles -ShowCategory -Column 7 -Width 2000 -Height 700
+$chart = New-ExcelChartDefinition -NoLegend -ChartType XYScatter -XRange WinsToFast -YRange WinsToPoles -ShowCategory -Column 7 -Width 2000 -Height 700
 Export-Excel -ExcelPackage $Excel -WorkSheetname "Winners" -AutoNameRange -ExcelChartDefinition $chart -Show

--- a/Examples/SQL+FillColumns+Pivot/Example2.ps1
+++ b/Examples/SQL+FillColumns+Pivot/Example2.ps1
@@ -1,6 +1,6 @@
 #requires -modules "getSql"

-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}
 #download f1Results from https://1drv.ms/f/s!AhfYu7-CJv4egbt5FD7Cdxi8jSz3aQ  and update the path below
 Get-SQL -Session f1 -Excel  -Connection C:\Users\mcp\OneDrive\Public\F1\f1Results.xlsx -showtables -Verbose

@@ -15,10 +15,10 @@ $Excel   =  Send-SQLDataToExcel -SQL $sql -Session $session -path .\demo3.xlsx -

 $ws = $Excel.Workbook.Worksheets["Winners"]

-Set-Row    -Worksheet $ws -Heading "Average"     -Value {"=Average($columnName`2:$columnName$endrow)"}  -NumberFormat "0.0"  -Bold
-Set-Column -Worksheet $ws -Heading "WinsToPoles" -Value {"=D$row/C$row"}           -Column 6            -AutoSize -AutoNameRange
-Set-Column -Worksheet $ws -Heading "WinsToFast"  -Value {"=E$row/C$row"}           -Column 7            -AutoSize -AutoNameRange
+Set-ExcelRow    -Worksheet $ws -Heading "Average"     -Value {"=Average($columnName`2:$columnName$endrow)"}  -NumberFormat "0.0"  -Bold
+Set-ExcelColumn  -Worksheet $ws -Heading "WinsToPoles" -Value {"=D$row/C$row"}           -Column 6            -AutoSize -AutoNameRange
+Set-ExcelColumn -Worksheet $ws -Heading "WinsToFast"  -Value {"=E$row/C$row"}           -Column 7            -AutoSize -AutoNameRange

-Set-Format -WorkSheet $ws -Range "F2:G50" -NumberFormat "0.0%"
-$chart = New-ExcelChart -NoLegend -ChartType XYScatter -XRange WinsToFast -YRange WinsToPoles -Column 7 -Width 2000 -Height 700 -Title "Poles vs fastlaps"
+Set-ExcelRange -Worksheet $ws -Range "F2:G50" -NumberFormat "0.0%"
+$chart = New-ExcelChartDefinition  -NoLegend -ChartType XYScatter -XRange WinsToFast -YRange WinsToPoles -Column 7 -Width 2000 -Height 700 -Title "Poles vs fastlaps"
 Export-Excel -ExcelPackage $Excel -WorkSheetname "Winners" -ExcelChartDefinition $chart -Show
--- a/Examples/SetColumnBackgroundColor/SetColumnBackgroundColor.ps1
+++ b/Examples/SetColumnBackgroundColor/SetColumnBackgroundColor.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $path =  "$env:TEMP\testBackgroundColor.xlsx"

--- a/Examples/Sparklines/SalesByQuarter.ps1
+++ b/Examples/Sparklines/SalesByQuarter.ps1
@@ -1,4 +1,4 @@
-try { . $PSScriptRoot\..\..\LoadPSD1.ps1 } catch { }
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 $xlfile = "$env:TEMP\SalesByQuarter.xlsx"
 Remove-Item $xlfile -ErrorAction SilentlyContinue
@@ -15,7 +15,7 @@ $excel = $data | Export-Excel $xlfile -Passthru -AutoSize -TableName SalesByQuar

 $ws = $excel.Sheet1

-Set-Format -WorkSheet $ws -Range "B2:E5" -NumberFormat "$#,##0" -AutoSize
+Set-ExcelRange -Worksheet $ws -Range "B2:E5" -NumberFormat "$#,##0" -AutoSize
 $sparkLineType = "line"
 $null = $ws.SparklineGroups.Add( $sparkLineType, $ws.Cells["F2"], $ws.Cells["B2:E2"] )
 $null = $ws.SparklineGroups.Add( $sparkLineType, $ws.Cells["F3"], $ws.Cells["B3:E3"] )
--- a/Examples/Sparklines/Sparklines.ps1
+++ b/Examples/Sparklines/Sparklines.ps1
@@ -1,4 +1,4 @@
-try { . $PSScriptRoot\..\..\LoadPSD1.ps1 } catch { }
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 class data {
    [datetime]$Date
@@ -41,8 +41,8 @@ Remove-Item $xlfile -ErrorAction SilentlyContinue
 $excel = $data | Export-Excel $xlfile -WorksheetName SEKRates -AutoSize -PassThru

 # Add a column sparkline for  all currencies
-Set-Format -WorkSheet $excel.SEKRates -Range "A2:A12" -NumberFormat "yyyy-mm-dd" -AutoSize
-Set-Format -WorkSheet $excel.SEKRates -Range A15 -Value Column -AutoSize
+Set-ExcelRange -Worksheet $excel.SEKRates -Range "A2:A12" -NumberFormat "yyyy-mm-dd" -AutoSize
+Set-ExcelRange -Worksheet $excel.SEKRates -Range A15 -Value Column -AutoSize

 $sparklineCol = $excel.SEKRates.SparklineGroups.Add(
    "Column",
@@ -54,7 +54,7 @@ $sparklineCol.High = $true
 $sparklineCol.ColorHigh.SetColor("Red")

 # Add a line sparkline for  all currencies
-Set-Format -WorkSheet $excel.SEKRates -Range A16 -Value Line -AutoSize
+Set-ExcelRange -Worksheet $excel.SEKRates -Range A16 -Value Line -AutoSize
 $sparklineLine = $excel.SEKRates.SparklineGroups.Add(
    "Line",
    $excel.SEKRates.Cells["B16:Q16"],
@@ -64,7 +64,7 @@ $sparklineLine = $excel.SEKRates.SparklineGroups.Add(
 $sparklineLine.DateAxisRange = $excel.SEKRates.Cells["A2:A12"]

 # Add some more random values and add a stacked sparkline.
-Set-Format -WorkSheet $excel.SEKRates -Range A17 -Value Stacked -AutoSize
+Set-ExcelRange -Worksheet $excel.SEKRates -Range A17 -Value Stacked -AutoSize

 $numbers = 2, -1, 3, -4, 8, 5, -12, 18, 99, 1, -4, 12, -8, 9, 0, -8

@@ -86,7 +86,7 @@ $sparklineStacked.ColorLow.SetColor("Green")
 $sparklineStacked.Negative = $true
 $sparklineStacked.ColorNegative.SetColor("Blue")

-Set-Format -WorkSheet $excel.SEKRates -Range "A15:A17" -Bold -Height 50 -AutoSize
+Set-ExcelRange -Worksheet $excel.SEKRates -Range "A15:A17" -Bold -Height 50 -AutoSize

 $v = @"
 High - Red
@@ -94,6 +94,6 @@ Low - Green
 Negative - Blue
 "@

-Set-Format -WorkSheet $excel.SEKRates -Range S17 -Value $v -WrapText -Width 20 -HorizontalAlignment Center -VerticalAlignment Center
+Set-ExcelRange -Worksheet $excel.SEKRates -Range S17 -Value $v -WrapText -Width 20 -HorizontalAlignment Center -VerticalAlignment Center

 Close-ExcelPackage $excel -Show
--- a/Examples/SpreadsheetCells/CalculatedFields.ps1
+++ b/Examples/SpreadsheetCells/CalculatedFields.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}


 #. ..\New-PSItem.ps1
@@ -6,7 +6,7 @@ try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
 Remove-Item "$env:temp\functions.xlsx" -ErrorAction SilentlyContinue

 $(
-    New-PSItem 12001 Nails  37  3.99 =C2*D2 (echo ID Product Quantity Price Total)
+    New-PSItem 12001 Nails  37  3.99 =C2*D2 @("ID", "Product", "Quantity", "Price", "Total")
    New-PSItem 12002 Hammer  5 12.10 =C3*D3
    New-PSItem 12003 Saw    12 15.37 =C4*D4
    New-PSItem 12010 Drill  20  8    =C5*D5
--- a/Examples/SpreadsheetCells/ExcelFormulasUsingAddMember.ps1
+++ b/Examples/SpreadsheetCells/ExcelFormulasUsingAddMember.ps1
@@ -1,4 +1,4 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item .\testFormula.xlsx -ErrorAction Ignore

--- a/Examples/SpreadsheetCells/ExcelFunctions.ps1
+++ b/Examples/SpreadsheetCells/ExcelFunctions.ps1
@@ -1,9 +1,9 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}

 Remove-Item "$env:temp\functions.xlsx" -ErrorAction SilentlyContinue

 $(
-    New-PSItem =2%/12 60 500000 "=pmt(rate,nper,pv)" (echo rate nper pv pmt)
+    New-PSItem =2%/12 60 500000 "=pmt(rate,nper,pv)" @("rate", "nper", "pv", "pmt")
    New-PSItem =3%/12 60 500000 "=pmt(rate,nper,pv)"
    New-PSItem =4%/12 60 500000 "=pmt(rate,nper,pv)"
    New-PSItem =5%/12 60 500000 "=pmt(rate,nper,pv)"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dfinke	9d1a544e77	Updated	2019-12-21 11:46:05 -05:00
Doug Finke	e836928571	Merge pull request #755 from jhoneill/master Latest updates	2019-12-21 11:10:52 -05:00
jhoneill	718bf951b7	Fix String typos. Fix missing space merge-multiple column names	2019-12-19 18:37:41 +00:00
jhoneill	08dd30696e	fix convertFrom-ExcelSheet test - date format issue	2019-12-15 23:34:55 +00:00
jhoneill	7b51d2f340	retry	2019-12-15 22:54:31 +00:00
jhoneill	b3932f0a13	retry	2019-12-15 22:50:26 +00:00
jhoneill	84140d757a	#737 #741 , #746 & Tests	2019-12-15 22:36:31 +00:00
jhoneill	ce8a070673	Remove debugging messages from CI pipeline	2019-12-09 00:45:34 +00:00
jhoneill	ed41c20f63	Finalize Checks for failing manfiest	2019-12-09 00:42:44 +00:00
jhoneill	28e3fe1cd8	again	2019-12-09 00:32:47 +00:00
jhoneill	ed7f43bab3	retry	2019-12-09 00:30:01 +00:00
jhoneill	f695e7cc63	retry previous	2019-12-09 00:24:56 +00:00
jhoneill	5757302a6e	fix CI copy issue	2019-12-09 00:07:36 +00:00
jhoneill	8ccf2799e1	go back to reading settings directly	2019-12-08 23:30:20 +00:00
jhoneill	c9116c2d18	Add manifest check to tests	2019-12-08 22:54:18 +00:00
jhoneill	88e0a449c7	Fix case error for CI.ps1 on Linux	2019-12-08 13:16:54 +00:00
jhoneill	65754d27cc	reinstate loading from private post-merge	2019-12-08 12:56:54 +00:00
jhoneill	3e10d03b62	Merge branch 'master' of https://github.com/dfinke/ImportExcel into refactor	2019-12-08 12:46:15 +00:00
jhoneill	1be2f82456	fix check not detecting commented alias	2019-12-08 12:04:33 +00:00
jhoneill	86f13e1d6f	refine pipeline (remove typo)	2019-12-08 11:08:43 +00:00
jhoneill	40a50ad78b	Refine CI Pipeline (retry)	2019-12-08 11:06:17 +00:00
jhoneill	5220e7c188	retry previous	2019-12-08 10:54:19 +00:00
jhoneill	d45d90c8a1	Retry previous	2019-12-08 10:22:35 +00:00
jhoneill	f5a29b45df	retry previous	2019-12-08 10:19:21 +00:00
jhoneill	fb4fb57751	refine the pipeline	2019-12-08 10:12:33 +00:00
jhoneill	300960fd9b	remove more aliases from examples	2019-12-08 02:19:56 +00:00
jhoneill	2e56012408	retry 2	2019-12-08 01:52:25 +00:00
jhoneill	4f17fc36bc	retry	2019-12-08 01:50:54 +00:00
jhoneill	6be0961d17	Improve Artifacts	2019-12-08 01:47:43 +00:00
jhoneill	2bcb332ec7	try better script analysis publishing	2019-12-08 01:35:13 +00:00
jhoneill	469586e94a	retry previous	2019-12-08 01:26:21 +00:00
jhoneill	a9b1a128cd	Refine Pipeline messages / script analysis	2019-12-08 01:24:22 +00:00
jhoneill	dec579a966	update CI for moved install.ps1	2019-12-08 00:58:22 +00:00
jhoneill	ce4270babd	experiment with new Azure pipeline	2019-12-08 00:53:56 +00:00
jhoneill	d83a468fa9	More file moves	2019-12-08 00:45:47 +00:00
dfinke	9b385e72c6	Fix - The specified FileList entry '.\Private' in the module manifest 'ImportExcel.psd1' is invalid.	2019-12-07 11:15:35 -05:00
dfinke	4fee745a7f	Fix brace	2019-12-07 11:05:42 -05:00
dfinke	8b5fa9e798	Updated msg for Autosize on Linux	2019-12-07 10:59:34 -05:00
dfinke	4608c0bd04	updated	2019-12-05 18:20:43 -05:00
dfinke	c0b3297bd7	add link	2019-12-05 18:20:21 -05:00
dfinke	1baed182c3	Updated	2019-12-05 18:19:32 -05:00
dfinke	270a5d921c	Start on readme	2019-12-05 18:03:13 -05:00
dfinke	a1ef937619	bump version	2019-12-05 18:03:02 -05:00
Doug Finke	481e2c6cc8	Merge pull request #743 from dfinke/refactor Refactor	2019-12-05 17:40:56 -05:00
Doug Finke	0bf85de2a2	Merge pull request #738 from jhoneill/refactor Refactor	2019-12-05 17:32:03 -05:00
jhoneill	1667ba33eb	Fix error caused by empty private dir	2019-12-01 22:48:11 +00:00
jhoneill	b534bd974b	Repeat	2019-12-01 22:43:37 +00:00
jhoneill	d89346c89c	Fix CI getting out of sync with directory changes	2019-12-01 22:39:53 +00:00
jhoneill	229f69313b	final tidy for PR	2019-12-01 22:30:57 +00:00
jhoneill	a37f6f3754	Relocate files (hopefully final!)	2019-12-01 18:46:45 +00:00
jhoneill	88e2a23e1b	directory renames	2019-12-01 17:04:27 +00:00
jhoneill	6b033d7451	Fix for CI	2019-12-01 00:15:05 +00:00
jhoneill	d1c347285f	Move DLL load into PSD1	2019-11-30 15:28:31 +00:00
jhoneill	6508043bc0	Make Update-1st object props an advanced cmdlet & faster	2019-11-30 15:28:05 +00:00
jhoneill	163eaebf66	Merge branch 'refactor' of https://github.com/dfinke/ImportExcel into refactor	2019-11-30 14:22:18 +00:00
jhoneill	5e87c3f6a7	fixes to casing, and some basic functions changed to advanced	2019-11-25 23:40:51 +00:00
jhoneill	feb493e397	fix naming consitency (case mostly)	2019-11-25 01:01:55 +00:00
jhoneill	f6c66e21a7	Sync to Doug's 6.5.3 release	2019-11-23 16:12:29 +00:00
dfinke	02d2fa9975	Updated change notes	2019-11-23 09:09:22 -05:00
dfinke	eb3a394013	bump version	2019-11-23 09:06:26 -05:00
Doug Finke	b517b0a974	Merge pull request #726 from ili101/PipelineVariable support PipelineVariable	2019-11-23 09:01:05 -05:00
Doug Finke	d56fd89557	Merge pull request #732 from beckerben/master Fix for #512 & #525	2019-11-23 08:51:15 -05:00
Doug Finke	9d2a1e4d47	Merge pull request #729 from jhoneill/master Fix for #720, plus some linting - #730 Send-SQLDataToExcel -Append // The last row of data is overwritten by a header - #720 Incorrect table when supplying DataTable with zero rows	2019-11-23 08:02:32 -05:00
ili101	5f3c41e669	Support multiple Paths from pipeline and param	2019-11-22 05:09:00 +02:00
jhoneill	d4da73e8f4	file list no longer needed	2019-11-22 00:52:34 +00:00
jhoneill	0d0fd5ac80	Merge branch 'refactor' of https://github.com/jhoneill/ImportExcel into refactor	2019-11-21 21:44:56 +00:00
jhoneill	3fb3ba0e0e	Add test for new table support in export	2019-11-21 21:43:58 +00:00
jhoneill	e49b4ee6e8	Add test for new table support in export	2019-11-21 21:04:32 +00:00
jhoneill	5595aee407	sync export changes from master into refactor	2019-11-21 20:35:17 +00:00
jhoneill	c38adba49d	Add tests for improved datatable handling in export	2019-11-21 20:22:06 +00:00
jhoneill	30e4515287	improve DataTable passing to Export	2019-11-21 20:20:56 +00:00
jhoneill	e42f23cd7c	Major linting push	2019-11-21 17:29:58 +00:00
jhoneill	5fee49967a	sync export with master updtes for #720	2019-11-21 08:42:51 +00:00
jhoneill	98b91ce19d	Fix append behavior passing data tables to export	2019-11-21 07:40:21 +00:00
jhoneill	5aa841c225	aggressive linting	2019-11-20 19:14:19 +00:00
jhoneill	aaf18b4d9a	Linting mostly	2019-11-20 19:07:22 +00:00
jhoneill	2e0cd4f97d	Linting	2019-11-20 18:27:17 +00:00
Ben Becker	e132755061	Fix for #512 & #525 There is an issue with the ConvertFromExcelToSQLInsert where a quote in the text will not be converted properly and will cause invalid insert statements to be created, this commit makes the correction to handle the scenario.	2019-11-20 09:32:32 -05:00
Ben Becker	5617a960ec	fix for #512 & #525 There is an issue with the ConvertFromExcelToSQLInsert where a quote in the text will not be converted properly and will cause invalid insert statements to be created, this commit makes the correction to handle the scenario.	2019-11-20 08:13:11 -05:00
jhoneill	873f1a365b	Merge pull request #2 from ili101/xml EPPlus empty row on an empty table	2019-11-19 11:39:03 +00:00
ili101	cc7d18cc59	EPPlus empty row on an empty table	2019-11-18 12:21:21 +02:00
jhoneill	f27729d2ab	Remove 72 empty catch blocks and Loadpsd1	2019-11-18 07:50:20 +00:00
jhoneill	d3a2edcc5f	default CI/Install-PowerShell version to stable release	2019-11-18 01:32:14 +00:00
jhoneill	cc5eff1157	sync export-excel to `321699e` spec.	2019-11-18 01:30:37 +00:00
jhoneill	66bf3adf17	remove LoadPSD calls & 72 empty catch blocks from examples	2019-11-17 22:45:29 +00:00
jhoneill	36f27e3d40	commented pull request	2019-11-17 22:43:42 +00:00
jhoneill	a7104b729c	Merge pull request #1 from ili101/jhoneillDTT Some Fixes	2019-11-17 20:28:51 +00:00
ili101	2ef632ad32	support PipelineVariable	2019-11-17 22:20:54 +02:00
ili101	43927ca078	Export-Excel.ps1 532: Now mode TableName is auto generated if not specified (shouldn't matter just in case). 632: Fix -DataTable "" to use LoadFromDataTable with style (auto generated name) 820: DataTable + TableStyle without TableName corruption fix. Also simplified even more. 822: Change back to "-TableName $TableName" as cange broke test: Export-Excel.Tests.ps1 617: Undo change test was correct.	2019-11-17 19:58:14 +02:00
jhoneill	1f767338f2	Fix path error in PSM1	2019-11-17 16:04:10 +00:00
jhoneill	6d97018de6	Move help from Comment-based to md. Relocate functions (sans help)	2019-11-17 15:30:15 +00:00
dfinke	6f2e7d682b	Added items for next release	2019-11-16 10:21:48 -05:00
jhoneill	07b36e5e56	improve table options on export	2019-11-16 11:01:57 +00:00
jhoneill	16bc380b65	Fix datatable issues with duplicate names & empty tables	2019-11-16 00:33:53 +00:00
jhoneill	d378674d30	Merge remote-tracking branch 'upstream/master'	2019-11-10 18:46:37 +00:00
Doug Finke	5959a97439	Merge pull request #713 from dfinke/FixImportExcelHeaders Fix import excel headers	2019-11-10 08:57:36 -05:00
jhoneill	3def13e1d9	Merge remote-tracking branch 'upstream/master'	2019-11-10 13:33:27 +00:00
jhoneill	e2c6495340	Re-enabled compare worksheet test on V6.	2019-11-10 13:29:17 +00:00
dfinke	ef6defd75c	Change the order of HeaderName and NoHeader. Adding tests.	2019-11-08 16:07:14 -05:00
dfinke	076a494523	Add tests for ImportExcel	2019-11-04 17:06:36 -05:00
dfinke	031c9b9c73	Add If to test for headername parameter	2019-11-04 17:06:26 -05:00
dfinke	321699e427	Update readme about CI improvements	2019-11-03 09:02:04 -05:00
Doug Finke	98b82fc3ba	Merge pull request #691 from ili101/ScriptAnalyzer ScriptAnalyzer - Module.Template update - ScriptAnalyzer report is generated	2019-11-03 08:34:08 -05:00
ili101	394210d41f	Module.Template 2.0.4 Update	2019-11-02 18:26:11 +02:00