Merge pull request #1304 from shimat/net5detection

Fix IsDotNetCore
shimat · Aug 17, 2021 · 5c23fb4 · 5c23fb4
2 parents 262dd42 + 5e60027
commit 5c23fb4
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 3 deletions.
diff --git a/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs b/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs
@@ -84,7 +84,7 @@ public bool IsLibraryLoaded(string dllName)
         }
 
         /// <summary>
-        /// 
+        /// Determine if the OS is Windows
         /// </summary>
         /// <returns></returns>
         public static bool IsCurrentPlatformSupported()
@@ -98,7 +98,7 @@ public static bool IsCurrentPlatformSupported()
         }
 
         /// <summary>
-        /// 
+        /// Determine if the runtime is .NET Core
         /// </summary>
         /// <returns></returns>
         public static bool IsDotNetCore()
@@ -107,7 +107,8 @@ public static bool IsDotNetCore()
             return false;
 #else
             // https://github.com/dotnet/corefx/blob/v2.1-preview1/src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.cs
-            return RuntimeInformation.FrameworkDescription.StartsWith(".NET Core", StringComparison.Ordinal);
+            return Environment.Version.Major >= 5 || 
+                RuntimeInformation.FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase);
 #endif
         }
 

diff --git a/test/OpenCvSharp.Tests/AppDomainTest.cs → ...OpenCvSharp.Tests/system/AppDomainTest.cs b/test/OpenCvSharp.Tests/AppDomainTest.cs → ...OpenCvSharp.Tests/system/AppDomainTest.cs
diff --git a/test/OpenCvSharp.Tests/ExceptionTest.cs → ...OpenCvSharp.Tests/system/ExceptionTest.cs b/test/OpenCvSharp.Tests/ExceptionTest.cs → ...OpenCvSharp.Tests/system/ExceptionTest.cs
diff --git a/test/OpenCvSharp.Tests/SaturateCastTest.cs → ...nCvSharp.Tests/system/SaturateCastTest.cs b/test/OpenCvSharp.Tests/SaturateCastTest.cs → ...nCvSharp.Tests/system/SaturateCastTest.cs
diff --git a/test/OpenCvSharp.Tests/StdStringTest.cs → ...OpenCvSharp.Tests/system/StdStringTest.cs b/test/OpenCvSharp.Tests/StdStringTest.cs → ...OpenCvSharp.Tests/system/StdStringTest.cs
diff --git a/test/OpenCvSharp.Tests/VectorTest.cs → test/OpenCvSharp.Tests/system/VectorTest.cs b/test/OpenCvSharp.Tests/VectorTest.cs → test/OpenCvSharp.Tests/system/VectorTest.cs
diff --git a/test/OpenCvSharp.Tests/system/WindowsLibraryLoaderTest.cs b/test/OpenCvSharp.Tests/system/WindowsLibraryLoaderTest.cs
@@ -0,0 +1,22 @@
+#nullable enable
+
+using OpenCvSharp.Internal;
+using Xunit;
+
+namespace OpenCvSharp.Tests
+{
+    public class WindowsLibraryLoaderTest
+    {
+        [Fact]
+        public void IsDotNetCore()
+        {
+#if NET48
+            Assert.False(WindowsLibraryLoader.IsDotNetCore());
+#elif NETCOREAPP3_1_OR_GREATER
+            Assert.True(WindowsLibraryLoader.IsDotNetCore());
+#else
+            throw new OpenCvSharpException("Unexpected environment.");
+#endif
+        }
+    }
+}