Merge pull request #19 from briantist/Version-1.0.2.0

Version 1.0.2.0
briantist · Jul 9, 2017 · 15836b7 · 15836b7
2 parents b032c72 + 7854527
commit 15836b7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/Data/Definitions.psd1 b/Data/Definitions.psd1
@@ -22,8 +22,14 @@ param(
 )
     ${Snippet_Parameterizerator}
     
-    if (`$PSCmdlet.ShouldProcess('${Verb}', '${Resource} DSC Resource')) {
-        Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$VerbosePreference
+    if (`$PSCmdlet.ShouldProcess('${Resource} DSC Resource', '${Verb}')) {
+
+        `$oldVerbosePreference = `$VerbosePreference
+        `$VerbosePreference = [System.Management.Automation.ActionPreference]::SilentlyContinue
+
+        Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$oldVerbosePreference
+
+        `$VerbosePreference = `$oldVerbosePreference
     }
 }
 '@
@@ -36,7 +42,12 @@ param(
 )
     ${Snippet_Parameterizerator}
     
-    Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$VerbosePreference
+    `$oldVerbosePreference = `$VerbosePreference
+    `$VerbosePreference = [System.Management.Automation.ActionPreference]::SilentlyContinue
+
+    Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$oldVerbosePreference
+
+    `$VerbosePreference = `$oldVerbosePreference
 }
 '@
 
@@ -49,7 +60,12 @@ param(
 )
     ${Snippet_Parameterizerator}
     
-    Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$VerbosePreference
+    `$oldVerbosePreference = `$VerbosePreference
+    `$VerbosePreference = [System.Management.Automation.ActionPreference]::SilentlyContinue
+
+    Invoke-DscResource -Name '${Resource}' -ModuleName '${ModuleName}' -Method '${Verb}' -Property `$params -Verbose:`$oldVerbosePreference
+
+    `$VerbosePreference = `$oldVerbosePreference
 }
 '@
 

diff --git a/Idempotion.psd1 b/Idempotion.psd1
diff --git a/Private/New-ParameterFromResourcePropertyInfo.Tests.ps1 b/Private/New-ParameterFromResourcePropertyInfo.Tests.ps1
@@ -13,6 +13,7 @@ InModuleScope $Module.Name {
                  'Present'
                 ,'Absent'
                 ,"Single ' Quote"
+                ,"Weird ’ Quote"
             )
         }
         $testNoSet = [PSCustomObject]@{

diff --git a/Private/New-ParameterFromResourcePropertyInfo.ps1 b/Private/New-ParameterFromResourcePropertyInfo.ps1
@@ -46,7 +46,7 @@ param(
     Process {
         $valset = if (-not $NoValidateSet -and $Values.Count) {
             $set = $Values.ForEach( {
-                $escaped = $_.Replace("'" , "''")
+                $escaped = [System.Management.Automation.Language.CodeGeneration]::EscapeSingleQuotedStringContent($_)
                 "'$escaped'"
             } ) -join ','
             "[ValidateSet($set)]"