Added net6 back.

Author: Razmoth

AssetStudio.PInvoke/AssetStudio.PInvoke.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>0.80.30</Version>
     <AssemblyVersion>0.80.30</AssemblyVersion>

AssetStudio.PInvoke/DllLoader.cs

@@ -6,7 +6,7 @@
 
 namespace AssetStudio.PInvoke
 {
-    public static partial class DllLoader
+    public static class DllLoader
     {
 
         public static void PreloadDll(string dllName)
@@ -46,9 +46,9 @@ internal static void LoadDll(string dllDir, string dllName)
                 var directedDllPath = Path.Combine(dllDir, dllFileName);
 
                 // Specify SEARCH_DLL_LOAD_DIR to load dependent libraries located in the same platform-specific directory.
-                var hLibrary = LoadLibraryEx(directedDllPath, nint.Zero, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
+                var hLibrary = LoadLibraryEx(directedDllPath, IntPtr.Zero, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
 
-                if (hLibrary == nint.Zero)
+                if (hLibrary == IntPtr.Zero)
                 {
                     var errorCode = Marshal.GetLastWin32Error();
                     var exception = new Win32Exception(errorCode);
@@ -59,15 +59,15 @@ internal static void LoadDll(string dllDir, string dllName)
 
             // HMODULE LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
             // HMODULE LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
-            [LibraryImport("kernel32.dll", EntryPoint = "LoadLibraryExA", SetLastError = true, StringMarshalling = StringMarshalling.Utf8)]
-            private static partial IntPtr LoadLibraryEx(string lpLibFileName, IntPtr hFile, uint dwFlags);
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern IntPtr LoadLibraryEx(string lpLibFileName, IntPtr hFile, uint dwFlags);
 
             private const uint LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x1000;
             private const uint LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR = 0x100;
 
         }
 
-        private static partial class Posix
+        private static class Posix
         {
 
             internal static void LoadDll(string dllDir, string dllName)
@@ -93,7 +93,7 @@ internal static void LoadDll(string dllDir, string dllName)
                 const int ldFlags = RTLD_NOW | RTLD_GLOBAL;
                 var hLibrary = DlOpen(directedDllPath, ldFlags);
 
-                if (hLibrary == nint.Zero)
+                if (hLibrary == IntPtr.Zero)
                 {
                     var pErrStr = DlError();
                     // `PtrToStringAnsi` always uses the specific constructor of `String` (see dotnet/core#2325),
@@ -107,12 +107,12 @@ internal static void LoadDll(string dllDir, string dllName)
 
             // OSX and most Linux OS use LP64 so `int` is still 32-bit even on 64-bit platforms.
             // void *dlopen(const char *filename, int flag);
-            [LibraryImport("libdl", EntryPoint = "dlopen", StringMarshalling = StringMarshalling.Utf8)]
-            private static partial nint DlOpen(string fileName, int flags);
+            [DllImport("libdl", EntryPoint = "dlopen")]
+            private static extern IntPtr DlOpen([MarshalAs(UnmanagedType.LPStr)] string fileName, int flags);
 
             // char *dlerror(void);
-            [LibraryImport("libdl", EntryPoint = "dlerror")]
-            private static partial nint DlError();
+            [DllImport("libdl", EntryPoint = "dlerror")]
+            private static extern IntPtr DlError();
 
             private const int RTLD_LAZY = 0x1;
             private const int RTLD_NOW = 0x2;

AssetStudio/AssetStudio.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <Version>0.80.30</Version>
     <AssemblyVersion>0.80.30</AssemblyVersion>
     <FileVersion>0.80.30</FileVersion>

AssetStudio/Classes/AnimationClip.cs

@@ -488,8 +488,6 @@ public void Read(ObjectReader reader)
                 m_ConstCurveCount = reader.ReadUInt32();
             }
         }
-
-        public bool IsSet => m_CurveCount > 0;
     }
 
     public class StreamedClip

AssetStudio/Classes/MiHoYoBinData.cs

@@ -12,8 +12,10 @@ public enum MiHoYoBinDataType
         Bytes,
         JSON
     }
-    public sealed partial class MiHoYoBinData : Object
+    public sealed class MiHoYoBinData : Object
     {
+        private static Regex ASCII = new Regex("[^\u0020-\u007E]", RegexOptions.Compiled);
+
         public static bool Exportable;
         public static bool Encrypted;
         public static byte Key;
@@ -29,7 +31,7 @@ public MiHoYoBinData(ObjectReader reader) : base(reader)
         public string AsString => Type switch
         {
             MiHoYoBinDataType.JSON => JToken.Parse(DataStr).ToString(Formatting.Indented),
-            MiHoYoBinDataType.Bytes => Chars().Replace(DataStr, string.Empty),
+            MiHoYoBinDataType.Bytes => ASCII.Replace(DataStr, string.Empty),
             _ => "",
         };
         public new object Dump() => Type switch
@@ -74,8 +76,5 @@ private byte[] Data
                 else return RawData;
             }
         }
-
-        [GeneratedRegex("[^\\u0020-\\u007E]")]
-        private static partial Regex Chars();
     }
 }

AssetStudioCLI/AssetStudioCLI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFramework>net7.0-windows</TargetFramework>
+	<TargetFrameworks>net7.0-windows;net6.0-windows</TargetFrameworks>
 	<ApplicationIcon>Resources\as.ico</ApplicationIcon>
 	<Version>0.80.30</Version>
 	<AssemblyVersion>0.80.30</AssemblyVersion>

AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>0.80.30</Version>
     <AssemblyVersion>0.80.30</AssemblyVersion>

AssetStudioFBXWrapper/Fbx.PInvoke.cs

@@ -6,11 +6,11 @@ namespace AssetStudio
     partial class Fbx
     {
 
-        [LibraryImport(FbxDll.DllName)]
-        private static partial void AsUtilQuaternionToEuler(float qx, float qy, float qz, float qw, out float vx, out float vy, out float vz);
+        [DllImport(FbxDll.DllName)]
+        private static extern void AsUtilQuaternionToEuler(float qx, float qy, float qz, float qw, out float vx, out float vy, out float vz);
 
-        [LibraryImport(FbxDll.DllName)]
-        private static partial void AsUtilEulerToQuaternion(float vx, float vy, float vz, out float qx, out float qy, out float qz, out float qw);
+        [DllImport(FbxDll.DllName)]
+        private static extern void AsUtilEulerToQuaternion(float vx, float vy, float vz, out float qx, out float qy, out float qz, out float qw);
 
     }
 }