Read newtonsoft file version, default to Load in event of error

Author: jviau

src/Microsoft.VisualStudio.Jdt/JdtUtilities.cs

@@ -4,6 +4,7 @@
 namespace Microsoft.VisualStudio.Jdt
 {
     using System;
+    using System.Diagnostics;
     using System.Reflection;
     using Newtonsoft.Json.Linq;
 
@@ -17,6 +18,10 @@ public static class JdtUtilities
         /// </summary>
         internal const string JdtSyntaxPrefix = "@jdt.";
 
+        /// <summary>
+        /// The cached line info handling to use, based on Newtonsoft.Json version
+        /// https://github.com/JamesNK/Newtonsoft.Json/issues/1249
+        /// </summary>
         private static LineInfoHandling? lineInfoHandling = null;
 
         /// <summary>
@@ -53,15 +58,28 @@ internal static LineInfoHandling GetLineInfoHandling()
         {
             if (lineInfoHandling == null)
             {
-                Version newtonsoftVersion = typeof(JObject).GetTypeInfo().Assembly.GetName().Version;
-
-                if (newtonsoftVersion >= new Version("10.0.2"))
+                try
                 {
-                    lineInfoHandling = LineInfoHandling.Load;
+                    string newtonsoftLocation = typeof(JObject).GetTypeInfo().Assembly.Location;
+                    FileVersionInfo fileVersion = FileVersionInfo.GetVersionInfo(newtonsoftLocation);
+
+                    // The version the line ending bug was fixed in. We want to target a lower
+                    // version of Newtonsoft to give consumers more flexibility in what version
+                    // they consume theirselves. However, we still want line endings to work in
+                    // both new and old versions.
+                    if (new Version(fileVersion.ProductVersion) < new Version("10.0.2"))
+                    {
+                        lineInfoHandling = LineInfoHandling.Ignore;
+                    }
+                    else
+                    {
+                        lineInfoHandling = LineInfoHandling.Load;
+                    }
                 }
-                else
+                catch (Exception e) when (!e.IsCriticalException())
                 {
-                    lineInfoHandling = LineInfoHandling.Ignore;
+                    // we will default to the "correct" value in the instance of any issues.
+                    lineInfoHandling = LineInfoHandling.Load;
                 }
             }
 

src/Microsoft.VisualStudio.Jdt/Microsoft.VisualStudio.Jdt.csproj

@@ -24,6 +24,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
+    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -39,4 +43,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
+</Project>