From 4b261ecdb61aaccf4c224e1b936c084c6842547a Mon Sep 17 00:00:00 2001
From: Greg Dennis <gregsdennis@yahoo.com>
Date: Tue, 9 May 2023 05:25:10 +1200
Subject: [PATCH] Update `JsonSchema.Net` version to 4.1.0 (#19610)

---
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../commands/utility/TestJsonCommand.cs       | 47 ++++++++++---------
 .../resources/TestJsonCmdletStrings.resx      |  2 +-
 tools/packaging/boms/windows.json             |  4 ++
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index ea5e0bd22a..2972c210a6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -35,7 +35,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="8.0.0-preview.3.23174.8" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.0-preview.2.23128.3" />
-    <PackageReference Include="JsonSchema.Net" Version="3.3.2" />
+    <PackageReference Include="JsonSchema.Net" Version="4.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
index 4a6e11a963..edb83a0841 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
@@ -239,32 +239,20 @@ namespace Microsoft.PowerShell.Commands
 
                 if (_jschema != null)
                 {
-                        var validationResults = _jschema.Validate(parsedJson, new ValidationOptions { OutputFormat = OutputFormat.Basic });
-                        result = validationResults.IsValid;
-                        if (!result)
+                    EvaluationResults evaluationResults = _jschema.Evaluate(parsedJson, new EvaluationOptions { OutputFormat = OutputFormat.List });
+                    result = evaluationResults.IsValid;
+                    if (!result)
+                    {
+                        HandleValidationErrors(evaluationResults);
+
+                        if (evaluationResults.HasDetails)
                         {
-                            if (validationResults.Message != null)
+                            foreach (var nestedResult in evaluationResults.Details)
                             {
-                                Exception exception = new(string.Format(TestJsonCmdletStrings.InvalidJsonAgainstSchemaDetailed, validationResults.Message, validationResults.InstanceLocation));
-                                ErrorRecord errorRecord = new(exception, "InvalidJsonAgainstSchemaDetailed", ErrorCategory.InvalidData, null);
-                                WriteError(errorRecord);
-                            }
-
-                            if (validationResults.HasNestedResults)
-                            {
-                                foreach (var nestedResult in validationResults.NestedResults)
-                                {
-                                    if (nestedResult.Message == null)
-                                    {
-                                        continue;
-                                    }
-
-                                    Exception exception = new(string.Format(TestJsonCmdletStrings.InvalidJsonAgainstSchemaDetailed, nestedResult.Message, nestedResult.InstanceLocation));
-                                    ErrorRecord errorRecord = new(exception, "InvalidJsonAgainstSchemaDetailed", ErrorCategory.InvalidData, null);
-                                    WriteError(errorRecord);
-                                }
+                                HandleValidationErrors(nestedResult);
                             }
                         }
+                    }
                 }
             }
             catch (JsonSchemaReferenceResolutionException jsonExc)
@@ -284,5 +272,20 @@ namespace Microsoft.PowerShell.Commands
 
             WriteObject(result);
         }
+
+        private void HandleValidationErrors(EvaluationResults evaluationResult)
+        {
+            if (!evaluationResult.HasErrors)
+            {
+                return;
+            }
+
+            foreach (var error in evaluationResult.Errors!)
+            {
+                Exception exception = new(string.Format(TestJsonCmdletStrings.InvalidJsonAgainstSchemaDetailed, error.Value, evaluationResult.InstanceLocation));
+                ErrorRecord errorRecord = new(exception, "InvalidJsonAgainstSchemaDetailed", ErrorCategory.InvalidData, null);
+                WriteError(errorRecord);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/TestJsonCmdletStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/TestJsonCmdletStrings.resx
index eed85d28b3..cc607eda41 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/TestJsonCmdletStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/TestJsonCmdletStrings.resx
@@ -124,7 +124,7 @@
     <value>Cannot parse the JSON.</value>
   </data>
   <data name="InvalidJsonAgainstSchemaDetailed" xml:space="preserve">
-    <value>The JSON is not valid with the schema: {0} at {1}</value>
+    <value>The JSON is not valid with the schema: {0} at '{1}'</value>
   </data>
   <data name="JsonSchemaFileOpenFailure" xml:space="preserve">
     <value>Can not open JSON schema file: {0}</value>
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 747fa838b5..75b6ddf326 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -287,6 +287,10 @@
     "Pattern": "es/WindowsFormsIntegration.resources.dll",
     "FileType": "NonProduct"
   },
+  {
+    "Pattern": "es\\JsonSchema.Net.resources.dll",
+    "FileType": "NonProduct"
+  },
   {
     "Pattern": "fr/Microsoft.CodeAnalysis.CSharp.resources.dll",
     "FileType": "NonProduct"