Added basic Core tests via new assets

Author: 3F

.gitignore

@@ -1,6 +1,7 @@
 ## Specific
 
 /src/MetadataCore/DllExport.xml
+launchSettings.json
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -246,4 +247,4 @@ ModelManifest.xml
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
+.fake/

.vssbe

@@ -1154,6 +1154,28 @@
           "#[IO scall(\"cmd\", \"/C mklink /J $(dbgPkgDir)DllExport.$(pVerRel) $(odir.Replace('/', '\\'))\")]"
         ]
       }
+    },
+    {
+      "Enabled": true,
+      "Name": "Assets",
+      "IgnoreIfBuildFailed": true,
+      "Mode": {
+        "$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
+        "Type": "Script",
+        "Command__": [
+          "#[try",
+          "{",
+          "    #[IO delete.directory(\"$(RootAssetsDir)\", true)]",
+          "} catch{ F-53, SobaScript }]",
+          "",
+          "#[IO copy.directory(\"\", \"$(RootAssetsDir)\", true)]",
+          "#[IO scall(\"cmd\", \"/C mklink /J $(RootAssetsDir)\\DllExport $(odir.Replace('/', '\\'))\")]",
+          "",
+          "",
+          "#[File scall(\"DllExport.bat\", \"-packages $(RootAssetsDir) -dxp-version actual -action Restore >nul\", 60)]",
+          "#[File scall(\".tools\\hMSBuild.bat\", \"assets.sln ~x ~c $(Configuration) ~p \\\"$(Platform)\\\" /p:RootAssetsDir=$(RootAssetsDir) >nul\", 200)]"
+        ]
+      }
     }
   ],
   "SlnOpened": [

DllExport.bat

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\DllExport\Core\Core.csproj", "{AC6947C6-0637-429A-A5F1-54447A494E6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\DllExport\Core\Core.csproj", "{AC6947C6-0637-429A-A5F1-54447A494E6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetaFx", "src\DllExport\MetaFx\MetaFx.csproj", "{D620BC4A-50CD-48DF-8C6E-B79555260EA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaFx", "src\DllExport\MetaFx\MetaFx.csproj", "{D620BC4A-50CD-48DF-8C6E-B79555260EA0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Activator", "src\DllExport\Activator\Activator.csproj", "{9C75E9C4-5D81-4704-ADD1-F4B42B6267C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Activator", "src\DllExport\Activator\Activator.csproj", "{9C75E9C4-5D81-4704-ADD1-F4B42B6267C8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{E623294B-0FEA-4FA2-BA15-2750FE503F50}"
 	ProjectSection(SolutionItems) = preProject
@@ -34,13 +34,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".tools", ".tools", "{44F550
 		.tools\packages.config = .tools\packages.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSBin", "src\DllExport\NSBin\NSBin.csproj", "{311706A5-5ED2-4006-B794-055009D8A256}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSBin", "src\DllExport\NSBin\NSBin.csproj", "{311706A5-5ED2-4006-B794-055009D8A256}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSBinTest", "src\DllExport\NSBinTest\NSBinTest.csproj", "{3CFD9EB8-69BC-4B41-9ABA-9C1850BE324A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSBinTest", "src\DllExport\NSBinTest\NSBinTest.csproj", "{3CFD9EB8-69BC-4B41-9ABA-9C1850BE324A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wizard", "src\DllExport\Wizard\Wizard.csproj", "{D10CF407-4483-4657-9FEA-BDB467391F3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wizard", "src\DllExport\Wizard\Wizard.csproj", "{D10CF407-4483-4657-9FEA-BDB467391F3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeViewer", "src\DllExport\PeViewer\PeViewer.csproj", "{BE8C8005-A6C6-41D0-9DB0-6B4B7BD1077F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PeViewer", "src\DllExport\PeViewer\PeViewer.csproj", "{BE8C8005-A6C6-41D0-9DB0-6B4B7BD1077F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvsSln", "src\MvsSln\MvsSln\MvsSln.csproj", "{F905DFB2-2E67-4FF7-9001-924F6F2D645D}"
 EndProject
@@ -107,6 +107,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{179AF057
 		src\hMSBuild\GetNuTool\tests\_run.bat = src\hMSBuild\GetNuTool\tests\_run.bat
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitedTest", "src\DllExport\UnitedTest\UnitedTest.csproj", "{0B356E3D-F2D6-485B-A8D9-3B78ED978550}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0F0E1861-4EC7-4125-B16A-EE95FA80FA0F} = {0F0E1861-4EC7-4125-B16A-EE95FA80FA0F}
+		{311706A5-5ED2-4006-B794-055009D8A256} = {311706A5-5ED2-4006-B794-055009D8A256}
+		{3CFD9EB8-69BC-4B41-9ABA-9C1850BE324A} = {3CFD9EB8-69BC-4B41-9ABA-9C1850BE324A}
+		{9C75E9C4-5D81-4704-ADD1-F4B42B6267C8} = {9C75E9C4-5D81-4704-ADD1-F4B42B6267C8}
+		{AC6947C6-0637-429A-A5F1-54447A494E6D} = {AC6947C6-0637-429A-A5F1-54447A494E6D}
+		{BE8C8005-A6C6-41D0-9DB0-6B4B7BD1077F} = {BE8C8005-A6C6-41D0-9DB0-6B4B7BD1077F}
+		{D10CF407-4483-4657-9FEA-BDB467391F3A} = {D10CF407-4483-4657-9FEA-BDB467391F3A}
+		{D620BC4A-50CD-48DF-8C6E-B79555260EA0} = {D620BC4A-50CD-48DF-8C6E-B79555260EA0}
+		{EC0CA220-39EC-41E5-B9D6-88D8F860F979} = {EC0CA220-39EC-41E5-B9D6-88D8F860F979}
+		{F905DFB2-2E67-4FF7-9001-924F6F2D645D} = {F905DFB2-2E67-4FF7-9001-924F6F2D645D}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,6 +188,12 @@ Global
 		{0F0E1861-4EC7-4125-B16A-EE95FA80FA0F}.PublicRelease|Any CPU.Build.0 = Release|Any CPU
 		{0F0E1861-4EC7-4125-B16A-EE95FA80FA0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F0E1861-4EC7-4125-B16A-EE95FA80FA0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.PublicRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.PublicRelease|Any CPU.Build.0 = Release|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B356E3D-F2D6-485B-A8D9-3B78ED978550}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DllExport.sln

@@ -48,6 +48,8 @@ public static int entrypoint(IntPtr L)
 
 For working with **unmanaged** memory including native or binary data from the heap and binding between .NET and unmanaged native C/C++ etc, try [Conari](https://github.com/3F/Conari) (Wiki. [**Quick-start**](https://github.com/3F/Conari/wiki/Quick-start))
 
+[`[⏯]`](.\src\DllExport\assets\NetfxAsset\Basic.cs)
+
 ```csharp
 [DllExport] // DllExportModifiedClassLibrary.dll
 public static IntPtr callme(TCharPtr str, IntPtr structure)
@@ -62,6 +64,9 @@ public static IntPtr callme(TCharPtr str, IntPtr structure)
     return new NativeArray<int>(-1, v.x, 1, v.y);
 }
 ```
+
+[`[⏯]`](.\src\DllExport\UnitedTest\NetfxAssetBasicTest.cs)
+
 ```csharp
 ... // host side via C/C++, Java, Rust, Python, ... or even same dotnet C#
 using NativeString<TCharPtr> ns = new("Hello world!");
@@ -75,7 +80,7 @@ using NativeArray<int> nr = new(4, ptr); // (nstruct.Data.x == 8) != (nr[1] == 7
 
 *.NET DllExport* supports both Library (**.dll**) and Executable (**.exe**) PE modules.
 
-Find demo project here: https://github.com/3F/Examples/tree/master/DllExport/BasicExport
+`[⏯]` See also demo project here: https://github.com/3F/Examples/tree/master/DllExport/BasicExport
 
 ## How does it work
 

Readme.md

@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DllExport", "DllExport", "{7EFE776C-2D5C-487B-81F3-14D53D6F7099}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetfxAsset", "src\DllExport\assets\NetfxAsset\NetfxAsset.csproj", "{4D13A153-4DE3-4342-B447-F2DB081B2981}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4D13A153-4DE3-4342-B447-F2DB081B2981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D13A153-4DE3-4342-B447-F2DB081B2981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D13A153-4DE3-4342-B447-F2DB081B2981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D13A153-4DE3-4342-B447-F2DB081B2981}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{4D13A153-4DE3-4342-B447-F2DB081B2981} = {7EFE776C-2D5C-487B-81F3-14D53D6F7099}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1ED17F28-E550-4B00-8DF9-BD43241EEA55}
+	EndGlobalSection
+EndGlobal

assets.sln

@@ -0,0 +1,9 @@
+{
+  "Header": {
+    "_": [
+      " This file for vsSolutionBuildEvent ",
+      " https://github.com/3F/vsSolutionBuildEvent "
+    ],
+    "Compatibility": "0.12.4"
+  }
+}

assets.vssbe

@@ -16,7 +16,7 @@
 set reltype=%~1
 if not defined reltype set reltype=Release
 
-call .tools\gnt & call packages\vsSolutionBuildEvent\cim.cmd ~x ~c %reltype% || goto err
+call .tools\gnt & call packages\vsSolutionBuildEvent\cim.cmd ~x ~c %reltype% DllExport.sln || goto err
 set "frel=%reltype:Public=%"
 
 setlocal enableDelayedExpansion

build.bat

@@ -0,0 +1,83 @@
+/*!
+ * Copyright (c) Denis Kuzmin <[email protected]> github/3F
+ * Copyright (c) DllExport contributors https://github.com/3F/DllExport/graphs/contributors
+ * Licensed under the MIT License (MIT).
+ * See accompanying LICENSE.txt file or visit https://github.com/3F/DllExport
+*/
+
+using System;
+using System.IO;
+using static net.r_eg.Conari.Static.Members;
+
+namespace net.r_eg.DllExport.UnitedTest
+{
+    using PeMagic = Conari.PE.WinNT.Magic;
+
+    internal sealed class Assets
+    {
+        const string X64 = "x64";
+        const string X86 = "x86";
+
+        internal const string PRJ_NETFX = "NetfxAsset";
+
+        internal const string ROOT = @"bin\assets\";
+
+        internal const string PKG = @"bin\assets\DllExport\";
+
+        internal static PeMagic MagicAtThis => Is64bit ? PeMagic.PE64 : PeMagic.PE32;
+
+        /// <summary>
+        /// Path to bin at NetfxAsset project
+        /// </summary>
+        internal static string PrjNetfxBin => GetPathToPrj(PRJ_NETFX);
+
+        /// <summary>
+        /// x86 modified module at NetfxAsset project
+        /// </summary>
+        internal static string PrjNetfxX86 => GetDllPath(PRJ_NETFX, X86);
+
+        /// <summary>
+        /// x64 modified module at NetfxAsset project
+        /// </summary>
+        internal static string PrjNetfxX64 => GetDllPath(PRJ_NETFX, X64);
+
+        /// <summary>
+        /// original or modified (x86/x64) at NetfxAsset project
+        /// </summary>
+        internal static string PrjNetfx => GetPathToPrj(PRJ_NETFX);
+
+        /// <summary>
+        /// <see cref="PrjNetfxX64"/> or <see cref="PrjNetfxX86"/> depending on env at runtime
+        /// </summary>
+        internal static string PrjNetfxRuntime => Is64bit ? PrjNetfxX64 : PrjNetfxX86;
+
+        internal static string GetDllPath(string project) => GetDllPath(project, string.Empty);
+
+        internal static string GetDllPath(string project, string arch)
+        {
+            return Path.Combine(GetPathToPrj(project), arch, $"{project}.dll");
+        }
+
+        internal static string GetPathToPrj(string name) => GetPathTo("prj", name);
+
+        internal static string GetPathToObj(string name) => GetPathTo("obj", name);
+
+        internal static string GetPathTo(string baseName, string subname)
+        {
+            return Path.GetFullPath(Path.Combine
+            (
+                AppDomain.CurrentDomain.BaseDirectory,
+                @"..\..\..\..", // common.props: bin\prj\$(MSBuildProjectName)\$(Configuration)
+
+                ROOT,
+#if DEBUG
+                "Debug",
+#else
+                "Release",
+#endif
+                baseName, subname
+            ))
+            + Path.DirectorySeparatorChar;
+        }
+    }
+}

src/DllExport/UnitedTest/Assets.cs

@@ -0,0 +1,109 @@
+/*!
+ * Copyright (c) Denis Kuzmin <[email protected]> github/3F
+ * Copyright (c) DllExport contributors https://github.com/3F/DllExport/graphs/contributors
+ * Licensed under the MIT License (MIT).
+ * See accompanying LICENSE.txt file or visit https://github.com/3F/DllExport
+*/
+
+using System;
+using System.Linq;
+using net.r_eg.Conari;
+using net.r_eg.Conari.PE;
+using net.r_eg.Conari.Types;
+using Xunit;
+
+namespace net.r_eg.DllExport.UnitedTest
+{
+    public class NetfxAssetBasicTest
+    {
+        [Fact]
+        public void AddTest1()
+        {
+            using dynamic l = new ConariX(Assets.PrjNetfxRuntime);
+            int x = l.add<int>(5, 7);
+
+            Assert.Equal(12, x);
+
+            IPE pe = ((IConari)l).PE;
+            Assert.Equal(pe.Magic, Assets.MagicAtThis);
+
+            Assert.NotEmpty(pe.ExportedProcNames);
+            Assert.NotNull(pe.ExportedProcNames.FirstOrDefault(s => s == "add"));
+        }
+
+        [Fact]
+        public void CallmeTest1()
+        {
+            TCharPtr.Unicode = true;
+            using NativeString<TCharPtr> ns = new("Hello world!");
+            using NativeStruct<Arg> nstruct = new(new Arg() { x = 7, y = 5 });
+
+            using dynamic l = new ConariX(Assets.PrjNetfxRuntime);
+
+            try
+            {
+                IntPtr ptr = l.callme<IntPtr>(ns, nstruct);
+
+                if(ptr != IntPtr.Zero)
+                {
+                    using NativeArray<int> nr = new(4, ptr);
+
+                    Assert.Equal(-1, nr[0]);
+                    Assert.Equal(7, nr[1]);
+                    Assert.Equal(1, nr[2]);
+                    Assert.Equal(5, nr[3]);
+
+                    nstruct.read(out Arg upd);
+                    Assert.Equal(8, upd.x); // due to structure.Access().write<int>(8);
+
+                    // possible alternatives ~
+                    using NativeStruct<Arg> nstruct2 = new((IntPtr)nstruct);
+                    Assert.Equal(upd.x, nstruct2.Data.x);
+                    Assert.Equal(upd.x, nstruct.Native.f<int>("x")._.x);
+
+                    using NativeArray<int> nr2 = new(2, nstruct2);
+                    Assert.Equal(upd.x, nr2[0]);
+                }
+
+                TCharPtr r = l.callme<TCharPtr>(ns + " and You 👋", nstruct);
+                Assert.Equal("Рад знакомству 🤝 どうぞよろしく", r);
+            }
+            finally
+            {
+                l.free();
+            }
+        }
+
+        [Fact]
+        public void CallmeTest2()
+        {
+            using dynamic l = new ConariX(Assets.PrjNetfxRuntime);
+
+            using NativeString<CharPtr> ns = new("Hello world");
+
+            try
+            {
+                IntPtr ptr = l.callme<IntPtr>(ns);
+                Assert.Equal(IntPtr.Zero, ptr);
+            }
+            finally
+            {
+                l.free();
+            }
+        }
+
+        [Fact]
+        public void ThrowExceptionTest1()
+        {
+            using ConariL l = new(Assets.PrjNetfxRuntime);
+
+            Assert.Equal
+            (
+                "こんにちは！",
+                Assert.Throws<NotImplementedException>(() => { l.bind<Action>("throwException")(); }).Message
+            );
+        }
+
+        struct Arg { public int x, y; }
+    }
+}