Move .NET tests to tests/dotnet.

Directory.Build.props

@@ -34,7 +34,7 @@
     <GeneratorFileExtension>dll</GeneratorFileExtension>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
-    <RID Condition="$(IsWindows)">win</RID>    
+    <RID Condition="$(IsWindows)">win</RID>
     <RID Condition="$(IsLinux)">linux</RID>
     <RID Condition="$(IsMacOSX)">osx</RID>
     <RID>$(RID)-$(PlatformTarget)</RID>

build/Helpers.lua

@@ -47,7 +47,7 @@ rootdir = path.getabsolute("../")
 srcdir = path.join(rootdir, "src");
 incdir = path.join(rootdir, "include");
 examplesdir = path.join(rootdir, "examples");
-testsdir = path.join(rootdir, "tests");
+testsdir = path.join(rootdir, "tests/dotnet");
 builddir = path.join(rootdir, "build")
 bindir = path.join(rootdir, "bin")
 objsdir = path.join(builddir, "obj");

build/premake5.lua

@@ -44,7 +44,7 @@ workspace "CppSharp"
   workspacefiles(path.join(builddir, "premake5.lua"))
   workspacefiles(path.join(builddir, "*.sh"))
   workspacefiles(path.join(rootdir, ".github/workflows/*.yml"))
-  workspacefiles(path.join(rootdir, "tests/Test*.props"))
+  workspacefiles(path.join(testsdir, "Test*.props"))
 
   group "Libraries"
     if EnableNativeProjects() then

src/Generator.Tests/GeneratorTest.cs

@@ -74,12 +74,12 @@ namespace CppSharp.Utils
 
             while (directory != null)
             {
-                var path = Path.Combine(directory.FullName, "tests", name);
+                var path = Path.Combine(directory.FullName, "tests", "dotnet", name);
 
                 if (Directory.Exists(path))
                     return path;
 
-                path = Path.Combine(directory.FullName, "external", "CppSharp", "tests", name);
+                path = Path.Combine(directory.FullName, "external", "CppSharp", "tests", "dotnet", name);
 
                 if (Directory.Exists(path))
                     return path;

tests/NamespacesBase/premake4.lua

@@ -1,11 +0,0 @@
-function SetupWrapper(name)
-  if not EnabledManagedProjects() then
-    return
-  end
-
-  SetupExternalManagedTestProject(name .. ".CSharp")
-end
-
-group "Tests/Namespaces"
-  SetupTestNativeProject("NamespacesBase")
-  targetdir (path.join(gendir, "NamespacesDerived"))

tests/dotnet/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="../Directory.Build.props" />
+  <Import Project="../../Directory.Build.props" />
   <Import Project="Test.Common.props" />  
   <Import Project="Test.Generator.props" Condition="$(IsTestGenerator)" />
   <Import Project="Test.Bindings.props" Condition="$(IsTestBindings)" />

tests/dotnet/NamespacesBase/premake4.lua

@@ -0,0 +1,3 @@
+group "Tests/Namespaces"
+  SetupTestNativeProject("NamespacesBase")
+  targetdir (path.join(gendir, "NamespacesDerived"))

tests/dotnet/NamespacesDerived/NamespacesDerived.Tests.CSharp.csproj

@@ -4,10 +4,10 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="NamespacesBase">
-      <HintPath>..\..\build\gen\NamespacesDerived\NamespacesBase.dll</HintPath>
+      <HintPath>..\..\..\build\gen\NamespacesDerived\NamespacesBase.dll</HintPath>
     </Reference>
     <Reference Include="NamespacesDerived">
-      <HintPath>..\..\build\gen\NamespacesDerived\NamespacesDerived.dll</HintPath>
+      <HintPath>..\..\..\build\gen\NamespacesDerived\NamespacesDerived.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>