make GetNetCoreVersion work with preview

5 years ago · 8dda1d5d31
1 changed files with 8 additions and 1 deletions
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
@ -269,7 +269,14 @@ namespace SixLabors.ImageSharp.Tests
            int netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
            if (netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2)
            {
-                return Version.Parse(assemblyPath[netCoreAppIndex + 1]);
+                string runtimeFolderStr = assemblyPath[netCoreAppIndex + 1];
+                int previewSuffix = runtimeFolderStr.IndexOf('-');
+                if (previewSuffix > 0)
+                {
+                    runtimeFolderStr = runtimeFolderStr.Substring(0, previewSuffix);
+                }
+
+                return Version.Parse(runtimeFolderStr);
            }

            return null;