fix: fix null reference exception when it's not possible to get `runt…

…ime` version from the assembly (#851)
box · Aug 24, 2022 · 77046fb · 77046fb
1 parent 054d3e1
commit 77046fb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/Box.V2/Managers/BoxResourceManager.cs b/Box.V2/Managers/BoxResourceManager.cs
@@ -15,6 +15,7 @@
 using System.Globalization;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Box.V2.Managers
@@ -379,12 +380,21 @@ private string CheckFor45PlusVersion(int releaseKey)
         private string GetNetCoreVersion()
         {
             var assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly;
-            var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
-            var netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
-            return netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2 ?
-                assemblyPath[netCoreAppIndex + 1] :
-                null;
-        }
+            if (assembly?.CodeBase != null)
+            {
+                var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+                var netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
+                return netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2 ?
+                    assemblyPath[netCoreAppIndex + 1] :
+                    null;
+            }
 
+#if NETSTANDARD2_0
+            var frameworkVersion = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
+            return Regex.Match(frameworkVersion, @"\d+(\.\d+)+").Value;
+#else
+            return null;
+#endif
+        }
     }
 }
diff --git a/Box.V2/Request/HttpRequestHandler.cs b/Box.V2/Request/HttpRequestHandler.cs
@@ -269,7 +269,11 @@ private class ClientFactory
 
             private static HttpClient CreateClient(bool followRedirect, IWebProxy webProxy)
             {
-                var handler = new HttpClientHandler() { AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip };
+                var handler = new HttpClientHandler();
+                if (handler.SupportsAutomaticDecompression)
+                {
+                    handler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
+                }
                 handler.AllowAutoRedirect = followRedirect;
 
                 if (webProxy != null)