From 66bf3adf17f3fb87ea9e21104a78159877f53a5b Mon Sep 17 00:00:00 2001 From: jhoneill Date: Sun, 17 Nov 2019 22:45:29 +0000 Subject: [PATCH] remove LoadPSD calls & 72 empty catch blocks from examples --- Examples/AddWorkSheet/AddMultiWorkSheet.ps1 | 4 ++-- Examples/AddWorkSheet/AddWorkSheet.ps1 | 2 +- Examples/Charts/MultiSeries.ps1 | 2 +- Examples/Charts/MultiSeries1.ps1 | 2 +- Examples/Charts/MultipleCharts.ps1 | 2 +- Examples/Charts/plot.ps1 | 2 +- Examples/ConditionalFormatting/ConditionalText.ps1 | 2 +- Examples/ConditionalFormatting/ContainsBlanks.ps1 | 2 +- Examples/ConditionalFormatting/Databar.ps1 | 2 +- Examples/ConditionalFormatting/FormatCalculations.ps1 | 2 +- Examples/ConditionalFormatting/GetProcess.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-Last7Days.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-LastMonth.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-LastWeek.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-NextMonth.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-NextWeek.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-ThisMonth.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-ThisWeek.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-Today.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-Tomorrow.ps1 | 2 +- Examples/ConditionalFormatting/Highlight-Yesterday.ps1 | 2 +- Examples/ConditionalFormatting/HighlightDuplicates.ps1 | 2 +- Examples/ConditionalFormatting/MonthlyTemperatuesDatabar.ps1 | 2 +- Examples/ConditionalFormatting/RangeFormatting.ps1 | 2 +- Examples/ConditionalFormatting/SalesReportWithDatabar.ps1 | 2 +- Examples/ConvertFrom/ConvertFrom.ps1 | 2 +- Examples/CustomReporting/CustomReport.ps1 | 2 +- Examples/ExcelDataValidation/MutipleValidations.ps1 | 2 +- Examples/ExcelToSQLInsert/DemoSQLInsert.ps1 | 2 +- Examples/Fibonacci/ShowFibonacci.ps1 | 2 +- Examples/FormatCellStyles/ApplyFormatInScriptBlock.ps1 | 2 +- Examples/FormatCellStyles/PassInScriptBlock.ps1 | 2 +- Examples/HyperLinks/Hyperlinks.ps1 | 2 +- Examples/ImportHtml/DemoGraphics.ps1 | 2 +- Examples/ImportHtml/PeriodicElements.ps1 | 2 +- Examples/ImportHtml/StarTrek.ps1 | 2 +- Examples/JoinWorksheet/JoinSalesData.ps1 | 2 +- Examples/JustCharts/CentralLimitTheorem.ps1 | 2 +- Examples/JustCharts/PieChartHandles.ps1 | 2 +- Examples/JustCharts/PieChartPM.ps1 | 2 +- Examples/JustCharts/TryBarChart.ps1 | 2 +- Examples/JustCharts/TryColumnChart.ps1 | 2 +- Examples/JustCharts/TryPieChart.ps1 | 2 +- Examples/MergeWorkSheet/MergeCSV.ps1 | 2 +- Examples/MoveSheets/MoveSheets.ps1 | 2 +- Examples/Nasa/FireBalls.ps1 | 2 +- Examples/NumberFormat/ColorizeNumbers.ps1 | 2 +- Examples/NumberFormat/CurrencyFormat.ps1 | 2 +- Examples/NumberFormat/PercentagFormat.ps1 | 2 +- Examples/NumberFormat/PosNegNumbers.ps1 | 2 +- Examples/NumberFormat/Win32LogicalDisk.ps1 | 2 +- Examples/NumberFormat/Win32LogicalDiskFormatted.ps1 | 2 +- Examples/PassThru/TryPassThru.ps1 | 2 +- Examples/PivotTable/PivotTableWithName.ps1 | 2 +- Examples/PivotTableFilters/testPivotFilter.ps1 | 2 +- Examples/Plot/PlotCos.ps1 | 2 +- Examples/SQL+FillColumns+Pivot/Example.ps1 | 2 +- Examples/SQL+FillColumns+Pivot/Example2.ps1 | 2 +- .../SetColumnBackgroundColor/SetColumnBackgroundColor.ps1 | 2 +- Examples/Sparklines/SalesByQuarter.ps1 | 2 +- Examples/Sparklines/Sparklines.ps1 | 2 +- Examples/SpreadsheetCells/CalculatedFields.ps1 | 2 +- Examples/SpreadsheetCells/ExcelFormulasUsingAddMember.ps1 | 2 +- Examples/SpreadsheetCells/ExcelFunctions.ps1 | 2 +- Examples/SpreadsheetCells/HyperLink.ps1 | 2 +- Examples/Styles/MultipleStyles.ps1 | 2 +- Examples/Styles/NewExcelStyle.ps1 | 2 +- Examples/Tables/MultipleTables.ps1 | 2 +- Examples/TestRestAPI/RunAndShowUnitTests.ps1 | 2 +- Examples/TestRestAPI/TryIt.ps1 | 2 +- Examples/TryMultiplePivotTablesFromOneSheet.ps1 | 2 +- Examples/XlRangeToImage/XlRangeToImage.ps1 | 2 +- LoadPSD1.ps1 | 3 --- 73 files changed, 73 insertions(+), 76 deletions(-) delete mode 100644 LoadPSD1.ps1 diff --git a/Examples/AddWorkSheet/AddMultiWorkSheet.ps1 b/Examples/AddWorkSheet/AddMultiWorkSheet.ps1 index fc0a877..6318980 100644 --- a/Examples/AddWorkSheet/AddMultiWorkSheet.ps1 +++ b/Examples/AddWorkSheet/AddMultiWorkSheet.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $xlSourcefile = "$env:TEMP\Source.xlsx" write-host "Save location: $xlSourcefile" @@ -6,7 +6,7 @@ write-host "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 +$TabData1 = 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 diff --git a/Examples/AddWorkSheet/AddWorkSheet.ps1 b/Examples/AddWorkSheet/AddWorkSheet.ps1 index 4535d4c..c4e798c 100644 --- 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" diff --git a/Examples/Charts/MultiSeries.ps1 b/Examples/Charts/MultiSeries.ps1 index e1d9eee..ff3fdfb 100644 --- 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 diff --git a/Examples/Charts/MultiSeries1.ps1 b/Examples/Charts/MultiSeries1.ps1 index ddcbf4b..e727ffc 100644 --- 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 diff --git a/Examples/Charts/MultipleCharts.ps1 b/Examples/Charts/MultipleCharts.ps1 index dfffe5d..82f5ad0 100644 --- 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 diff --git a/Examples/Charts/plot.ps1 b/Examples/Charts/plot.ps1 index f8c0401..c311fe9 100644 --- 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( diff --git a/Examples/ConditionalFormatting/ConditionalText.ps1 b/Examples/ConditionalFormatting/ConditionalText.ps1 index 96130e1..8a9b9ab 100644 --- 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 diff --git a/Examples/ConditionalFormatting/ContainsBlanks.ps1 b/Examples/ConditionalFormatting/ContainsBlanks.ps1 index 45eb134..3ced09a 100644 --- a/Examples/ConditionalFormatting/ContainsBlanks.ps1 +++ b/Examples/ConditionalFormatting/ContainsBlanks.ps1 @@ -1,4 +1,4 @@ -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 diff --git a/Examples/ConditionalFormatting/Databar.ps1 b/Examples/ConditionalFormatting/Databar.ps1 index 3b72742..d117244 100644 --- 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 diff --git a/Examples/ConditionalFormatting/FormatCalculations.ps1 b/Examples/ConditionalFormatting/FormatCalculations.ps1 index 11098d7..f343b0c 100644 --- 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" diff --git a/Examples/ConditionalFormatting/GetProcess.ps1 b/Examples/ConditionalFormatting/GetProcess.ps1 index ed6c47e..860d130 100644 --- 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 diff --git a/Examples/ConditionalFormatting/Highlight-Last7Days.ps1 b/Examples/ConditionalFormatting/Highlight-Last7Days.ps1 index 3246bd8..005f17a 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-LastMonth.ps1 b/Examples/ConditionalFormatting/Highlight-LastMonth.ps1 index 04d43ac..fe837b4 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-LastWeek.ps1 b/Examples/ConditionalFormatting/Highlight-LastWeek.ps1 index 18466c0..7877296 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-NextMonth.ps1 b/Examples/ConditionalFormatting/Highlight-NextMonth.ps1 index 4d0f60c..ca8285a 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-NextWeek.ps1 b/Examples/ConditionalFormatting/Highlight-NextWeek.ps1 index 196ab22..5930faa 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-ThisMonth.ps1 b/Examples/ConditionalFormatting/Highlight-ThisMonth.ps1 index 85a7c81..e3ddb87 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-ThisWeek.ps1 b/Examples/ConditionalFormatting/Highlight-ThisWeek.ps1 index 02a4de0..da9f46a 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-Today.ps1 b/Examples/ConditionalFormatting/Highlight-Today.ps1 index fce0ec8..58df813 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-Tomorrow.ps1 b/Examples/ConditionalFormatting/Highlight-Tomorrow.ps1 index d336223..e6dc9f4 100644 --- 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" diff --git a/Examples/ConditionalFormatting/Highlight-Yesterday.ps1 b/Examples/ConditionalFormatting/Highlight-Yesterday.ps1 index af53393..0b3f080 100644 --- 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" diff --git a/Examples/ConditionalFormatting/HighlightDuplicates.ps1 b/Examples/ConditionalFormatting/HighlightDuplicates.ps1 index 5ed5627..66d71c0 100644 --- 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" diff --git a/Examples/ConditionalFormatting/MonthlyTemperatuesDatabar.ps1 b/Examples/ConditionalFormatting/MonthlyTemperatuesDatabar.ps1 index 8cfb0dd..d75cb1d 100644 --- 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 diff --git a/Examples/ConditionalFormatting/RangeFormatting.ps1 b/Examples/ConditionalFormatting/RangeFormatting.ps1 index 2ca3b60..aeee56b 100644 --- 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 diff --git a/Examples/ConditionalFormatting/SalesReportWithDatabar.ps1 b/Examples/ConditionalFormatting/SalesReportWithDatabar.ps1 index 8a126c5..a36e444 100644 --- 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 diff --git a/Examples/ConvertFrom/ConvertFrom.ps1 b/Examples/ConvertFrom/ConvertFrom.ps1 index 0aeac85..8885a59 100644 --- 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 diff --git a/Examples/CustomReporting/CustomReport.ps1 b/Examples/CustomReporting/CustomReport.ps1 index 70447bb..35c8e9f 100644 --- 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 diff --git a/Examples/ExcelDataValidation/MutipleValidations.ps1 b/Examples/ExcelDataValidation/MutipleValidations.ps1 index 4344843..b19ef2e 100644 --- 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 diff --git a/Examples/ExcelToSQLInsert/DemoSQLInsert.ps1 b/Examples/ExcelToSQLInsert/DemoSQLInsert.ps1 index 9825e1c..c29cf11 100644 --- 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 '' diff --git a/Examples/Fibonacci/ShowFibonacci.ps1 b/Examples/Fibonacci/ShowFibonacci.ps1 index 54bc2d1..eab3a94 100644 --- 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 diff --git a/Examples/FormatCellStyles/ApplyFormatInScriptBlock.ps1 b/Examples/FormatCellStyles/ApplyFormatInScriptBlock.ps1 index 9fb2b21..10e1f41 100644 --- 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" diff --git a/Examples/FormatCellStyles/PassInScriptBlock.ps1 b/Examples/FormatCellStyles/PassInScriptBlock.ps1 index ac9e0a2..2964a57 100644 --- 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 diff --git a/Examples/HyperLinks/Hyperlinks.ps1 b/Examples/HyperLinks/Hyperlinks.ps1 index 6e5c2be..4c5e627 100644 --- 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 diff --git a/Examples/ImportHtml/DemoGraphics.ps1 b/Examples/ImportHtml/DemoGraphics.ps1 index 68c8868..b017e70 100644 --- 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 \ No newline at end of file diff --git a/Examples/ImportHtml/PeriodicElements.ps1 b/Examples/ImportHtml/PeriodicElements.ps1 index d4038a4..b9dd4ae 100644 --- 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 \ No newline at end of file diff --git a/Examples/ImportHtml/StarTrek.ps1 b/Examples/ImportHtml/StarTrek.ps1 index 17fd975..53ab094 100644 --- 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 \ No newline at end of file diff --git a/Examples/JoinWorksheet/JoinSalesData.ps1 b/Examples/JoinWorksheet/JoinSalesData.ps1 index f8938f1..f4463fb 100644 --- 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" diff --git a/Examples/JustCharts/CentralLimitTheorem.ps1 b/Examples/JustCharts/CentralLimitTheorem.ps1 index 1d59d3d..6945647 100644 --- 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++) { diff --git a/Examples/JustCharts/PieChartHandles.ps1 b/Examples/JustCharts/PieChartHandles.ps1 index 7103275..12f5478 100644 --- 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) diff --git a/Examples/JustCharts/PieChartPM.ps1 b/Examples/JustCharts/PieChartPM.ps1 index 68c404f..1d24587 100644 --- 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) diff --git a/Examples/JustCharts/TryBarChart.ps1 b/Examples/JustCharts/TryBarChart.ps1 index 57208de..d007dcd 100644 --- 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" \ No newline at end of file diff --git a/Examples/JustCharts/TryColumnChart.ps1 b/Examples/JustCharts/TryColumnChart.ps1 index d4bd515..945647a 100644 --- 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" diff --git a/Examples/JustCharts/TryPieChart.ps1 b/Examples/JustCharts/TryPieChart.ps1 index 09ccaad..016abf7 100644 --- 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" \ No newline at end of file diff --git a/Examples/MergeWorkSheet/MergeCSV.ps1 b/Examples/MergeWorkSheet/MergeCSV.ps1 index 49f677a..af4f3c1 100644 --- 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" diff --git a/Examples/MoveSheets/MoveSheets.ps1 b/Examples/MoveSheets/MoveSheets.ps1 index 6b6887b..330746a 100644 --- 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 diff --git a/Examples/Nasa/FireBalls.ps1 b/Examples/Nasa/FireBalls.ps1 index cec1554..4dd99a5 100644 --- a/Examples/Nasa/FireBalls.ps1 +++ b/Examples/Nasa/FireBalls.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $header = echo ` 'Date/Time - Peak Brightness (UT)' ` diff --git a/Examples/NumberFormat/ColorizeNumbers.ps1 b/Examples/NumberFormat/ColorizeNumbers.ps1 index 1352432..0b6a026 100644 --- 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" diff --git a/Examples/NumberFormat/CurrencyFormat.ps1 b/Examples/NumberFormat/CurrencyFormat.ps1 index d6f589d..490b9d7 100644 --- 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" diff --git a/Examples/NumberFormat/PercentagFormat.ps1 b/Examples/NumberFormat/PercentagFormat.ps1 index b2e50ed..bd5d5e3 100644 --- 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" diff --git a/Examples/NumberFormat/PosNegNumbers.ps1 b/Examples/NumberFormat/PosNegNumbers.ps1 index 5160822..4103837 100644 --- 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" diff --git a/Examples/NumberFormat/Win32LogicalDisk.ps1 b/Examples/NumberFormat/Win32LogicalDisk.ps1 index fc981dc..97b3176 100644 --- 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" diff --git a/Examples/NumberFormat/Win32LogicalDiskFormatted.ps1 b/Examples/NumberFormat/Win32LogicalDiskFormatted.ps1 index 671f979..dd14ae5 100644 --- 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" diff --git a/Examples/PassThru/TryPassThru.ps1 b/Examples/PassThru/TryPassThru.ps1 index a80e176..424ce87 100644 --- 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" diff --git a/Examples/PivotTable/PivotTableWithName.ps1 b/Examples/PivotTable/PivotTableWithName.ps1 index ae0c395..9ce3f34 100644 --- 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" diff --git a/Examples/PivotTableFilters/testPivotFilter.ps1 b/Examples/PivotTableFilters/testPivotFilter.ps1 index 33b89fd..9963beb 100644 --- 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 diff --git a/Examples/Plot/PlotCos.ps1 b/Examples/Plot/PlotCos.ps1 index 9be0cf5..6c4c6b8 100644 --- 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*$_)})) diff --git a/Examples/SQL+FillColumns+Pivot/Example.ps1 b/Examples/SQL+FillColumns+Pivot/Example.ps1 index 9300f04..4de0062 100644 --- 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 , diff --git a/Examples/SQL+FillColumns+Pivot/Example2.ps1 b/Examples/SQL+FillColumns+Pivot/Example2.ps1 index 58fa933..8fe0a65 100644 --- 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 diff --git a/Examples/SetColumnBackgroundColor/SetColumnBackgroundColor.ps1 b/Examples/SetColumnBackgroundColor/SetColumnBackgroundColor.ps1 index 36580c1..28542d0 100644 --- 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" diff --git a/Examples/Sparklines/SalesByQuarter.ps1 b/Examples/Sparklines/SalesByQuarter.ps1 index 0053707..d2263a2 100644 --- 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 diff --git a/Examples/Sparklines/Sparklines.ps1 b/Examples/Sparklines/Sparklines.ps1 index 4cc6b44..2816d97 100644 --- 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 diff --git a/Examples/SpreadsheetCells/CalculatedFields.ps1 b/Examples/SpreadsheetCells/CalculatedFields.ps1 index 2a4c139..be988d7 100644 --- 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 diff --git a/Examples/SpreadsheetCells/ExcelFormulasUsingAddMember.ps1 b/Examples/SpreadsheetCells/ExcelFormulasUsingAddMember.ps1 index 672324c..e55fab3 100644 --- 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 diff --git a/Examples/SpreadsheetCells/ExcelFunctions.ps1 b/Examples/SpreadsheetCells/ExcelFunctions.ps1 index a5aa6f4..aac6f69 100644 --- a/Examples/SpreadsheetCells/ExcelFunctions.ps1 +++ b/Examples/SpreadsheetCells/ExcelFunctions.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} Remove-Item "$env:temp\functions.xlsx" -ErrorAction SilentlyContinue diff --git a/Examples/SpreadsheetCells/HyperLink.ps1 b/Examples/SpreadsheetCells/HyperLink.ps1 index 36e92fe..3f4a111 100644 --- a/Examples/SpreadsheetCells/HyperLink.ps1 +++ b/Examples/SpreadsheetCells/HyperLink.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} Remove-Item "$env:temp\hyperlink.xlsx" -ErrorAction SilentlyContinue diff --git a/Examples/Styles/MultipleStyles.ps1 b/Examples/Styles/MultipleStyles.ps1 index 3c0de35..70b57ff 100644 --- a/Examples/Styles/MultipleStyles.ps1 +++ b/Examples/Styles/MultipleStyles.ps1 @@ -1,4 +1,4 @@ -try { . $PSScriptRoot\..\..\LoadPSD1.ps1 } catch { } +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $xlfile = "$env:TEMP\test.xlsx" Remove-Item $xlfile -ErrorAction SilentlyContinue diff --git a/Examples/Styles/NewExcelStyle.ps1 b/Examples/Styles/NewExcelStyle.ps1 index b5a3ddf..77286f0 100644 --- a/Examples/Styles/NewExcelStyle.ps1 +++ b/Examples/Styles/NewExcelStyle.ps1 @@ -1,5 +1,5 @@ # https://raw.githubusercontent.com/dfinke/ImportExcel/master/images/NewExcelStyle.png -try { . $PSScriptRoot\..\..\LoadPSD1.ps1 } catch { } +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $xlfile = "$env:TEMP\test.xlsx" Remove-Item $xlfile -ErrorAction SilentlyContinue diff --git a/Examples/Tables/MultipleTables.ps1 b/Examples/Tables/MultipleTables.ps1 index 03f8a89..d2c0188 100644 --- a/Examples/Tables/MultipleTables.ps1 +++ b/Examples/Tables/MultipleTables.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $xlfile = "$env:Temp\testData.xlsx" Remove-Item $xlfile -ErrorAction SilentlyContinue diff --git a/Examples/TestRestAPI/RunAndShowUnitTests.ps1 b/Examples/TestRestAPI/RunAndShowUnitTests.ps1 index 8a02b80..6f1bf44 100644 --- a/Examples/TestRestAPI/RunAndShowUnitTests.ps1 +++ b/Examples/TestRestAPI/RunAndShowUnitTests.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $xlfilename=".\test.xlsx" rm $xlfilename -ErrorAction Ignore diff --git a/Examples/TestRestAPI/TryIt.ps1 b/Examples/TestRestAPI/TryIt.ps1 index 66c0037..d6d6eae 100644 --- a/Examples/TestRestAPI/TryIt.ps1 +++ b/Examples/TestRestAPI/TryIt.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} . $PSScriptRoot\TestAPIReadXls.ps1 diff --git a/Examples/TryMultiplePivotTablesFromOneSheet.ps1 b/Examples/TryMultiplePivotTablesFromOneSheet.ps1 index 1533a78..eb76f8c 100644 --- a/Examples/TryMultiplePivotTablesFromOneSheet.ps1 +++ b/Examples/TryMultiplePivotTablesFromOneSheet.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} $file = "C:\Temp\test.xlsx" diff --git a/Examples/XlRangeToImage/XlRangeToImage.ps1 b/Examples/XlRangeToImage/XlRangeToImage.ps1 index fdfe98a..dff53f2 100644 --- a/Examples/XlRangeToImage/XlRangeToImage.ps1 +++ b/Examples/XlRangeToImage/XlRangeToImage.ps1 @@ -1,4 +1,4 @@ -try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {} +try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return} . .\ConvertExcelToImageFile.ps1 diff --git a/LoadPSD1.ps1 b/LoadPSD1.ps1 deleted file mode 100644 index 68a9ec5..0000000 --- a/LoadPSD1.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -if($null -eq (Get-Module -ListAvailable ImportExcel) ) { - Import-Module $PSScriptRoot\ImportExcel.psd1 -force -} \ No newline at end of file