dfinke · joshooaj · Oct 30, 2023 · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,10 @@
+FROM mcr.microsoft.com/powershell:lts-debian-11
+
+SHELL [ "pwsh", "-NoLogo", "-NoProfile", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue'; " ]
+RUN apt update && apt install -y --no-install-recommends libc6-dev python3-pip mkdocs; \
+    pip install mkdocs-material mkdocs-awesome-pages-plugin -q --no-input; \
+    Install-Module Pester -RequiredVersion 5.5.0 -Force; \
+    Install-Module psake -RequiredVersion 4.9.0 -Force; \
+    Install-Module PSReadLine -RequiredVersion 2.3.4 -Force; \
+    Install-Module PSScriptAnalyzer -RequiredVersion 1.21.0 -Force; \
+    Install-Module platyPS -RequiredVersion 0.14.2 -Force;
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+{
+    "name": "PowerShell",
+    "dockerFile": "Dockerfile",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "true",
+            "username": "vscode",
+            "upgradePackages": "false",
+            "nonFreePackages": "true"
+        }
+    },
+    "postCreateCommand": "sudo chsh vscode -s \"$(which pwsh)\"",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "powershell.powerShellDefaultVersion": "PowerShell",
+                "terminal.integrated.defaultProfile.linux": "pwsh"
+            },
+            "extensions": [
+                "ms-vscode.powershell",
+                "redhat.vscode-yaml",
+                "eamodio.gitlens"
+            ]
+        }
+    },
+    "forwardPorts": [8000]
+}
diff --git a/.gitattributes b/.gitattributes
@@ -2,18 +2,19 @@
 * text=auto
 
 # Custom for Visual Studio
-*.cs     diff=csharp
-*.ps1 text eol=crlf
+*.cs        diff=csharp
+*.ps1  text eol=crlf
 *.psm1 text eol=crlf
+*.md   text eol=crlf
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc  diff=astextplain
+*.DOC  diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF  diff=astextplain
+*.rtf  diff=astextplain
+*.RTF  diff=astextplain
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,27 +1,41 @@
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
       - Set-up-GHA-CI/CD
-
   pull_request:
 
 jobs:
-  validate:
+  build:
+    name: Build and Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v1      
-    - name: Run Continuous Integration
-      shell: pwsh
-      run : |
-        if($PSVersionTable.Platform -eq 'Win32NT') {
-          $null = mkdir ./ace
-          Invoke-Restmethod https://download.microsoft.com/download/3/5/C/35C84C36-661A-44E6-9324-8786B8DBE231/accessdatabaseengine_X64.exe -OutFile ./ace/ace.exe
-          Start-Process ./ace/ace.exe -Wait -ArgumentList "/quiet /passive /norestart"
-        }
+      - uses: actions/checkout@v4
+
+      - name: Build
+        id: build
+        shell: pwsh
+        run: |
+          $result = ./build.ps1
+          "ManifestPath=$($result.Output.ManifestPath)" | Add-Content "$($env:GITHUB_OUTPUT)"
+
+      - name: Test
+        shell: pwsh
+        run: |
+          if($PSVersionTable.Platform -eq 'Win32NT') {
+            $null = mkdir ./ace
+            Invoke-Restmethod https://download.microsoft.com/download/3/5/C/35C84C36-661A-44E6-9324-8786B8DBE231/accessdatabaseengine_X64.exe -OutFile ./ace/ace.exe
+            Start-Process ./ace/ace.exe -Wait -ArgumentList "/quiet /passive /norestart"
+          }
+          ./RunTests.ps1 -ModulePath ${{ steps.build.outputs.ManifestPath }} -NoIsolation
 
-        cd ./__tests__
-        Invoke-Pester -Output Detailed
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action/composite@v2
+        if: always()
+        with:
+          files: |
+            Output/testResults.xml
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,31 @@
+name: Publish Docs
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - ".github/workflows/docs.yml"
+      - "docs/**"
+      - "mkdocs.yml"
+
+permissions:
+  contents: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
+      - uses: actions/cache@v3
+        with:
+          key: mkdocs-material-${{ env.cache_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+      - run: pip install mkdocs-material mkdocs-awesome-pages-plugin
+      - run: mkdocs gh-deploy --force
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+# Build artifacts
+[O|o]utput/
+.cache/
+
 # Windows image file caches
 Thumbs.db
 ehthumbs.db

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PowerShell: Debug Module",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "Import-Module -Force ${workspaceFolder}/ImportExcel/ImportExcel.psd1",
+        },
+        {
+            "name": "PowerShell: Launch Current File",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "if ($null -eq (Get-Module ImportExcel)) { Import-Module ${workspaceFolder}/ImportExcel/ImportExcel.psd1 }; ${file}",
+            "cwd": "${cwd}"
+        }        
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "${workspaceFolder}\\build.ps1 | Out-Null",
+            "type": "shell",
+            "args": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            }
+        },
+        {
+            "label": "test",
+            "command": "${workspaceFolder}\\RunTests.ps1",
+            "type": "shell",
+            "args": ["-NoIsolation"],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            }
+        }
+    ]
+}
diff --git a/Charting/Charting.ps1 → ImportExcel/Charting/Charting.ps1 b/Charting/Charting.ps1 → ImportExcel/Charting/Charting.ps1
diff --git a/charting/README.md → ImportExcel/Charting/README.md b/charting/README.md → ImportExcel/Charting/README.md
diff --git a/charting/barchart.md → ImportExcel/Charting/barchart.md b/charting/barchart.md → ImportExcel/Charting/barchart.md
diff --git a/charting/columnchart.md → ImportExcel/Charting/columnchart.md b/charting/columnchart.md → ImportExcel/Charting/columnchart.md
diff --git a/charting/dochart.md → ImportExcel/Charting/dochart.md b/charting/dochart.md → ImportExcel/Charting/dochart.md
diff --git a/charting/linechart.md → ImportExcel/Charting/linechart.md b/charting/linechart.md → ImportExcel/Charting/linechart.md
diff --git a/charting/piechart.md → ImportExcel/Charting/piechart.md b/charting/piechart.md → ImportExcel/Charting/piechart.md
diff --git a/EPPlus.dll → ImportExcel/EPPlus.dll b/EPPlus.dll → ImportExcel/EPPlus.dll
diff --git a/ImportExcel.psd1 → ImportExcel/ImportExcel.psd1 b/ImportExcel.psd1 → ImportExcel/ImportExcel.psd1
@@ -52,11 +52,11 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
         'Enable-ExcelAutofit',
         'Expand-NumberFormat',
         'Export-Excel',
-        'Export-ExcelSheet',        
+        'Export-ExcelSheet',
         'Get-ExcelColumnName',
         'Get-ExcelFileSchema',
-        'Get-ExcelFileSummary', 
-        'Get-ExcelSheetDimensionAddress',       
+        'Get-ExcelFileSummary',
+        'Get-ExcelSheetDimensionAddress',
         'Get-ExcelSheetInfo',
         'Get-ExcelWorkbookInfo',
         'Get-HtmlTable',
@@ -118,22 +118,9 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
     CmdletsToExport    = @()
 
     FileList           = @(
-        '.\EPPlus.dll',
-        '.\Export-charts.ps1',
-        '.\GetExcelTable.ps1',
-        '.\ImportExcel.psd1',
-        '.\ImportExcel.psm1',
-        '.\LICENSE.txt',        
-        '.\Plot.ps1',
-        '.\Private',
-        '.\Public',
-        '.\en\ImportExcel-help.xml',
-        '.\en\Strings.psd1',
-        '.\Charting\Charting.ps1',
-        '.\InferData\InferData.ps1',
-        '.\Pivot\Pivot.ps1',
-        '.\Examples', 
-        '.\Testimonials'
+        'Localized/strings.psd1'
+        'EPPlus.dll',
+        'Plot.ps1'
     )
 
     # Private data to pass to the module specified in RootModule/ModuleToProcess

diff --git a/ImportExcel.psm1 → ImportExcel/ImportExcel.psm1 b/ImportExcel.psm1 → ImportExcel/ImportExcel.psm1
@@ -1,15 +1,23 @@
 #region import everything we need
-$culture = $host.CurrentCulture.Name -replace '-\w*$', ''
-Import-LocalizedData  -UICulture $culture -BindingVariable Strings -FileName Strings -ErrorAction Ignore
-if (-not $Strings) {
-    Import-LocalizedData  -UICulture "en" -BindingVariable Strings -FileName Strings -ErrorAction Ignore
-}
+Import-LocalizedData -BindingVariable 'Strings' -FileName 'strings' -BaseDirectory "$PSScriptRoot/Localized"
 try { [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Drawing") }
 catch { Write-Warning -Message $Strings.SystemDrawingAvailable }
 
-foreach ($directory in @('Private', 'Public', 'Charting', 'InferData', 'Pivot')) {
-    Get-ChildItem -Path "$PSScriptRoot\$directory\*.ps1" | ForEach-Object { . $_.FullName }
+#region Dot-Sourced Functions
+try {
+    $dotSources = Get-Content -Path $PSScriptRoot/dot-sources.txt -ErrorAction Stop | Where-Object {
+        $_ -notmatch '^\s*#' -and -not [string]::IsNullOrWhiteSpace($_)
+    }
+    foreach ($directory in $dotSources) {
+        $directory = $directory.Trim()
+        foreach ($file in Get-ChildItem -Path "$PSScriptRoot/$Directory/*.ps1") {
+            . $file.FullName
+        }
+    }
+} catch {
+    throw
 }
+#endregion
 
 if ($PSVersionTable.PSVersion.Major -ge 5) {
     . $PSScriptRoot\Plot.ps1
@@ -40,18 +48,10 @@ if (($IsLinux -or $IsMacOS) -or $env:NoAutoSize) {
     catch {
         $env:NoAutoSize = $true
         if ($IsLinux) {
-            $msg = @"
-ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:
-apt-get -y update && apt-get install -y --no-install-recommends libgdiplus libc6-dev
-"@
-            Write-Warning -Message $msg
+            Write-Warning -Message $Strings.NoAutoSizeLinux
         }
         if ($IsMacOS) {
-            $msg = @"
-ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:
-brew install mono-libgdiplus
-"@
-            Write-Warning -Message $msg
+            Write-Warning -Message $Strings.NoAutoSizeMacOS
         }
     }
     finally {

diff --git a/InferData/InferData.ps1 → ImportExcel/InferData/InferData.ps1 b/InferData/InferData.ps1 → ImportExcel/InferData/InferData.ps1
diff --git a/inferdata/README.md → ImportExcel/InferData/README.md b/inferdata/README.md → ImportExcel/InferData/README.md
diff --git a/inferdata/invoke-alltests.md → ImportExcel/InferData/invoke-alltests.md b/inferdata/invoke-alltests.md → ImportExcel/InferData/invoke-alltests.md
diff --git a/inferdata/test-boolean.md → ImportExcel/InferData/test-boolean.md b/inferdata/test-boolean.md → ImportExcel/InferData/test-boolean.md
diff --git a/inferdata/test-date.md → ImportExcel/InferData/test-date.md b/inferdata/test-date.md → ImportExcel/InferData/test-date.md
diff --git a/inferdata/test-integer.md → ImportExcel/InferData/test-integer.md b/inferdata/test-integer.md → ImportExcel/InferData/test-integer.md
diff --git a/inferdata/test-number.md → ImportExcel/InferData/test-number.md b/inferdata/test-number.md → ImportExcel/InferData/test-number.md
diff --git a/inferdata/test-string.md → ImportExcel/InferData/test-string.md b/inferdata/test-string.md → ImportExcel/InferData/test-string.md
diff --git a/ImportExcel/Localized/strings.psd1 b/ImportExcel/Localized/strings.psd1
@@ -0,0 +1,16 @@
+@{
+    SystemDrawingAvailable = 'System.Drawing could not be loaded. Color and font look-ups may not be available.'
+    PS5NeededForPlot       = 'PowerShell 5 is required for plot.ps1'
+    ModuleReadyExceptPlot  = 'The ImportExcel module is ready, except for that functionality'
+
+    NoAutoSizeLinux        = @'
+ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:
+apt-get -y update && apt-get install -y --no-install-recommends libgdiplus libc6-dev
+'@
+
+    NoAutoSizeMacOS        = @'
+ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:
+brew install mono-libgdiplus
+'@
+
+}
diff --git a/Pivot/Pivot.ps1 → ImportExcel/Pivot/Pivot.ps1 b/Pivot/Pivot.ps1 → ImportExcel/Pivot/Pivot.ps1
diff --git a/Pivot/README.md → ImportExcel/Pivot/README.md b/Pivot/README.md → ImportExcel/Pivot/README.md
diff --git a/Pivot/pivot.md → ImportExcel/Pivot/pivot.md b/Pivot/pivot.md → ImportExcel/Pivot/pivot.md
diff --git a/Plot.ps1 → ImportExcel/Plot.ps1 b/Plot.ps1 → ImportExcel/Plot.ps1
diff --git a/Private/ArgumentCompletion.ps1 → ImportExcel/Private/ArgumentCompletion.ps1 b/Private/ArgumentCompletion.ps1 → ImportExcel/Private/ArgumentCompletion.ps1
diff --git a/Private/Invoke-ExcelReZipFile.ps1 → ...rtExcel/Private/Invoke-ExcelReZipFile.ps1 b/Private/Invoke-ExcelReZipFile.ps1 → ...rtExcel/Private/Invoke-ExcelReZipFile.ps1
diff --git a/Public/Add-ConditionalFormatting.ps1 → ...xcel/Public/Add-ConditionalFormatting.ps1 b/Public/Add-ConditionalFormatting.ps1 → ...xcel/Public/Add-ConditionalFormatting.ps1
diff --git a/Public/Add-ExcelChart.ps1 → ImportExcel/Public/Add-ExcelChart.ps1 b/Public/Add-ExcelChart.ps1 → ImportExcel/Public/Add-ExcelChart.ps1
diff --git a/Public/Add-ExcelDataValidationRule.ps1 → ...el/Public/Add-ExcelDataValidationRule.ps1 b/Public/Add-ExcelDataValidationRule.ps1 → ...el/Public/Add-ExcelDataValidationRule.ps1
diff --git a/Public/Add-ExcelName.ps1 → ImportExcel/Public/Add-ExcelName.ps1 b/Public/Add-ExcelName.ps1 → ImportExcel/Public/Add-ExcelName.ps1
diff --git a/Public/Add-ExcelTable.ps1 → ImportExcel/Public/Add-ExcelTable.ps1 b/Public/Add-ExcelTable.ps1 → ImportExcel/Public/Add-ExcelTable.ps1
diff --git a/Public/Add-PivotTable.ps1 → ImportExcel/Public/Add-PivotTable.ps1 b/Public/Add-PivotTable.ps1 → ImportExcel/Public/Add-PivotTable.ps1
diff --git a/Public/Add-Worksheet.ps1 → ImportExcel/Public/Add-Worksheet.ps1 b/Public/Add-Worksheet.ps1 → ImportExcel/Public/Add-Worksheet.ps1
diff --git a/Public/Close-ExcelPackage.ps1 → ImportExcel/Public/Close-ExcelPackage.ps1 b/Public/Close-ExcelPackage.ps1 → ImportExcel/Public/Close-ExcelPackage.ps1
diff --git a/Public/Compare-Worksheet.ps1 → ImportExcel/Public/Compare-Worksheet.ps1 b/Public/Compare-Worksheet.ps1 → ImportExcel/Public/Compare-Worksheet.ps1
diff --git a/Public/Convert-ExcelRangeToImage.ps1 → ...xcel/Public/Convert-ExcelRangeToImage.ps1 b/Public/Convert-ExcelRangeToImage.ps1 → ...xcel/Public/Convert-ExcelRangeToImage.ps1
diff --git a/Public/ConvertFrom-ExcelData.ps1 → ImportExcel/Public/ConvertFrom-ExcelData.ps1 b/Public/ConvertFrom-ExcelData.ps1 → ImportExcel/Public/ConvertFrom-ExcelData.ps1
diff --git a/Public/ConvertFrom-ExcelSheet.ps1 → ...rtExcel/Public/ConvertFrom-ExcelSheet.ps1 b/Public/ConvertFrom-ExcelSheet.ps1 → ...rtExcel/Public/ConvertFrom-ExcelSheet.ps1
diff --git a/Public/ConvertFrom-ExcelToSQLInsert.ps1 → ...l/Public/ConvertFrom-ExcelToSQLInsert.ps1 b/Public/ConvertFrom-ExcelToSQLInsert.ps1 → ...l/Public/ConvertFrom-ExcelToSQLInsert.ps1
diff --git a/Public/ConvertTo-ExcelXlsx.ps1 → ImportExcel/Public/ConvertTo-ExcelXlsx.ps1 b/Public/ConvertTo-ExcelXlsx.ps1 → ImportExcel/Public/ConvertTo-ExcelXlsx.ps1
diff --git a/Public/Copy-ExcelWorksheet.ps1 → ImportExcel/Public/Copy-ExcelWorksheet.ps1 b/Public/Copy-ExcelWorksheet.ps1 → ImportExcel/Public/Copy-ExcelWorksheet.ps1
diff --git a/Public/Enable-ExcelAutoFilter.ps1 → ...rtExcel/Public/Enable-ExcelAutoFilter.ps1 b/Public/Enable-ExcelAutoFilter.ps1 → ...rtExcel/Public/Enable-ExcelAutoFilter.ps1
diff --git a/Public/Enable-ExcelAutofit.ps1 → ImportExcel/Public/Enable-ExcelAutofit.ps1 b/Public/Enable-ExcelAutofit.ps1 → ImportExcel/Public/Enable-ExcelAutofit.ps1
diff --git a/Public/Expand-NumberFormat.ps1 → ImportExcel/Public/Expand-NumberFormat.ps1 b/Public/Expand-NumberFormat.ps1 → ImportExcel/Public/Expand-NumberFormat.ps1
diff --git a/Public/Export-Excel.ps1 → ImportExcel/Public/Export-Excel.ps1 b/Public/Export-Excel.ps1 → ImportExcel/Public/Export-Excel.ps1
diff --git a/Public/Get-ExcelColumnName.ps1 → ImportExcel/Public/Get-ExcelColumnName.ps1 b/Public/Get-ExcelColumnName.ps1 → ImportExcel/Public/Get-ExcelColumnName.ps1
diff --git a/Public/Get-ExcelFileSchema.ps1 → ImportExcel/Public/Get-ExcelFileSchema.ps1 b/Public/Get-ExcelFileSchema.ps1 → ImportExcel/Public/Get-ExcelFileSchema.ps1
diff --git a/Public/Get-ExcelFileSummary.ps1 → ImportExcel/Public/Get-ExcelFileSummary.ps1 b/Public/Get-ExcelFileSummary.ps1 → ImportExcel/Public/Get-ExcelFileSummary.ps1
diff --git a/Public/Get-ExcelSheetDimensionAddress.ps1 → ...Public/Get-ExcelSheetDimensionAddress.ps1 b/Public/Get-ExcelSheetDimensionAddress.ps1 → ...Public/Get-ExcelSheetDimensionAddress.ps1
diff --git a/Public/Get-ExcelSheetInfo.ps1 → ImportExcel/Public/Get-ExcelSheetInfo.ps1 b/Public/Get-ExcelSheetInfo.ps1 → ImportExcel/Public/Get-ExcelSheetInfo.ps1
diff --git a/Public/Get-ExcelWorkbookInfo.ps1 → ImportExcel/Public/Get-ExcelWorkbookInfo.ps1 b/Public/Get-ExcelWorkbookInfo.ps1 → ImportExcel/Public/Get-ExcelWorkbookInfo.ps1
diff --git a/Public/Get-HtmlTable.ps1 → ImportExcel/Public/Get-HtmlTable.ps1 b/Public/Get-HtmlTable.ps1 → ImportExcel/Public/Get-HtmlTable.ps1
diff --git a/Public/Get-Range.ps1 → ImportExcel/Public/Get-Range.ps1 b/Public/Get-Range.ps1 → ImportExcel/Public/Get-Range.ps1
diff --git a/Public/Get-XYRange.ps1 → ImportExcel/Public/Get-XYRange.ps1 b/Public/Get-XYRange.ps1 → ImportExcel/Public/Get-XYRange.ps1
diff --git a/Public/Import-Excel.ps1 → ImportExcel/Public/Import-Excel.ps1 b/Public/Import-Excel.ps1 → ImportExcel/Public/Import-Excel.ps1
diff --git a/Public/Import-Html.ps1 → ImportExcel/Public/Import-Html.ps1 b/Public/Import-Html.ps1 → ImportExcel/Public/Import-Html.ps1
diff --git a/Public/Import-UPS.ps1 → ImportExcel/Public/Import-UPS.ps1 b/Public/Import-UPS.ps1 → ImportExcel/Public/Import-UPS.ps1
diff --git a/Public/Import-USPS.ps1 → ImportExcel/Public/Import-USPS.ps1 b/Public/Import-USPS.ps1 → ImportExcel/Public/Import-USPS.ps1
diff --git a/Public/Invoke-ExcelQuery.ps1 → ImportExcel/Public/Invoke-ExcelQuery.ps1 b/Public/Invoke-ExcelQuery.ps1 → ImportExcel/Public/Invoke-ExcelQuery.ps1
diff --git a/Public/Invoke-Sum.ps1 → ImportExcel/Public/Invoke-Sum.ps1 b/Public/Invoke-Sum.ps1 → ImportExcel/Public/Invoke-Sum.ps1
diff --git a/Public/Join-Worksheet.ps1 → ImportExcel/Public/Join-Worksheet.ps1 b/Public/Join-Worksheet.ps1 → ImportExcel/Public/Join-Worksheet.ps1
diff --git a/Public/Merge-MultipleSheets.ps1 → ImportExcel/Public/Merge-MultipleSheets.ps1 b/Public/Merge-MultipleSheets.ps1 → ImportExcel/Public/Merge-MultipleSheets.ps1
diff --git a/Public/Merge-Worksheet.ps1 → ImportExcel/Public/Merge-Worksheet.ps1 b/Public/Merge-Worksheet.ps1 → ImportExcel/Public/Merge-Worksheet.ps1
diff --git a/Public/New-ConditionalFormattingIconSet.ps1 → ...blic/New-ConditionalFormattingIconSet.ps1 b/Public/New-ConditionalFormattingIconSet.ps1 → ...blic/New-ConditionalFormattingIconSet.ps1
diff --git a/Public/New-ConditionalText.ps1 → ImportExcel/Public/New-ConditionalText.ps1 b/Public/New-ConditionalText.ps1 → ImportExcel/Public/New-ConditionalText.ps1
diff --git a/Public/New-ExcelChartDefinition.ps1 → ...Excel/Public/New-ExcelChartDefinition.ps1 b/Public/New-ExcelChartDefinition.ps1 → ...Excel/Public/New-ExcelChartDefinition.ps1
diff --git a/Public/New-ExcelStyle.ps1 → ImportExcel/Public/New-ExcelStyle.ps1 b/Public/New-ExcelStyle.ps1 → ImportExcel/Public/New-ExcelStyle.ps1
diff --git a/Public/New-PSItem.ps1 → ImportExcel/Public/New-PSItem.ps1 b/Public/New-PSItem.ps1 → ImportExcel/Public/New-PSItem.ps1
@@ -1,6 +1,5 @@
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='New*', Justification='Does not change system State')]
-param()
 function New-PSItem {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system State')]
     param()
     $totalArgs = $args.Count
 

diff --git a/Public/New-PivotTableDefinition.ps1 → ...Excel/Public/New-PivotTableDefinition.ps1 b/Public/New-PivotTableDefinition.ps1 → ...Excel/Public/New-PivotTableDefinition.ps1
diff --git a/Public/Open-ExcelPackage.ps1 → ImportExcel/Public/Open-ExcelPackage.ps1 b/Public/Open-ExcelPackage.ps1 → ImportExcel/Public/Open-ExcelPackage.ps1
diff --git a/Public/Read-Clipboard.ps1 → ImportExcel/Public/Read-Clipboard.ps1 b/Public/Read-Clipboard.ps1 → ImportExcel/Public/Read-Clipboard.ps1
diff --git a/Public/Read-OleDbData.ps1 → ImportExcel/Public/Read-OleDbData.ps1 b/Public/Read-OleDbData.ps1 → ImportExcel/Public/Read-OleDbData.ps1
diff --git a/Public/Remove-Worksheet.ps1 → ImportExcel/Public/Remove-Worksheet.ps1 b/Public/Remove-Worksheet.ps1 → ImportExcel/Public/Remove-Worksheet.ps1
diff --git a/Public/Select-Worksheet.ps1 → ImportExcel/Public/Select-Worksheet.ps1 b/Public/Select-Worksheet.ps1 → ImportExcel/Public/Select-Worksheet.ps1
diff --git a/Public/Send-SQLDataToExcel.ps1 → ImportExcel/Public/Send-SQLDataToExcel.ps1 b/Public/Send-SQLDataToExcel.ps1 → ImportExcel/Public/Send-SQLDataToExcel.ps1
diff --git a/Public/Set-CellComment.ps1 → ImportExcel/Public/Set-CellComment.ps1 b/Public/Set-CellComment.ps1 → ImportExcel/Public/Set-CellComment.ps1
@@ -1,7 +1,5 @@
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='Set*', Justification='Does not change system state')]
-param()
-
-function Set-CellComment {
+function Set-CellComment {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system state')]
     [CmdletBinding(DefaultParameterSetName = "Range")]
     param(
         [Parameter(Mandatory = $True, ParameterSetName = "ColumnLetter")]

diff --git a/Public/Set-CellStyle.ps1 → ImportExcel/Public/Set-CellStyle.ps1 b/Public/Set-CellStyle.ps1 → ImportExcel/Public/Set-CellStyle.ps1
@@ -1,7 +1,5 @@
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='Set*', Justification='Does not change system state')]
-param()
-
-function Set-CellStyle {
+function Set-CellStyle {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system state')]
     [CmdletBinding()]
     param(
         $Worksheet,

diff --git a/Public/Set-ExcelColumn.ps1 → ImportExcel/Public/Set-ExcelColumn.ps1 b/Public/Set-ExcelColumn.ps1 → ImportExcel/Public/Set-ExcelColumn.ps1
diff --git a/Public/Set-ExcelRange.ps1 → ImportExcel/Public/Set-ExcelRange.ps1 b/Public/Set-ExcelRange.ps1 → ImportExcel/Public/Set-ExcelRange.ps1
diff --git a/Public/Set-ExcelRow.ps1 → ImportExcel/Public/Set-ExcelRow.ps1 b/Public/Set-ExcelRow.ps1 → ImportExcel/Public/Set-ExcelRow.ps1
diff --git a/Public/Set-WorksheetProtection.ps1 → ...tExcel/Public/Set-WorksheetProtection.ps1 b/Public/Set-WorksheetProtection.ps1 → ...tExcel/Public/Set-WorksheetProtection.ps1
diff --git a/Public/Update-FirstObjectProperties.ps1 → ...l/Public/Update-FirstObjectProperties.ps1 b/Public/Update-FirstObjectProperties.ps1 → ...l/Public/Update-FirstObjectProperties.ps1
@@ -1,9 +1,6 @@
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='Update*', Justification='Does not change system state')]
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '', Scope='Function', Target='Update*', Justification='Property would be incorrect')]
-
-param()
-
 function Update-FirstObjectProperties {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification='Does not change system state')]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '', Justification='Property would be incorrect')]
     [CmdletBinding()]
     param   (
         [Parameter(ValueFromPipeline=$true)]

diff --git a/ImportExcel/dot-sources.txt b/ImportExcel/dot-sources.txt
@@ -0,0 +1,11 @@
+# This file contains relative paths of folders to be dot-sourced during
+# development, but embedded in the tested and published .PSM1 file.
+#
+# Entries will be processed in order, leading and trailing whitespace will be
+# ignored, and lines beginning with "#" will be treated as a comment.
+
+Private
+Public
+Charting
+InferData
+Pivot