Saalvage · JeremyAnsel · Apr 3, 2025 · Apr 10, 2025 · Apr 12, 2025 · Apr 13, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,10 @@ jobs:
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.x.x
+          dotnet-version: |
+            6.x.x
+            8.x.x
+            9.x.x
 
       - run: dotnet test AssimpNet.Test -c ${{ matrix.configuration }} ${{ matrix.additional_args }}
 

diff --git a/AssimpNet.Sample/AssimpNet.Sample.csproj b/AssimpNet.Sample/AssimpNet.Sample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Assimp.Sample</RootNamespace>
     <ApplicationIcon />
     <StartupObject />

diff --git a/AssimpNet.Test/AssimpNet.Test.csproj b/AssimpNet.Test/AssimpNet.Test.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <IsLinux>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Linux())))</IsLinux>
+    <TargetFrameworks>net9.0;net8.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsLinux)' == 'true' ">net9.0;net8.0;net6.0</TargetFrameworks>
     <RootNamespace>Assimp.Test</RootNamespace>
     <LangVersion>latest</LangVersion>
     <ForceCopyNativeAssimp>true</ForceCopyNativeAssimp>
@@ -15,6 +17,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="OpenTK.NETCore" Version="1.1.2749.6433" />
+    <PackageReference Include="Polyfill" Version="7.24.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AssimpNet.sln b/AssimpNet.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35919.96 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssimpNet", "AssimpNet\AssimpNet.csproj", "{EAB14BD7-4180-407A-BB55-D67C9D32F9FE}"
 EndProject
@@ -20,9 +20,7 @@ Global
 		{EAB14BD7-4180-407A-BB55-D67C9D32F9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAB14BD7-4180-407A-BB55-D67C9D32F9FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EB942AE-787E-4E61-9C71-B868F4C2B53C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EB942AE-787E-4E61-9C71-B868F4C2B53C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EB942AE-787E-4E61-9C71-B868F4C2B53C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EB942AE-787E-4E61-9C71-B868F4C2B53C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C5206C9-691B-4C17-B4E1-E34F40AAC1D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C5206C9-691B-4C17-B4E1-E34F40AAC1D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C5206C9-691B-4C17-B4E1-E34F40AAC1D3}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/AssimpNet/AssimpNet.csproj b/AssimpNet/AssimpNet.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <IsLinux>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Linux())))</IsLinux>
+    <TargetFrameworks>net9.0;net8.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(IsLinux)' == 'true' ">net9.0;net8.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -44,6 +46,14 @@
     <Content Include="AssimpNetter.targets" Link="nuget\build\AssimpNetter.targets" PackagePath="build" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Polyfill" Version="7.24.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Memory" Version="4.6.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\libs\Assimp\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/AssimpNet/Material.cs b/AssimpNet/Material.cs
@@ -1378,7 +1378,7 @@ public TextureSlot[] GetMaterialTextures(TextureType type)
         /// <returns>The array of textures</returns>
         public IEnumerable<TextureSlot> GetAllMaterialTextures()
         {
-            return Enum.GetValues<TextureType>().SelectMany(GetMaterialTextures);
+            return EnumPolyfill.GetValues<TextureType>().SelectMany(GetMaterialTextures);
         }
 
         #region IMarshalable Implementation

diff --git a/AssimpNet/MemoryHelper.cs b/AssimpNet/MemoryHelper.cs
@@ -613,9 +613,17 @@ public static unsafe void Write<T>(IntPtr pDest, T[] data, int startIndexInArray
         /// <param name="count">Number of elements to copy</param>
         public static unsafe void Write<T>(IntPtr pDest, List<T> data, int startIndexInArray, int count) where T : struct
         {
+#if NET48
+            int sizeT = Unsafe.SizeOf<T>();
+            for (int i = 0; i < count; i++)
+            {
+                Unsafe.Write((void*)(pDest + i * sizeT), data[i]);
+            }
+#else
             ReadOnlySpan<T> src = CollectionsMarshal.AsSpan(data).Slice(startIndexInArray, count);
             Span<T> dst = new Span<T>(pDest.ToPointer(), count);
             src.CopyTo(dst);
+#endif
         }
 
         /// <summary>