Remove remnants of support for older .NET Standards

Saalvage · Nov 25, 2024 · b41e3bf · b41e3bf
1 parent defaa95
commit b41e3bf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 119 deletions.
diff --git a/AssimpNet/MemoryHelper.cs b/AssimpNet/MemoryHelper.cs
@@ -25,7 +25,7 @@
 using System.Runtime.InteropServices;
 using System.Collections;
 using System.Collections.Generic;
-using Assimp.Unmanaged;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 namespace Assimp
@@ -1034,10 +1034,7 @@ private static bool HasNativeCustomMarshaler(Type type, out INativeCustomMarshal
             {
                 if(!s_customMarshalers.TryGetValue(type, out marshaler))
                 {
-                    object[] customAttributes = PlatformHelper.GetCustomAttributes(type, typeof(NativeCustomMarshalerAttribute), false);
-                    if(customAttributes.Length != 0)
-                        marshaler = (customAttributes[0] as NativeCustomMarshalerAttribute).Marshaler;
-
+                    marshaler = type.GetCustomAttribute<NativeCustomMarshalerAttribute>(false)?.Marshaler;
                     s_customMarshalers.Add(type, marshaler);
                 }
             }

diff --git a/AssimpNet/NativeMarshalerAttribute.cs b/AssimpNet/NativeMarshalerAttribute.cs
@@ -21,7 +21,6 @@
 */
 
 using System;
-using Assimp.Unmanaged;
 
 namespace Assimp
 {
@@ -47,9 +46,9 @@ public sealed class NativeCustomMarshalerAttribute : Attribute
         public NativeCustomMarshalerAttribute(Type type)
         {
             if (type == null)
-                throw new NullReferenceException("type");
+                throw new NullReferenceException(nameof(type));
 
-            if (!PlatformHelper.IsAssignable(typeof(INativeCustomMarshaler), type))
+            if (!typeof(INativeCustomMarshaler).IsAssignableFrom(type))
                 throw new ArgumentException($"{type.FullName} does not implement INativeCustomMarshaler.");
 
             m_marshaler = Activator.CreateInstance(type) as INativeCustomMarshaler;

diff --git a/AssimpNet/Unmanaged/AssimpLibrary.cs b/AssimpNet/Unmanaged/AssimpLibrary.cs
@@ -71,7 +71,7 @@ private AssimpLibrary(string defaultLibName, Type[] unmanagedFunctionDelegateTyp
 
         private static AssimpLibrary CreateInstance()
         {
-            return new AssimpLibrary(DefaultLibName, PlatformHelper.GetNestedTypes(typeof(Functions)));
+            return new AssimpLibrary(DefaultLibName, typeof(Functions).GetNestedTypes());
         }
 
         #region Import Methods

diff --git a/AssimpNet/Unmanaged/PlatformHelper.cs b/AssimpNet/Unmanaged/PlatformHelper.cs
diff --git a/AssimpNet/Unmanaged/UnmanagedLibraryImplementation.cs b/AssimpNet/Unmanaged/UnmanagedLibraryImplementation.cs
@@ -23,6 +23,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace Assimp.Unmanaged
 {
@@ -139,22 +141,15 @@ private void LoadFunctions()
                 Delegate function;
                 if(!m_nameToUnmanagedFunction.TryGetValue(funcName, out function))
                 {
-                    function = PlatformHelper.GetDelegateForFunctionPointer(procAddr, funcType);
+                    function = Marshal.GetDelegateForFunctionPointer(procAddr, funcType);
                     m_nameToUnmanagedFunction.Add(funcName, function);
                 }
             }
         }
 
         private string GetUnmanagedName(Type funcType)
         {
-            object[] attributes = PlatformHelper.GetCustomAttributes(funcType, typeof(UnmanagedFunctionNameAttribute), false);
-            foreach(object attr in attributes)
-            {
-                if(attr is UnmanagedFunctionNameAttribute)
-                    return (attr as UnmanagedFunctionNameAttribute).UnmanagedFunctionName;
-            }
-
-            return null;
+            return funcType.GetCustomAttribute<UnmanagedFunctionNameAttribute>(false)?.UnmanagedFunctionName;
         }
 
         protected abstract IntPtr NativeLoadLibrary(string path);

diff --git a/AssimpNet/Unmanaged/UnmanagedLibraryResolver.cs b/AssimpNet/Unmanaged/UnmanagedLibraryResolver.cs
@@ -22,6 +22,7 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 namespace Assimp.Unmanaged
@@ -206,7 +207,7 @@ private string ResolveLibraryPathInternal(string libName, string rid, string[] f
             }
 
             //Check runtimes folder based on RID
-            string runtimeFolder = Path.Combine(PlatformHelper.GetAppBaseDirectory(), Path.Combine("runtimes", Path.Combine(rid, "native")));
+            string runtimeFolder = Path.Combine(AppContext.BaseDirectory, Path.Combine("runtimes", Path.Combine(rid, "native")));
             if(Directory.Exists(runtimeFolder))
             {
                 string potentialPath = TryGetExistingFile(runtimeFolder, libName, fallbackNames);
@@ -215,7 +216,7 @@ private string ResolveLibraryPathInternal(string libName, string rid, string[] f
             }
 
             //Check base directory
-            string pathInAppFolder = TryGetExistingFile(PlatformHelper.GetAppBaseDirectory(), libName, fallbackNames);
+            string pathInAppFolder = TryGetExistingFile(AppContext.BaseDirectory, libName, fallbackNames);
             if(!string.IsNullOrEmpty(pathInAppFolder))
                 return pathInAppFolder;
 
@@ -240,8 +241,9 @@ private string GetPackageRuntimeFolder(string packagePath, string rid)
         private string GetNugetPackagePath()
         {
             //Resolve packageId based on assembly informational version
-            string packageId = PlatformHelper.GetAssemblyName().ToLowerInvariant();
-            string packageVersion = PlatformHelper.GetInformationalVersion();
+            Assembly assembly = Assembly.GetExecutingAssembly();
+            string packageId = assembly.GetName().Name.ToLowerInvariant();
+            string packageVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
             if(string.IsNullOrEmpty(packageId) || string.IsNullOrEmpty(packageVersion))
                 return null;