Skip to content

Commit

Permalink
Merge branch 'development' into RemoveDbaDatabaseSafely_fix_9111
Browse files Browse the repository at this point in the history
  • Loading branch information
potatoqualitee committed Oct 10, 2023
2 parents b1e6e1a + f3798e2 commit 428bbfc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gallery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, arm64]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, arm64]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
Expand Down
24 changes: 19 additions & 5 deletions dbatools.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -854,11 +854,27 @@ if ($PSVersionTable.PSVersion.Major -lt 5) {
'New-DbaLinkedServerLogin',
'Remove-DbaLinkedServerLogin',
'Remove-DbaCredential',
'Remove-DbaAgentProxy'
'Remove-DbaAgentProxy',
'Disable-DbaReplDistributor',
'Enable-DbaReplDistributor',
'Disable-DbaReplPublishing',
'Enable-DbaReplPublishing',
'New-DbaReplPublication',
'Get-DbaReplArticle',
'Get-DbaReplArticleColumn',
'Add-DbaReplArticle',
'Remove-DbaReplArticle',
'Remove-DbaReplPublication',
'New-DbaReplSubscription',
'Remove-DbaReplSubscription',
'New-DbaReplCreationScriptOptions',
'Get-DbaReplSubscription',
'Get-DbaReplDistributor',
'Get-DbaReplPublication',
'Get-DbaReplServer'
)
$script:noncoresmo = @(
# SMO issues
'Get-DbaReplDistributor',
'Copy-DbaPolicyManagement',
'Copy-DbaDataCollector',
'Get-DbaPbmCategory',
Expand All @@ -867,10 +883,8 @@ if ($PSVersionTable.PSVersion.Major -lt 5) {
'Get-DbaPbmObjectSet',
'Get-DbaPbmPolicy',
'Get-DbaPbmStore',
'Get-DbaReplPublication',
'Test-DbaReplLatency',
'Export-DbaReplServerSetting',
'Get-DbaReplServer'
'Export-DbaReplServerSetting'
)
$script:windowsonly = @(
# filesystem (\\ related),
Expand Down

0 comments on commit 428bbfc

Please sign in to comment.