From 1bf09eced58ac29f05d29ae752a5fc693c44a3a8 Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Sat, 26 Oct 2024 14:02:34 +0200 Subject: [PATCH] Fix localization hqrm (#2050) --- CHANGELOG.md | 7 +++++++ RequiredModules.psd1 | 8 +++++++- build.yaml | 14 ++++++++++++-- .../SqlServerDsc.Common/SqlServerDsc.Common.psm1 | 4 +--- ...redentialOverview.md => Credential-overview.md} | 6 +++++- 5 files changed, 32 insertions(+), 7 deletions(-) rename source/WikiSource/{CredentialOverview.md => Credential-overview.md} (97%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95c60c5a..1c714eab6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + - SqlSetup - Fixed issue with AddNode where cluster IP information was not being passed to setup.exe. ([issue #1171](https://github.com/dsccommunity/SqlServerDsc/issues/1171)) +### Fixed + +- SqlServerDsc + - Fix localization tests. + ## [17.0.0] - 2024-09-30 ### Added diff --git a/RequiredModules.psd1 b/RequiredModules.psd1 index 4ba54f838..4bc2c9759 100644 --- a/RequiredModules.psd1 +++ b/RequiredModules.psd1 @@ -36,7 +36,13 @@ 'DscResource.Common' = 'latest' # Analyzer rules - 'DscResource.AnalyzerRules' = 'latest' + 'DscResource.AnalyzerRules' = @{ + Version = 'latest' + Parameters = @{ + AllowPrerelease = $true + } + } + 'Indented.ScriptAnalyzerRules' = 'latest' # Dependency for integration tests diff --git a/build.yaml b/build.yaml index 4870bf191..7025a6dc6 100644 --- a/build.yaml +++ b/build.yaml @@ -14,6 +14,7 @@ BuildWorkflow: - Create_Changelog_Release_Output docs: + - Clean_WikiContent_Folder - Check_SqlServer_Availability - Generate_Conceptual_Help - Generate_Wiki_Content @@ -46,13 +47,22 @@ BuildWorkflow: try { [Microsoft.SqlServer.Management.Smo.Server] -as [Type] | Out-Null + [Microsoft.SqlServer.Management.Smo.Wmi.Service] -as [Type] | Out-Null } catch { - throw 'The SqlServer types are not available. Please install the SqlServer module or load SMO stubs types and try again.' + Write-Error -Message "Both the SqlServer namespaces Microsoft.SqlServer.Management.Smo or Microsoft.SqlServer.Management.Smo.Wmi are not available. Please install the SqlServer module.`nBy using PSResourceGet: Save-PSResource -Name SqlServer -Prerelease -Repository PSGallery -TrustRepository -Path .\output\RequiredModules\" -ErrorAction 'Stop' } } + Clean_WikiContent_Folder: | + { + # Clean output/WikiContent folder + if (Test-Path -Path './output/WikiContent') + { + Remove-Item -Path './output/WikiContent' -Recurse -Force + } + } #################################################### # ModuleBuilder Configuration # #################################################### @@ -188,7 +198,7 @@ DscResource.DocGenerator: - '\*(.+?)\*' # Match Italic (asterisk) Publish_GitHub_Wiki_Content: Debug: false - Generate_Wiki_Content: + Generate_Markdown_For_DSC_Resources: MofResourceMetadata: Type: MofResource Category: Resources diff --git a/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1 b/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1 index d92ca10e5..12b01ce98 100644 --- a/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1 +++ b/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1 @@ -358,9 +358,7 @@ function Test-PendingRestart { [CmdletBinding()] [OutputType([System.Boolean])] - param - ( - ) + param () $getRegistryPropertyValueParameters = @{ Path = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager' diff --git a/source/WikiSource/CredentialOverview.md b/source/WikiSource/Credential-overview.md similarity index 97% rename from source/WikiSource/CredentialOverview.md rename to source/WikiSource/Credential-overview.md index bd9b92b37..47242bbe9 100644 --- a/source/WikiSource/CredentialOverview.md +++ b/source/WikiSource/Credential-overview.md @@ -1,4 +1,8 @@ -# Credential Overview +--- +Category: Usage +--- + +# Credential overview ## Group Managed Service Account