diff --git a/PSSQLite/PSSQLite.psm1 b/PSSQLite/PSSQLite.psm1 index 0311548..58dd30d 100644 --- a/PSSQLite/PSSQLite.psm1 +++ b/PSSQLite/PSSQLite.psm1 @@ -5,38 +5,30 @@ } #Pick and import assemblies: - if($PSEdition -eq 'core') + if($PSEdition -eq 'core' -and !$isWindows) { - if($isLinux) { - write-verbose "loading linux-x64 core" - $SQLiteAssembly = Join-path $PSScriptRoot "core\linux-x64\System.Data.SQLite.dll" - } - - if ($isMacOS) { - write-verbose "loading mac-x64 core" - $SQLiteAssembly = Join-path $PSScriptRoot "core\osx-x64\System.Data.SQLite.dll" - } + if($isLinux) + { + write-verbose "loading linux-x64 core" + $SQLiteAssembly = Join-path $PSScriptRoot "core\linux-x64\System.Data.SQLite.dll" + } + + if ($isMacOS) + { + write-verbose "loading mac-x64 core" + $SQLiteAssembly = Join-path $PSScriptRoot "core\osx-x64\System.Data.SQLite.dll" + } - if ($isWindows) { - if([IntPtr]::size -eq 8) { #64 - write-verbose "loading win-x64 core" - $SQLiteAssembly = Join-path $PSScriptRoot "core\win-x64\System.Data.SQLite.dll" - } - elseif([IntPtr]::size -eq 4) { #32 - write-verbose "loading win-x32 core" - $SQLiteAssembly = Join-path $PSScriptRoot "core\win-x86\System.Data.SQLite.dll" - } - } - write-verbose -message "is PS Core, loading dotnet core dll" } elseif([IntPtr]::size -eq 8) #64 { - write-verbose -message "is x64, loading..." - $SQLiteAssembly = Join-path $PSScriptRoot "x64\System.Data.SQLite.dll" + write-verbose -message "is win-x64, loading..." + $SQLiteAssembly = Join-path $PSScriptRoot "core\win-x64\System.Data.SQLite.dll" } elseif([IntPtr]::size -eq 4) #32 { - $SQLiteAssembly = Join-path $PSScriptRoot "x86\System.Data.SQLite.dll" + write-verbose -message "is win-x86, loading..." + $SQLiteAssembly = Join-path $PSScriptRoot "core\win-x86\System.Data.SQLite.dll" } else { diff --git a/PSSQLite/x64/SQLite.Interop.dll b/PSSQLite/x64/SQLite.Interop.dll deleted file mode 100644 index 5530b8c..0000000 Binary files a/PSSQLite/x64/SQLite.Interop.dll and /dev/null differ diff --git a/PSSQLite/x64/System.Data.SQLite.dll b/PSSQLite/x64/System.Data.SQLite.dll deleted file mode 100644 index 9910cbb..0000000 Binary files a/PSSQLite/x64/System.Data.SQLite.dll and /dev/null differ diff --git a/PSSQLite/x86/SQLite.Interop.dll b/PSSQLite/x86/SQLite.Interop.dll deleted file mode 100644 index af15521..0000000 Binary files a/PSSQLite/x86/SQLite.Interop.dll and /dev/null differ diff --git a/PSSQLite/x86/System.Data.SQLite.dll b/PSSQLite/x86/System.Data.SQLite.dll deleted file mode 100644 index 9910cbb..0000000 Binary files a/PSSQLite/x86/System.Data.SQLite.dll and /dev/null differ