Changes to get unit tests working for exceptions

src/NuGet.Core/NuGet.ProjectModel/FileFormatException.cs

@@ -10,6 +10,8 @@ namespace NuGet.ProjectModel
 {
     public class FileFormatException : Exception
     {
+        static internal string SurfaceMessage = "SurfaceMessage";
+
         public FileFormatException(string message)
             : base(message)
         {
@@ -21,6 +23,7 @@ public FileFormatException(string message, Exception innerException)
         }
 
         public string Path { get; private set; }
+        public string ElementPath { get; private set; }
         public int Line { get; private set; }
         public int Column { get; private set; }
 
@@ -31,6 +34,12 @@ private FileFormatException WithFilePath(string path)
             return this;
         }
 
+        private FileFormatException WithElementPath(string path)
+        {
+            ElementPath = path;
+            return this;
+        }
+
         private FileFormatException WithLineInfo(JsonReaderException exception)
         {
             Line = exception.LinePosition;
@@ -47,6 +56,14 @@ private FileFormatException WithLineInfo(int line, int column)
             return this;
         }
 
+        private FileFormatException WithLineInfo(long? line, long? column)
+        {
+            Line = unchecked((int)line.Value);
+            Column = unchecked((int)column);
+
+            return this;
+        }
+
         private FileFormatException WithLineInfo(IJsonLineInfo lineInfo)
         {
             Line = lineInfo.LineNumber;
@@ -103,29 +120,49 @@ internal static FileFormatException Create(string message, int line, int column,
 
         internal static FileFormatException Create(Exception exception, string path)
         {
-            var jex = exception as JsonReaderException;
-
             string message;
-            if (jex == null)
+            var jrex = exception as JsonReaderException;
+            if (jrex is not null)
             {
                 message = string.Format(CultureInfo.CurrentCulture,
-                    Strings.Log_ErrorReadingProjectJson,
-                    path,
+                    Strings.Log_ErrorReadingProjectJsonWithLocation,
+                    path, jrex.LineNumber,
+                    jrex.LinePosition,
                     exception.Message);
 
-                return new FileFormatException(message, exception).WithFilePath(path);
+                return new FileFormatException(message, exception)
+                    .WithFilePath(path)
+                    .WithLineInfo(jrex);
             }
-            else
+
+            var jex = exception as System.Text.Json.JsonException;
+            if (jex is not null)
             {
-                message = string.Format(CultureInfo.CurrentCulture,
+                if (jex.Data.Contains(SurfaceMessage))
+                {
+                    message = jex.Message;
+                }
+                else
+                {
+                    message = string.Format(CultureInfo.CurrentCulture,
                     Strings.Log_ErrorReadingProjectJsonWithLocation,
                     path, jex.LineNumber,
-                    jex.LinePosition,
+                    jex.BytePositionInLine,
                     exception.Message);
+                }
 
                 return new FileFormatException(message, exception)
                     .WithFilePath(path)
-                    .WithLineInfo(jex);
+                    .WithElementPath(jex.Path)
+                    .WithLineInfo(jex.LineNumber, jex.BytePositionInLine);
+            }
+            else
+            {
+                message = string.Format(CultureInfo.CurrentCulture,
+                    Strings.Log_ErrorReadingProjectJson,
+                    path,
+                    exception.Message);
+                return new FileFormatException(message, exception).WithFilePath(path);
             }
         }
     }

src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs

@@ -12,6 +12,13 @@ namespace NuGet.ProjectModel
 {
     public static class JsonPackageSpecReader
     {
+        public static readonly string RestoreOptions = "restore";
+        public static readonly string RestoreSettings = "restoreSettings";
+        public static readonly string HideWarningsAndErrors = "hideWarningsAndErrors";
+        public static readonly string PackOptions = "packOptions";
+        public static readonly string PackageType = "packageType";
+        public static readonly string Files = "files";
+
         /// <summary>
         /// Load and parse a project.json file
         /// </summary>

src/NuGet.Core/NuGet.ProjectModel/JsonUtility.cs

@@ -31,6 +31,7 @@ private static System.Text.Json.JsonSerializerOptions CreateJsonSerializerOption
             {
                 PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
                 AllowTrailingCommas = true,
+                ReadCommentHandling = System.Text.Json.JsonCommentHandling.Skip,
             };
 
             options.Converters.Add(new LockFileConverter());
@@ -42,6 +43,8 @@ private static System.Text.Json.JsonSerializerOptions CreateJsonSerializerOption
             options.Converters.Add(new LockFileItemConverter<LockFileRuntimeTarget>());
             options.Converters.Add(new LockFileTargetLibraryConverter());
             options.Converters.Add(new ProjectFileDependencyGroupConverter());
+            options.Converters.Add(new PackageSpecConverter());
+
 
             options.Converters.Add(new ListObjectConvertor<LockFileContentFile>());
             options.Converters.Add(new ListObjectConvertor<LockFileRuntimeTarget>());

src/NuGet.Core/NuGet.ProjectModel/LockFile/AssetsLogMessageConverter.cs

@@ -108,7 +108,7 @@ public override AssetsLogMessage Read(ref Utf8JsonReader reader, Type typeToConv
                 }
                 else if (reader.ValueTextEquals(Utf8TargetGraphs))
                 {
-                    targetGraphs = reader.ReadStringArrayAsList();
+                    targetGraphs = reader.ReadNextStringArrayAsList();
                 }
                 else
                 {

src/NuGet.Core/NuGet.ProjectModel/LockFile/LockFileConverter.cs

@@ -78,6 +78,7 @@ public override LockFile Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
                 }
                 else if (reader.ValueTextEquals(Utf8Project))
                 {
+                    reader.ReadNextToken();
                     lockFile.PackageSpec = StjPackageSpecReader.GetPackageSpec(
                         ref reader,
                         options,

src/NuGet.Core/NuGet.ProjectModel/LockFile/LockFileFormat.cs

@@ -951,7 +951,7 @@ private static List<CentralTransitiveDependencyGroup> ReadProjectFileTransitiveD
                     NuGetFramework framework = NuGetFramework.Parse(frameworkPropertyName);
                     var dependencies = new List<LibraryDependency>();
 
-                    JsonPackageSpecReader.ReadCentralTransitiveDependencyGroup(
+                    NjPackageSpecReader.ReadCentralTransitiveDependencyGroup(
                         jsonReader: jsonReader,
                         results: dependencies,
                         packageSpecPath: path);

src/NuGet.Core/NuGet.ProjectModel/NjPackageSpecReader.cs

@@ -22,13 +22,6 @@ internal static class NjPackageSpecReader
         private static readonly char[] DelimitedStringSeparators = { ' ', ',' };
         private static readonly char[] VersionSeparators = new[] { ';' };
 
-        public static readonly string RestoreOptions = "restore";
-        public static readonly string RestoreSettings = "restoreSettings";
-        public static readonly string HideWarningsAndErrors = "hideWarningsAndErrors";
-        public static readonly string PackOptions = "packOptions";
-        public static readonly string PackageType = "packageType";
-        public static readonly string Files = "files";
-
         internal static PackageSpec GetPackageSpec(JsonTextReader jsonReader, string packageSpecPath)
         {
             return GetPackageSpec(jsonReader, name: null, packageSpecPath, snapshotValue: null);

src/NuGet.Core/NuGet.ProjectModel/PackageSpecConverter.cs

@@ -13,7 +13,7 @@ internal class PackageSpecConverter : JsonConverter<PackageSpec>
     {
         public override PackageSpec Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            return StjPackageSpecReader.GetPackageSpec(ref reader, options, name: string.Empty, packageSpecPath: string.Empty, snapshotValue: string.Empty);
+            return StjPackageSpecReader.GetPackageSpec(ref reader, options, name: null, packageSpecPath: null, snapshotValue: null);
         }
 
         public override void Write(Utf8JsonWriter writer, PackageSpec value, JsonSerializerOptions options)

src/NuGet.Core/NuGet.ProjectModel/PublicAPI.Unshipped.txt

@@ -1,5 +1,2 @@
 #nullable enable
-NuGet.ProjectModel.StjPackageSpecReader
-~static NuGet.ProjectModel.StjPackageSpecReader.GetPackageSpec(string json, string name, string packageSpecPath) -> NuGet.ProjectModel.PackageSpec
-~static NuGet.ProjectModel.StjPackageSpecReader.GetPackageSpec(string name, string packageSpecPath) -> NuGet.ProjectModel.PackageSpec
-~static NuGet.ProjectModel.StjPackageSpecReader.GetPackageSpec(System.IO.Stream stream, string name, string packageSpecPath, string snapshotValue) -> NuGet.ProjectModel.PackageSpec
+~NuGet.ProjectModel.FileFormatException.ElementPath.get -> string