Use correct JSON serializer settings for all templates-related deserialization (#24282)

anthony-c-martin · vidai-msft · web-flow · commit bdbf4209983a · 2024-03-05T15:10:06.000+08:00
* Use correct JSON serializer settings for templates-related deserialization * Add unhandled exception debug logging * Add repro for #24286 * Update ChangeLog.md --------- Co-authored-by: Vincent Dai <23257217+vidai-msft@users.noreply.github.com>
diff --git a/src/Resources/ResourceManager/Extensions/JsonExtensions.cs b/src/Resources/ResourceManager/Extensions/JsonExtensions.cs
@@ -101,7 +101,7 @@ public static string ToJson(this object obj)
         /// <param name="obj">The object.</param>
         public static string ToFormattedJson(this object obj)
         {
-            return JsonConvert.SerializeObject(obj, Formatting.Indented);
+            return JsonConvert.SerializeObject(obj, Formatting.Indented, JsonExtensions.ObjectSerializationSettings);
         }
 
         /// <summary>
diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentCmdletBase.cs
@@ -25,6 +25,7 @@
 using System.Linq;
 using System.Management.Automation;
 using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
@@ -403,7 +404,7 @@ protected void BuildAndUseBicepParameters(bool emitWarnings)
 
                 if (!string.IsNullOrEmpty(output.templateJson))
                 {
-                    TemplateObject = JsonConvert.DeserializeObject<Hashtable>(output.templateJson);
+                    TemplateObject = output.templateJson.FromJson<Hashtable>();
                 }
                 else if (!string.IsNullOrEmpty(output.templateSpecId))
                 {
@@ -425,7 +426,7 @@ protected void BuildAndUseBicepParameters(bool emitWarnings)
         protected void BuildAndUseBicepTemplate()
         {
             var templateJson = BicepUtility.Create().BuildBicepFile(this.ResolvePath(TemplateFile), this.WriteVerbose, this.WriteWarning);
-            TemplateObject = JsonConvert.DeserializeObject<Hashtable>(templateJson);
+            TemplateObject = templateJson.FromJson<Hashtable>();
             TemplateFile = null;
         }
     }
diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceManagerCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceManagerCmdletBase.cs
@@ -181,6 +181,8 @@ public sealed override void ExecuteCmdlet()
                     throw;
                 }
 
+                this.WriteDebugWithTimestamp($"[{nameof(ResourceManagerCmdletBase)}.{nameof(ExecuteCmdlet)}] Caught unhandled exception: {ex}");
+
                 var capturedException = ExceptionDispatchInfo.Capture(ex);
                 this.HandleException(capturedException: capturedException);
             }
diff --git a/src/Resources/ResourceManager/SdkExtensions/NewResourcesExtensions.cs b/src/Resources/ResourceManager/SdkExtensions/NewResourcesExtensions.cs
@@ -16,6 +16,7 @@
 //This class is split from the ResourcesExtensions class. Since this module has both cmdlets that use the old sdk version and cmdlets that use the new one, we needed client extension classes for both and with this split
 //this class acts as the client for the cmdlets using the newer bits while the ResourcesExtensions class acts as the client for the cmdlets using old sdk
 
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Resources.Models;
@@ -321,25 +322,25 @@ private static void SetDeploymentProperties(PSDeploymentObject deploymentObject,
 
                 if (properties.Outputs != null)
                 {
-                    Dictionary<string, DeploymentVariable> outputs = JsonConvert.DeserializeObject<Dictionary<string, DeploymentVariable>>(properties.Outputs.ToString());
+                    var outputs = properties.Outputs.ToString().FromJson<Dictionary<string, DeploymentVariable>>();
                     // Continue deserialize if the type of Value in DeploymentVariable is array
                     outputs?.Values.ForEach(dv => {
                         if ("Array".Equals(dv?.Type) && dv?.Value != null)
                         {
-                            dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());
+                            dv.Value = dv.Value.ToString().FromJson<object[]>();
                         }
                     });
                     deploymentObject.Outputs = outputs;
                 }
 
                 if (properties.Parameters != null)
                 {
-                    Dictionary<string, DeploymentVariable> parameters = JsonConvert.DeserializeObject<Dictionary<string, DeploymentVariable>>(properties.Parameters.ToString());
+                    var parameters = properties.Parameters.ToString().FromJson<Dictionary<string, DeploymentVariable>>();
                     // Continue deserialize if the type of Value in DeploymentVariable is array
                     parameters?.Values.ForEach(dv => {
                         if ("Array".Equals(dv?.Type) && dv?.Value != null)
                         {
-                            dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());
+                            dv.Value = dv.Value.ToString().FromJson<object[]>();
                         }
                     });
                     deploymentObject.Parameters = parameters;
diff --git a/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs b/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs
@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
 using Microsoft.Azure.Management.Resources.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
@@ -173,7 +174,7 @@ internal static Dictionary<string, DeploymentVariable> FormatMappedObject(object
             { 
                 if ("Array".Equals(dv?.Type) && dv?.Value != null)
                 {
-                    dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());
+                    dv.Value = dv.Value.ToString().FromJson<object[]>();
                 }
             });
 
@@ -183,7 +184,7 @@ internal static Dictionary<string, DeploymentVariable> FormatMappedObject(object
         internal static DeploymentVariable ExtractDeploymentVariable(JObject jObject)
         {
             // Attempt to desialize the DeploymentVariable.
-            DeploymentVariable dVar = JsonConvert.DeserializeObject<DeploymentVariable>(jObject.ToString());
+            var dVar = jObject.ToString().FromJson<DeploymentVariable>();
 
             // If the type is null, attempt to infer the type.
             if (dVar.Type is null)
diff --git a/src/Resources/ResourceManager/Utilities/BicepUtility.cs b/src/Resources/ResourceManager/Utilities/BicepUtility.cs
@@ -24,6 +24,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities
     using System.IO;
     using System.Text.RegularExpressions;
     using Microsoft.Azure.Commands.Common.Authentication;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 
     public class BicepBuildParamsStdout
     {
@@ -137,7 +138,7 @@ public BicepBuildParamsStdout BuildBicepParamFile(string bicepParamFilePath, IRe
                 writeVerbose: writeVerbose,
                 writeWarning: writeWarning);
 
-            return JsonConvert.DeserializeObject<BicepBuildParamsStdout>(stdout);
+            return stdout.FromJson<BicepBuildParamsStdout>();
         }
 
         public void PublishFile(string bicepFilePath, string target, string documentationUri = null, bool withSource = false, bool force = false, OutputCallback writeVerbose = null, OutputCallback writeWarning = null)
diff --git a/src/Resources/ResourceManager/Utilities/TemplateUtility.cs b/src/Resources/ResourceManager/Utilities/TemplateUtility.cs
@@ -221,12 +221,12 @@ public static Dictionary<string, TemplateParameterFileParameter> ParseTemplatePa
             {
                 try
                 {
-                    parameters = JsonConvert.DeserializeObject<Dictionary<string, TemplateParameterFileParameter>>(templateParameterContent);
+                    parameters = templateParameterContent.FromJson<Dictionary<string, TemplateParameterFileParameter>>();
                 }
                 catch (JsonSerializationException)
                 {
                     parameters = new Dictionary<string, TemplateParameterFileParameter>(
-                        JsonConvert.DeserializeObject<TemplateParameterFile>(templateParameterContent).Parameters);
+                        templateParameterContent.FromJson<TemplateParameterFile>().Parameters);
                 }
             }
 
diff --git a/src/Resources/Resources.Test/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommandTests.cs b/src/Resources/Resources.Test/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommandTests.cs
@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
@@ -321,7 +322,7 @@ public void ResolvesDynamicParametersWithCrossSubTemplateSpec()
                 : templateFile; // Windows based (already valid)
 
             var templateContentForTest = File.ReadAllText(normalizedTemplateFilePath);
-            var template = JsonConvert.DeserializeObject<TemplateFile>(templateContentForTest);
+            var template = templateContentForTest.FromJson<TemplateFile>();
 
             templateSpecsVersionOperationsMock.Setup(f => f.GetWithHttpMessagesAsync(
                     templateSpecRGName,
diff --git a/src/Resources/Resources.Test/Resources/DeploymentWhatIfTests/WhatIfWithNullableType/main.bicep b/src/Resources/Resources.Test/Resources/DeploymentWhatIfTests/WhatIfWithNullableType/main.bicep
@@ -0,0 +1,6 @@
+param probes probeType
+
+type probeType = {
+  name: string
+  host: string?
+}[]?
diff --git a/src/Resources/Resources.Test/Resources/DeploymentWhatIfTests/WhatIfWithNullableType/main.bicepparam b/src/Resources/Resources.Test/Resources/DeploymentWhatIfTests/WhatIfWithNullableType/main.bicepparam
@@ -0,0 +1,7 @@
+using 'main.bicep'
+
+param probes = [
+  {
+    name: 'healthprobe-default'
+  }
+]
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs b/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.cs
@@ -71,6 +71,11 @@ public void RGLevelWhatIf_SetExcludeChangeType_HidesResourceChanges()
         public void Test_WhatIfWithUserDefinedTypes()
             => TestRunner.RunTestScript("Test-WhatIfWithUserDefinedTypes");
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void Test_WhatIfWithNullableType()
+            => TestRunner.RunTestScript("Test-WhatIfWithNullableType");
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SubLevelWhatIf_BlankTemplate_ReturnsNoChange()
diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.ps1 b/src/Resources/Resources.Test/ScenarioTests/DeploymentWhatIfTests.ps1
@@ -12,6 +12,16 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+# Note(antmarti): Commands to quickly re-record a test in this file:
+#
+# &az account set -n a1bfa635-f2bf-42f1-86b5-848c674fc321
+# $accessToken = &az account get-access-token --query accessToken --output tsv
+# $tenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47"
+# $subscriptionId = "a1bfa635-f2bf-42f1-86b5-848c674fc321"
+# $env:TEST_CSM_ORGID_AUTHENTICATION="Environment=Prod;SubscriptionId=$subscriptionId;TenantId=$tenantId;RawToken=$accessToken;HttpRecorderMode=Record;"
+# $env:AZURE_TEST_MODE="Record"
+# dotnet test ./src/Resources/Resources.Test --filter <your_test_name>
+
 <#
 .SYNOPSIS
 Tests resource group level deployment what-if with blank template.
@@ -282,29 +292,60 @@ Tests what-if with user-defined types (https://github.com/Azure/bicep/issues/132
 #>
 function Test-WhatIfWithUserDefinedTypes
 {
-	try
-	{
-		# Arrange.
-		$deploymentName = Get-ResourceName
-		$location = "westus"
-		$resourceGroupName = Get-ResourceGroupName
-
-		New-AzResourceGroup -Name $resourceGroupName -Location $location
-
-		# Act.
-		$result = Get-AzResourceGroupDeploymentWhatIfResult `
-			-ResourceGroupName $resourceGroupName `
-			-Name $deploymentName `
-			-TemplateFile "Resources/DeploymentWhatIfTests/WhatIfWithUserDefinedTypes/main.bicep"
+    try
+    {
+        # Arrange.
+        $deploymentName = Get-ResourceName
+        $location = "westus"
+        $resourceGroupName = Get-ResourceGroupName
+
+        New-AzResourceGroup -Name $resourceGroupName -Location $location
+
+        # Act.
+        $result = Get-AzResourceGroupDeploymentWhatIfResult `
+            -ResourceGroupName $resourceGroupName `
+            -Name $deploymentName `
+            -TemplateFile "Resources/DeploymentWhatIfTests/WhatIfWithUserDefinedTypes/main.bicep"
+
+        # Assert.
+        Assert-AreEqual "Succeeded" $result.Status
+    }
+    finally
+    {
+        # Cleanup.
+        Clean-ResourceGroup $resourceGroupName
+    }
+}
 
-		# Assert.
-		Assert-AreEqual "Succeeded" $result.Status
-	}
-	finally
-	{
-		# Cleanup.
-		Clean-ResourceGroup $resourceGroupName
-	}
+<#
+.SYNOPSIS
+Tests what-if with nullable types (https://github.com/Azure/azure-powershell/issues/24286).
+#>
+function Test-WhatIfWithNullableType
+{
+    try
+    {
+        # Arrange.
+        $deploymentName = Get-ResourceName
+        $location = "westus"
+        $resourceGroupName = Get-ResourceGroupName
+
+        New-AzResourceGroup -Name $resourceGroupName -Location $location
+
+        # Act.
+        $result = Get-AzResourceGroupDeploymentWhatIfResult `
+            -ResourceGroupName $resourceGroupName `
+            -Name $deploymentName `
+            -TemplateFile "Resources/DeploymentWhatIfTests/WhatIfWithNullableType/main.bicep"
+
+        # Assert.
+        Assert-AreEqual "Succeeded" $result.Status
+    }
+    finally
+    {
+        # Cleanup.
+        Clean-ResourceGroup $resourceGroupName
+    }
 }
 
 <#
diff --git a/src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.DeploymentWhatIfTests/Test_WhatIfWithNullableType.json b/src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.DeploymentWhatIfTests/Test_WhatIfWithNullableType.json
diff --git a/src/Resources/Resources/ChangeLog.md b/src/Resources/Resources/ChangeLog.md
diff --git a/src/Resources/Resources/Models.ResourceGroups/ResourcesExtensions.cs b/src/Resources/Resources/Models.ResourceGroups/ResourcesExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public static string ToJson(this object obj)`
`101`	`101`	`/// <param name="obj">The object.</param>`
`102`	`102`	`public static string ToFormattedJson(this object obj)`
`103`	`103`	`{`
`104`		`- return JsonConvert.SerializeObject(obj, Formatting.Indented);`
	`104`	`+ return JsonConvert.SerializeObject(obj, Formatting.Indented, JsonExtensions.ObjectSerializationSettings);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`using System.Linq;`
`26`	`26`	`using System.Management.Automation;`
`27`	`27`	`using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;`
	`28`	`+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
`28`	`29`
`29`	`30`	`namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`30`	`31`	`{`
`@@ -403,7 +404,7 @@ protected void BuildAndUseBicepParameters(bool emitWarnings)`
`403`	`404`
`404`	`405`	`if (!string.IsNullOrEmpty(output.templateJson))`
`405`	`406`	`{`
`406`		`- TemplateObject = JsonConvert.DeserializeObject<Hashtable>(output.templateJson);`
	`407`	`+ TemplateObject = output.templateJson.FromJson<Hashtable>();`
`407`	`408`	`}`
`408`	`409`	`else if (!string.IsNullOrEmpty(output.templateSpecId))`
`409`	`410`	`{`
`@@ -425,7 +426,7 @@ protected void BuildAndUseBicepParameters(bool emitWarnings)`
`425`	`426`	`protected void BuildAndUseBicepTemplate()`
`426`	`427`	`{`
`427`	`428`	`var templateJson = BicepUtility.Create().BuildBicepFile(this.ResolvePath(TemplateFile), this.WriteVerbose, this.WriteWarning);`
`428`		`- TemplateObject = JsonConvert.DeserializeObject<Hashtable>(templateJson);`
	`429`	`+ TemplateObject = templateJson.FromJson<Hashtable>();`
`429`	`430`	`TemplateFile = null;`
`430`	`431`	`}`
`431`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,8 @@ public sealed override void ExecuteCmdlet()`
`181`	`181`	`throw;`
`182`	`182`	`}`
`183`	`183`
	`184`	`+ this.WriteDebugWithTimestamp($"[{nameof(ResourceManagerCmdletBase)}.{nameof(ExecuteCmdlet)}] Caught unhandled exception: {ex}");`
	`185`	`+`
`184`	`186`	`var capturedException = ExceptionDispatchInfo.Capture(ex);`
`185`	`187`	`this.HandleException(capturedException: capturedException);`
`186`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`//This class is split from the ResourcesExtensions class. Since this module has both cmdlets that use the old sdk version and cmdlets that use the new one, we needed client extension classes for both and with this split`
`17`	`17`	`//this class acts as the client for the cmdlets using the newer bits while the ResourcesExtensions class acts as the client for the cmdlets using old sdk`
`18`	`18`
	`19`	`+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
`19`	`20`	`using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;`
`20`	`21`	`using Microsoft.Azure.Commands.ResourceManager.Common.Tags;`
`21`	`22`	`using Microsoft.Azure.Management.Resources.Models;`
`@@ -321,25 +322,25 @@ private static void SetDeploymentProperties(PSDeploymentObject deploymentObject,`
`321`	`322`
`322`	`323`	`if (properties.Outputs != null)`
`323`	`324`	`{`
`324`		`- Dictionary<string, DeploymentVariable> outputs = JsonConvert.DeserializeObject<Dictionary<string, DeploymentVariable>>(properties.Outputs.ToString());`
	`325`	`+ var outputs = properties.Outputs.ToString().FromJson<Dictionary<string, DeploymentVariable>>();`
`325`	`326`	`// Continue deserialize if the type of Value in DeploymentVariable is array`
`326`	`327`	`outputs?.Values.ForEach(dv => {`
`327`	`328`	`if ("Array".Equals(dv?.Type) && dv?.Value != null)`
`328`	`329`	`{`
`329`		`- dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());`
	`330`	`+ dv.Value = dv.Value.ToString().FromJson<object[]>();`
`330`	`331`	`}`
`331`	`332`	`});`
`332`	`333`	`deploymentObject.Outputs = outputs;`
`333`	`334`	`}`
`334`	`335`
`335`	`336`	`if (properties.Parameters != null)`
`336`	`337`	`{`
`337`		`- Dictionary<string, DeploymentVariable> parameters = JsonConvert.DeserializeObject<Dictionary<string, DeploymentVariable>>(properties.Parameters.ToString());`
	`338`	`+ var parameters = properties.Parameters.ToString().FromJson<Dictionary<string, DeploymentVariable>>();`
`338`	`339`	`// Continue deserialize if the type of Value in DeploymentVariable is array`
`339`	`340`	`parameters?.Values.ForEach(dv => {`
`340`	`341`	`if ("Array".Equals(dv?.Type) && dv?.Value != null)`
`341`	`342`	`{`
`342`		`- dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());`
	`343`	`+ dv.Value = dv.Value.ToString().FromJson<object[]>();`
`343`	`344`	`}`
`344`	`345`	`});`
`345`	`346`	`deploymentObject.Parameters = parameters;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
	`15`	`+using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
`15`	`16`	`using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;`
`16`	`17`	`using Microsoft.Azure.Management.Resources.Models;`
`17`	`18`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`@@ -173,7 +174,7 @@ internal static Dictionary<string, DeploymentVariable> FormatMappedObject(object`
`173`	`174`	`{`
`174`	`175`	`if ("Array".Equals(dv?.Type) && dv?.Value != null)`
`175`	`176`	`{`
`176`		`- dv.Value = JsonConvert.DeserializeObject<object[]>(dv.Value.ToString());`
	`177`	`+ dv.Value = dv.Value.ToString().FromJson<object[]>();`
`177`	`178`	`}`
`178`	`179`	`});`
`179`	`180`
`@@ -183,7 +184,7 @@ internal static Dictionary<string, DeploymentVariable> FormatMappedObject(object`
`183`	`184`	`internal static DeploymentVariable ExtractDeploymentVariable(JObject jObject)`
`184`	`185`	`{`
`185`	`186`	`// Attempt to desialize the DeploymentVariable.`
`186`		`- DeploymentVariable dVar = JsonConvert.DeserializeObject<DeploymentVariable>(jObject.ToString());`
	`187`	`+ var dVar = jObject.ToString().FromJson<DeploymentVariable>();`
`187`	`188`
`188`	`189`	`// If the type is null, attempt to infer the type.`
`189`	`190`	`if (dVar.Type is null)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities`
`24`	`24`	`using System.IO;`
`25`	`25`	`using System.Text.RegularExpressions;`
`26`	`26`	`using Microsoft.Azure.Commands.Common.Authentication;`
	`27`	`+ using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
`27`	`28`
`28`	`29`	`public class BicepBuildParamsStdout`
`29`	`30`	`{`
`@@ -137,7 +138,7 @@ public BicepBuildParamsStdout BuildBicepParamFile(string bicepParamFilePath, IRe`
`137`	`138`	`writeVerbose: writeVerbose,`
`138`	`139`	`writeWarning: writeWarning);`
`139`	`140`
`140`		`- return JsonConvert.DeserializeObject<BicepBuildParamsStdout>(stdout);`
	`141`	`+ return stdout.FromJson<BicepBuildParamsStdout>();`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`public void PublishFile(string bicepFilePath, string target, string documentationUri = null, bool withSource = false, bool force = false, OutputCallback writeVerbose = null, OutputCallback writeWarning = null)`
Original file line number	Diff line number	Diff line change
`@@ -221,12 +221,12 @@ public static Dictionary<string, TemplateParameterFileParameter> ParseTemplatePa`
`221`	`221`	`{`
`222`	`222`	`try`
`223`	`223`	`{`
`224`		`- parameters = JsonConvert.DeserializeObject<Dictionary<string, TemplateParameterFileParameter>>(templateParameterContent);`
	`224`	`+ parameters = templateParameterContent.FromJson<Dictionary<string, TemplateParameterFileParameter>>();`
`225`	`225`	`}`
`226`	`226`	`catch (JsonSerializationException)`
`227`	`227`	`{`
`228`	`228`	`parameters = new Dictionary<string, TemplateParameterFileParameter>(`
`229`		`- JsonConvert.DeserializeObject<TemplateParameterFile>(templateParameterContent).Parameters);`
	`229`	`+ templateParameterContent.FromJson<TemplateParameterFile>().Parameters);`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`