Merge branch 'development'

dataplat · Jun 9, 2024 · f1bb4d1 · f1bb4d1
2 parents cd52bf9 + e5f6755
commit f1bb4d1
Show file tree

Hide file tree

Showing 24 changed files with 357 additions and 277 deletions.
diff --git a/.github/workflows/xplat-import.yml b/.github/workflows/xplat-import.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-latest, macOS-14]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ build_script:
  - ps: choco install dotnetcore-sdk | Out-String | Out-Null
 # - ps: Push-Location bin\projects\dbatools; dotnet build ;Pop-Location
 
-version: 0.9.{build}
+version: 2.1.{build}
 
 cache:
   - C:\ProgramData\chocolatey\bin -> appveyor.yml
@@ -23,7 +23,7 @@ clone_depth: 100
 # Set build info
 environment:
   environment: development
-  version: 0.9.$(appveyor_build_number)
+  version: 2.1.$(appveyor_build_number)
   appveyor_rdp_password: 2odCuiKmYiem
   azurepasswd1:
     secure: ZnF3fWSDfHraMCWlHaekvWrXf3sDqY5M28HMK4236PBbNSoqP29wEhsWMQioSSYGomzgIp9vuiwR8Fc9ViNLoqq0bVcErxEojBFTaPMEzOg2ZwO9OnOTiuUEc5JkoLBv6rEBBWef/DvkFfhr1r0K0xQu6OAPYHVTCRajTZbBRNfCTUM2X2o41t+cSa7681rtnJQnB/8cAfVVnPtJ+97s8w==

diff --git a/bin/dbatools-index.json b/bin/dbatools-index.json
diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2012.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2012.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2012 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2014.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2014.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2014 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2016.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2016.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2016 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2016SP2.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2016SP2.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2016 SP2 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2017.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2017.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2017 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2019.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2019.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2019 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 2, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/ 
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/bin/diagnosticquery/SQLServerDiagnosticQueries_2022.sql b/bin/diagnosticquery/SQLServerDiagnosticQueries_2022.sql
@@ -1,7 +1,7 @@
 
 -- SQL Server 2022 Diagnostic Information Queries
 -- Glenn Berry 
--- Last Modified: May 17, 2024
+-- Last Modified: June 3, 2024
 -- https://glennsqlperformance.com/ 
 -- https://sqlserverperformance.wordpress.com/
 -- YouTube: https://bit.ly/2PkoAM1 

diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -27,6 +27,28 @@ Use your best judgement. If it will possibly make others uncomfortable, do not p
 
 If you believe someone is violating the code of conduct, we ask that you report it by contacting [Chrissy LeMaire](https://twitter.com/cl) or [Shawn Melton](https://twitter.com/wsmelton).
 
+# Standard Enforcement
+
+All reports of unacceptable behavior will be reviewed and investigated promptly and fairly. The Data Platform Community Organization and the dbatools team are committed to ensuring enforcement is consistent and transparent.
+
+### Enforcement Process:
+1. **Report Submission:** Reports can be submitted to [Chrissy LeMaire](https://twitter.com/cl) or [Shawn Melton](https://twitter.com/wsmelton). Reports should include details of the incident, including dates, times, and any witnesses, if available.
+
+2. **Review and Investigation:** Upon receiving a report, an initial review will be conducted to determine its validity. If deemed valid, a thorough investigation will follow, maintaining the confidentiality of the reporter.
+
+3. **Decision and Action:** Based on the investigation findings, appropriate actions will be taken. This may range from a warning to the offender to expulsion from the community or event, depending on the severity of the behavior.
+
+4. **Notification:** The reporter will be informed of the outcome of the investigation and any actions taken, while respecting the privacy of all parties involved.
+
+5. **Appeal Process:** The accused party has the right to appeal the decision by providing additional information or context. Appeals will be reviewed by a separate committee to ensure impartiality.
+
+### Consequences:
+- **Warning:** For minor violations, a private warning may be issued to the offender.
+- **Temporary Ban:** For repeated or more severe violations, a temporary ban from the community or event may be imposed.
+- **Permanent Ban:** For the most severe violations, a permanent ban from the community or all future events may be enforced.
+
+The Data Platform Community Organization and the dbatools team reserve the right to take any other actions deemed necessary to uphold the principles of the Code of Conduct.
+
 # Credit
 
 Portions of this Code of Conduct are based on the [example anti-harassment policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) from the Geek Feminism wiki, created by the Ada Initiative and other volunteers, under a Creative Commons Zero license.
diff --git a/dbatools.psd1 b/dbatools.psd1
@@ -11,7 +11,7 @@
     RootModule         = 'dbatools.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '2.1.16'
+    ModuleVersion      = '2.1.17'
 
     # ID used to uniquely identify this module
     GUID               = '9d139310-ce45-41ce-8e8b-d76335aa1789'

diff --git a/private/functions/Get-DbaHelp.ps1 b/private/functions/Get-DbaHelp.ps1
@@ -62,6 +62,7 @@ function Get-DbaHelp {
         $availability = 'Windows, Linux, macOS'
 
         function Get-DbaDocsMD($doc_to_render) {
+
             $rtn = New-Object -TypeName "System.Collections.ArrayList"
             $null = $rtn.Add("# $($doc_to_render.CommandName)" )
             if ($doc_to_render.Author -or $doc_to_render.Availability) {
@@ -81,11 +82,16 @@ function Get-DbaHelp {
                 $null = $rtn.Add('*Aliases : ' + $doc_to_render.Alias + '*')
                 $null = $rtn.Add('')
             }
+            $null = $rtn.Add('Want to see the source code for this command? Check out [' + $doc_to_render.CommandName + '](https://github.com/dataplat/dbatools/blob/master/public/' + $doc_to_render.CommandName + '.ps1) on GitHub.')
+            $null = $rtn.Add("<br>")
+            $null = $rtn.Add('Want to see the Bill Of Health for this command? Check out [' + $doc_to_render.CommandName + '](https://dataplat.github.io/boh#' + $doc_to_render.CommandName + ').')
             $null = $rtn.Add('## Synopsis')
-            $null = $rtn.Add($doc_to_render.Synopsis)
+            $null = $rtn.Add($doc_to_render.Synopsis.Replace("`n", "  `n"))
             $null = $rtn.Add('')
             $null = $rtn.Add('## Description')
-            $null = $rtn.Add($doc_to_render.Description)
+            if ($doc_to_render.Description) {
+                $null = $rtn.Add($doc_to_render.Description.Replace("`n", "  `n"))
+            }
             $null = $rtn.Add('')
             if ($doc_to_render.Syntax) {
                 $null = $rtn.Add('## Syntax')
@@ -102,7 +108,15 @@ function Get-DbaHelp {
                         if ($x -eq 0) {
                             $null = $rtn.Add($val)
                         } else {
-                            $null = $rtn.Add('    [' + $val.replace("`n", '').replace("`n", ''))
+                            $xx = 0
+                            foreach ($subparam in ($val -split ' -')) {
+                                if ($xx -eq 0) {
+                                    $null = $rtn.Add('    [' + $subparam.replace("`n", '').replace("`n", ''))
+                                } else {
+                                    $null = $rtn.Add('    -' + $subparam.replace("`n", '').replace("`n", ''))
+                                }
+                                $xx += 1
+                            }
                         }
                         $x += 1
                     }
@@ -133,7 +147,7 @@ function Get-DbaHelp {
                         $inside = 0
                         $null = $rtn.Add('```')
                     }
-                    $null = $rtn.Add("$row<br>")
+                    $null = $rtn.Add("$($row.Replace("`n", "  `n"))<br>")
                 }
             }
             if ($inside -eq 1) {
@@ -155,7 +169,7 @@ function Get-DbaHelp {
                         $null = $rtn.Add('### Required Parameters')
                     }
                     $null = $rtn.Add('##### -' + $el[0])
-                    $null = $rtn.Add($el[1] + '<br>')
+                    $null = $rtn.Add($el[1].Replace("`r", "").Replace("`n", "  `n") + ' <br>')
                     $null = $rtn.Add('')
                     $null = $rtn.Add('|  |  |')
                     $null = $rtn.Add('| - | - |')
@@ -182,7 +196,7 @@ function Get-DbaHelp {
                     }
 
                     $null = $rtn.Add('##### -' + $el[0])
-                    $null = $rtn.Add($el[1] + '<br>')
+                    $null = $rtn.Add($el[1].Replace("`r", "").Replace("`n", "  `n") + '<br>')
                     $null = $rtn.Add('')
                     $null = $rtn.Add('|  |  |')
                     $null = $rtn.Add('| - | - |')
@@ -196,11 +210,9 @@ function Get-DbaHelp {
                     $null = $rtn.Add('')
                 }
             }
+
             $null = $rtn.Add('')
             $null = $rtn.Add("`n" + '&nbsp;' + "`n")
-            $null = $rtn.Add('Want to see the source code for this command? Check out [' + $doc_to_render.CommandName + '](https://github.com/dataplat/dbatools/blob/master/public/' + $doc_to_render.CommandName + '.ps1) on GitHub.')
-            $null = $rtn.Add("<br>")
-            $null = $rtn.Add('Want to see the Bill Of Health for this command? Check out [' + $doc_to_render.CommandName + '](https://dataplat.github.io/boh#' + $doc_to_render.CommandName + ').')
             $null = $rtn.Add('')
 
             return $rtn
@@ -370,7 +382,7 @@ function Get-DbaHelp {
             [-ModuleExport] [-PassThru] [-AllowDelete] [<CommonParameters>]'
         }
         if ($OutputAs -eq "PSObject") {
-            [pscustomobject]$thebase
+            [PSCustomObject]$thebase
         } elseif ($OutputAs -eq "MDString") {
             Get-DbaDocsMD -doc_to_render $thebase
         }