Merge pull request #755 from psah434/json

Changing convertfrom-json utility usage based on powershell version (powershell 6+ has utility for json comments)
Azure · Nov 18, 2023 · 45f84e6 · 45f84e6
2 parents 6bd4830 + b182fd0
commit 45f84e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/arm-ttk/ConvertFrom-JSON.ps1 b/arm-ttk/ConvertFrom-JSON.ps1
@@ -45,7 +45,7 @@ process
 
         # First, strip block comments
         $inObj = $_
-        $in = if ($InputObject.Contains('*/')) { 
+        $in = if ($InputObject.Contains('*/') -and $InputObject.Contains('/*')) { 
             $JSONBlockComments.Replace($inObj,'')
         } else {
             $InputObject

diff --git a/arm-ttk/arm-ttk.psm1 b/arm-ttk/arm-ttk.psm1
@@ -1,5 +1,6 @@
 #region JSON Functions
-if ($PSVersionTable.PSEdition -ne 'Core') {
+#powershell 6+ provides support for json with comments
+if ($PSVersionTable.PSVersion.Major -lt 6) {
     . $psScriptRoot\ConvertFrom-Json.ps1 # Overwriting ConvertFrom-JSON to allow for comments within JSON (not on core)
 }