Skip to content

Commit d3b7fde

Browse files
update library names and versions
dbatools-library -> dbatools.library dbatools-core-library -> dbatools.core.library 4->8
1 parent 3deb325 commit d3b7fde

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

.github/workflows/integration-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- name: Install and cache PowerShell modules
1616
uses: potatoqualitee/[email protected]
1717
with:
18-
modules-to-cache: dbatools-core-library:2022.11.4
19-
modules-to-cache-prerelease: dbatools-library:2022.11.4-preview
18+
modules-to-cache: dbatools.core.library:2022.11.8
19+
modules-to-cache-prerelease: dbatools.library:2022.11.8-preview
2020

21-
- name: Install and cache dbatools-library
21+
- name: Install and cache dbatools.library
2222
run: |
2323
Import-Module ./dbatools.psd1 -Force
2424
Set-DbatoolsConfig -FullName sql.connection.trustcert -Value $true -Register
@@ -63,8 +63,8 @@ jobs:
6363
uses: potatoqualitee/[email protected]
6464
with:
6565
shell: powershell, pwsh
66-
modules-to-cache: dbatools-core-library:2022.11.4
67-
modules-to-cache-prerelease: dbatools-library:2022.11.4-preview
66+
modules-to-cache: dbatools.core.library:2022.11.8
67+
modules-to-cache-prerelease: dbatools.library:2022.11.8-preview
6868

6969
- name: Install SQL Server localdb
7070
uses: potatoqualitee/[email protected]

.github/workflows/xplat-import.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- name: Install and cache PowerShell modules
1717
uses: potatoqualitee/[email protected]
1818
with:
19-
modules-to-cache: dbatools-core-library:2022.11.4
20-
modules-to-cache-prerelease: dbatools-library:2022.11.4-preview
19+
modules-to-cache: dbatools.core.library:2022.11.8
20+
modules-to-cache-prerelease: dbatools.library:2022.11.8-preview
2121

2222
- name: Perform the import
2323
shell: pwsh

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cache:
1515
- C:\ProgramData\chocolatey\lib -> appveyor.yml
1616
- C:\Program Files\WindowsPowerShell\Modules\PSScriptAnalyzer -> appveyor.yml
1717
- C:\Program Files\WindowsPowerShell\Modules\Pester -> appveyor.yml
18-
- C:\Program Files\WindowsPowerShell\Modules\dbatools-library -> dbatools.psd1
18+
- C:\Program Files\WindowsPowerShell\Modules\dbatools.library -> dbatools.psd1
1919

2020
#shallow_clone: true
2121
clone_depth: 100
@@ -81,7 +81,7 @@ before_test:
8181
# turn tests directory (at least) to CRLF, as it's faster to do this on the zipball rather than checking out the repo
8282
- cmd: pushd C:\github\dbatools\tests & unix2dos -q *.ps1 & popd
8383
# don't clown -- for some reason it's just not installing the library
84-
- ps: if (-not(Test-Path 'C:\Program Files\WindowsPowerShell\Modules\dbatools-library')) { Install-Module -Name dbatools-library -Force | Out-Null }
84+
- ps: if (-not(Test-Path 'C:\Program Files\WindowsPowerShell\Modules\dbatools.library')) { Install-Module -Name dbatools.library -Force | Out-Null }
8585
# grab appveyor lab files and needed requirements for tests in CI
8686
- ps: .\Tests\appveyor.prep.ps1
8787

dbatools.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
RequiredModules = @(
5151
if ($PSEdition -eq 'Core') {
5252
@(
53-
@{ ModuleName = 'dbatools-core-library'; ModuleVersion = '2022.11.4' }
53+
@{ ModuleName = 'dbatools.core.library'; ModuleVersion = '2022.11.8' }
5454
)
5555
} else {
5656
@(
57-
@{ ModuleName = 'dbatools-library'; ModuleVersion = '2022.11.4' }
57+
@{ ModuleName = 'dbatools.library'; ModuleVersion = '2022.11.8' }
5858
)
5959
}
6060
)

dbatools.psm1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ $script:libraryroot = Get-DbatoolsLibraryPath -ErrorAction Ignore
4343
if (-not $script:libraryroot) {
4444
# for the people who bypass the psd1
4545
if ($PSVersionTable.PSEdition -eq "Core") {
46-
Import-Module dbatools-core-library -ErrorAction Ignore
46+
Import-Module dbatools.core.library -ErrorAction Ignore
4747
$script:libraryroot = Get-DbatoolsLibraryPath -ErrorAction Ignore
4848
} else {
49-
Import-Module dbatools-library -ErrorAction Ignore
49+
Import-Module dbatools.library -ErrorAction Ignore
5050
$script:libraryroot = Get-DbatoolsLibraryPath -ErrorAction Ignore
5151
}
5252

5353
if (-not $script:libraryroot) {
54-
throw "dbatools library module not found, please install it from the PowerShell Gallery. dbatools-library if you're using PS Desktop or dbatools-core-library if you're using PS Core"
54+
throw "dbatools library module not found, please install it from the PowerShell Gallery. dbatools.library if you're using PS Desktop or dbatools.core.library if you're using PS Core"
5555
}
5656
Write-ImportTime -Text "Couldn't find location for dbatools library module, loading it up"
5757
}

tests/appveyor.prep.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ if (-not(Test-Path 'C:\Program Files\WindowsPowerShell\Modules\PSScriptAnalyzer\
2626
Install-Module -Name PSScriptAnalyzer -Force -SkipPublisherCheck -MaximumVersion 1.18.2 | Out-Null
2727
}
2828

29-
#Get dbatools-library
30-
Write-Host -Object "appveyor.prep: Install dbatools-library" -ForegroundColor DarkGreen
31-
if (-not(Test-Path 'C:\Program Files\WindowsPowerShell\Modules\dbatools-library')) {
32-
Install-Module -Name dbatools-library -Force | Out-Null
29+
#Get dbatools.library
30+
Write-Host -Object "appveyor.prep: Install dbatools.library" -ForegroundColor DarkGreen
31+
if (-not(Test-Path 'C:\Program Files\WindowsPowerShell\Modules\dbatools.library')) {
32+
Install-Module -Name dbatools.library -Force | Out-Null
3333
}
3434

3535
#Get Pester (to run tests) - choco isn't working onall scenarios, weird
@@ -50,7 +50,7 @@ Write-Host -Object "appveyor.prep: Install opencover.portable" -ForegroundColor
5050
choco install opencover.portable | Out-Null
5151

5252
Write-Host -Object "appveyor.prep: Trust SQL Server Cert (now required)" -ForegroundColor DarkGreen
53-
Import-Module dbatools-library
53+
Import-Module dbatools.library
5454
Import-Module C:\github\dbatools\dbatools.psd1
5555
Set-DbatoolsConfig -FullName sql.connection.trustcert -Value $true -Register
5656
Set-DbatoolsConfig -FullName sql.connection.encrypt -Value Optional -Register

tests/gh-actions.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Describe "Integration Tests" -Tag "IntegrationTests" {
2020

2121
#$null = Get-XPlatVariable | Where-Object { $PSItem -notmatch "Copy-", "Migration" } | Sort-Object
2222
# load dbatools-lib
23-
Import-Module dbatools-core-library
23+
Import-Module dbatools.core.library
2424
Import-Module ./dbatools.psd1 -Force
2525
}
2626

0 commit comments

Comments
 (0)