Merge branch 'develop'

ied206 · Aug 7, 2023 · 41963a5 · 41963a5
2 parents edbeb93 + d097eba
commit 41963a5
Show file tree

Hide file tree

Showing 24 changed files with 596 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,10 +38,10 @@ bld/
 [Ll]og/
 
 # Do not ignore Precompiled directory
-!/**/Precompiled/x86/
-!/**/Precompiled/x64/
-!/**/Precompiled/armhf/
-!/**/Precompiled/arm64/
+!/**/runtimes/**/native/
+
+# Thumbs.db
+Thumbs.db
 
 # macOS DS_Store guard
 .DS_Store
@@ -173,6 +173,7 @@ AutoTest.Net/
 # Installshield output folder
 [Ee]xpress/
 
+
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
 DocProject/Help/*.HxT

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,26 @@
 
 ## v2.x
 
+### v2.2.0
+
+Released on 2023-08-08.
+
+- Allow passing a custom object when loading a native library.
+    - Add `LoadManagerBase.GlobalInit()` overloadings with custom object parameter.
+    - Add `DynLoaderBase.LoadLibrary()` overloadings with custom object parameter.
+    - Add virtual method `DynLoaderBase.HandleLoadData()`.
+    - Add helper method `DynLoaderBase.HasFuncSymbol()`.
+
+### v2.1.1
+
+Released on 2022-02-15.
+
+- Official support for ARM64 macOS.
+- Unify .NET Framework 4.5.1 codebase and .NET Standard 2.0 codebase.
+
 ### v2.1.0
 
-Release in 2021.04.05.
+Released on 2021-04-05.
 
 - Avoid calling virtual methods from constructors in `DynLoaderBase`.
     - Users must call `DynLoaderBase.LoadLibrary` after creating an instance.
@@ -14,7 +31,7 @@ Release in 2021.04.05.
 
 ### v2.0.0
 
-Released in 2020.04.24.
+Released on 2020-04-24.
 
 - Use `NativeLoader` on .NET Core 3.x build.
 - `DynLoaderBase` now throws [DllNotFoundException](https://docs.microsoft.com/en-US/dotnet/api/system.dllnotfoundexception) and [EntryPointNotFoundException](https://docs.microsoft.com/en-US/dotnet/api/system.entrypointnotfoundexception) instead of [ArgumentException](https://docs.microsoft.com/en-US/dotnet/api/system.argumentexception) and [InvalidOperationException](https://docs.microsoft.com/en-us/dotnet/api/system.invalidoperationexception). 
@@ -30,31 +47,31 @@ Released in 2020.04.24.
 
 ### v1.3.0
 
-Released in 2020.02.29.
+Released on 2020-02-29.
 
 - Add `size_t` helper methods.
 - Rename AutoStringToCoTaskMem() into StringToCoTaskMemAuto().
 
 ### v1.2.1
 
-Released in 2019.10.31.
+Released on 2019-10-31.
 
 - Address `libdl.so` naming issue for CentOS ([#1](https://github.com/ied206/Joveler.DynLoader/issues/1))
 
 ### v1.2.0
 
-Released in 2019.10.16.
+Released on 2019-10-16.
 
 - Add platform convention helper properties and methods
 
 ### v1.1.0
 
-Released in 2019.10.15.
+Released on 2019-10-15.
 
 - Add `LoadManagerBase` abstract class
 
 ### v1.0.0
 
-Released in 2019.10.15.
+Released on 2019-10-15.
 
 - The initial release of the cross-platform native dynamic library loader for .NET.
diff --git a/Joveler.DynLoader.Tests/GhostErrorTests.cs b/Joveler.DynLoader.Tests/GhostErrorTests.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Hajin Jang
+    Copyright (C) 2019-2023 Hajin Jang
     Licensed under MIT License.
  
     MIT License
@@ -59,7 +59,7 @@ public void LoadFunctionError()
             try
             {
                 GhostFunction lib = new GhostFunction();
-                lib.LoadLibrary(TestSetup.PackagedZLibPath);
+                lib.LoadLibrary(TestSetup.PackagedZLibPathStdcall);
             }
             catch (EntryPointNotFoundException e)
             {

diff --git a/Joveler.DynLoader.Tests/Joveler.DynLoader.Tests.csproj b/Joveler.DynLoader.Tests/Joveler.DynLoader.Tests.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-   <!-- Windowws x86 & x64 -->
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <!-- Windowws ARM64 -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT' and '$(PROCESSOR_ARCHITECTURE)' == 'ARM64'">net6.0</TargetFrameworks>
+   <!-- Windowws -->
+    <TargetFrameworks>net481;net6.0</TargetFrameworks>
     <!-- POSIX -->
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
 
@@ -19,13 +17,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -48,8 +46,8 @@
     </Content>
   </ItemGroup>
 
-  <!-- Native Library for .NET Framework 4.8 -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+  <!-- Native Library for .NET Framework 4.8.1 -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net481' ">
     <None Include="runtimes\win-x86\native\*.dll">
       <Link>x86\%(FileName)%(Extension)</Link> <!-- Project Reference -->
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -58,12 +56,16 @@
       <Link>x64\%(FileName)%(Extension)</Link> <!-- Project Reference -->
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="runtimes\win-arm64\native\*.dll">
+      <Link>arm64\%(FileName)%(Extension)</Link> <!-- Project Reference -->
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <!-- Unfortanately, MSBuild does not support Condition on Import. -->
   <!-- <Import Project="$(MSBuildProjectDirectory)\SampleScript.netfx.targets" -->
 
-  <!-- Native Library for .NET Core 2.1 & 3.1 -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp3.1'">
+  <!-- Native Library for .NET Core -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <None Include="runtimes\win-x86\native\*.dll">
       <Link>runtimes\win-x86\native\%(FileName)%(Extension)</Link> <!-- Project Reference -->
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -92,7 +94,10 @@
       <Link>runtimes\osx-x64\native\%(FileName)%(Extension)</Link> <!-- Project Reference -->
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="runtimes\osx-arm64\native\*.dylib">
+	  <Link>runtimes\osx-arm64\native\%(FileName)%(Extension)</Link> <!-- Project Reference -->
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
-
 </Project>
diff --git a/Joveler.DynLoader.Tests/PlatformConventionTests.cs b/Joveler.DynLoader.Tests/PlatformConventionTests.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Hajin Jang
+    Copyright (C) 2020-2023 Hajin Jang
     Licensed under MIT License.
  
     MIT License

diff --git a/Joveler.DynLoader.Tests/SampleScript.netfx.targets b/Joveler.DynLoader.Tests/SampleScript.netfx.targets
@@ -33,6 +33,7 @@
                         HasTrailingSlash('$(MSBuildThisFileDirectory)')">
     <InteropLibFiles_x86 Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*.dll" />
     <InteropLibFiles_x64 Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*.dll" />
+    <InteropLibFiles_arm64 Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\*.dll" />
   </ItemGroup>
   <ItemGroup Condition="'$(ExcludeInteropMgc)' != 'true' And 
                         '$(MSBuildThisFileDirectory)' != '' And
@@ -55,6 +56,10 @@
       <Link>x64\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Condition="'@(InteropLibFiles_arm64)' != ''" Include="@(InteropLibFiles_arm64)">
+      <Link>arm64\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup Condition="'$(ExcludeInteropMgc)' != 'true'">
     <None Condition="'@(InteropMgcFiles)' != ''" Include="@(InteropMgcFiles)">
@@ -89,6 +94,16 @@
     <Copy SourceFiles="@(InteropLibFiles_x64)"
           DestinationFiles="@(InteropLibFiles_x64 -> '$(OutDir)x64\%(Filename)%(Extension)')" />
   </Target>
+  <Target Name="CopyInteropLibFiles_arm64"
+          Condition="'$(CopyInteropLibFiles_arm64)' != 'false' And
+                      '$(OutDir)' != '' And
+                      HasTrailingSlash('$(OutDir)') And
+                      Exists('$(OutDir)')"
+          Inputs="@(InteropLibFiles_arm64)"
+          Outputs="@(InteropLibFiles_arm64 -> '$(OutDir)x86\%(Filename)%(Extension)')">
+    <Copy SourceFiles="@(InteropLibFiles_arm64)"
+          DestinationFiles="@(InteropLibFiles_arm64 -> '$(OutDir)arm64\%(Filename)%(Extension)')" />
+  </Target>
   <Target Name="CopyInteropMgcFiles"
           Condition="'$(CopyInteropMgcFiles)' != 'false' And
                       '$(OutDir)' != '' And
@@ -118,6 +133,13 @@
                      Exists('$(OutDir)')">
     <Delete Files="@(InteropLibFiles_x64 -> '$(OutDir)x64\%(Filename)%(Extension)')" />
   </Target>
+  <Target Name="CleanInteropLibFiles_arm64"
+          Condition="'$(CleanInteropLibFiles_arm64)' != 'false' And
+                     '$(OutDir)' != '' And
+                     HasTrailingSlash('$(OutDir)') And
+                     Exists('$(OutDir)')">
+    <Delete Files="@(InteropLibFiles_arm64 -> '$(OutDir)arm64\%(Filename)%(Extension)')" />
+  </Target>
   <Target Name="CleanInteropMgcFiles"
           Condition="'$(CleanInteropMgcFiles)' != 'false' And
                      '$(OutDir)' != '' And
@@ -146,6 +168,14 @@
       </FilesForPackagingFromProject>
     </ItemGroup>
   </Target>
+  <Target Name="CollectInteropLibFiles_arm64"
+          Condition="'$(CollectInteropLibFiles_arm64)' != 'false'">
+    <ItemGroup>
+      <FilesForPackagingFromProject Include="@(InteropLibFiles_arm64)">
+        <DestinationRelativePath>bin\arm64\%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
   <Target Name="CollectInteropMgcFiles"
           Condition="'$(CollectInteropMgcFiles)' != 'false'">
     <ItemGroup>
@@ -166,18 +196,21 @@
       $(PostBuildEventDependsOn);
       CopyInteropLibFiles_x86;
       CopyInteropLibFiles_x64;
+      CopyInteropLibFiles_arm4;
       CopyInteropMgcFiles;
     </PostBuildEventDependsOn>
     <BuildDependsOn>
       $(BuildDependsOn);
       CopyInteropLibFiles_x86;
       CopyInteropLibFiles_x64;
+      CopyInteropLibFiles_arm64;
       CopyInteropMgcFiles;
     </BuildDependsOn>
     <CleanDependsOn>
       $(CleanDependsOn);
       CleanInteropLibFiles_x86;
       CleanInteropLibFiles_x64;
+      CleanInteropLibFiles_arm64;
       CleanInteropMgcFiles;
     </CleanDependsOn>
   </PropertyGroup>
@@ -188,16 +221,11 @@
   ******************************************************************************
   -->
 
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' Or
-                            '$(VisualStudioVersion)' == '10.0' Or
-                            '$(VisualStudioVersion)' == '11.0' Or
-                            '$(VisualStudioVersion)' == '12.0' Or
-                            '$(VisualStudioVersion)' == '14.0' Or
-                            '$(VisualStudioVersion)' == '15.0' Or
-                            '$(VisualStudioVersion)' == '16.0'">
+  <PropertyGroup>
     <PipelineCollectFilesPhaseDependsOn>
       CollectInteropLibFiles_x86;
       CollectInteropLibFiles_x64;
+      CollectInteropLibFiles_arm64;
       CollectInteropMgcFiles;
       $(PipelineCollectFilesPhaseDependsOn);
     </PipelineCollectFilesPhaseDependsOn>

diff --git a/Joveler.DynLoader.Tests/SimpleFIleMagicManager.cs b/Joveler.DynLoader.Tests/SimpleFIleMagicManager.cs
@@ -1,4 +1,9 @@
-using System;
+/*
+    Written by Hajin Jang.
+    Released under public domain.
+*/
+
+using System;
 
 namespace Joveler.DynLoader.Tests
 {

diff --git a/Joveler.DynLoader.Tests/SimpleFileMagicTests.cs b/Joveler.DynLoader.Tests/SimpleFileMagicTests.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Hajin Jang
+    Copyright (C) 2019-2023 Hajin Jang
     Licensed under MIT License.
  
     MIT License

diff --git a/Joveler.DynLoader.Tests/SimplePlatformTests.cs b/Joveler.DynLoader.Tests/SimplePlatformTests.cs
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Hajin Jang
+    Copyright (C) 2019-2023 Hajin Jang
     Licensed under MIT License.
  
     MIT License