1 files changed, 24 insertions, 2 deletions

diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build
index b01e274..52c6e31 100644
--- a/src/tests/efl_mono/meson.build
+++ b/src/tests/efl_mono/meson.build
@@ -25,7 +25,7 @@ foreach mono_gen_file : eo_files
   eo_file_targets += custom_target('eolian_mono_gen_'+mono_gen_file.underscorify()+'',
     input : mono_gen_file,
     output : [mono_gen_file + '.cs'],
-    command : [eolian_mono_gen, '-I', meson.current_source_dir(), eolian_include_directories,
+    command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
                                 '--dllimport', 'efl_mono_native_test',
                                 '-o', join_paths(meson.current_build_dir(), mono_gen_file + '.cs'),
                                 '@INPUT@'])
@@ -34,6 +34,7 @@ endforeach
 efl_mono_test = library('efl_mono_test',
     eo_file_targets,
     link_with : [efl_mono],
+    cs_args : extra_cs_args
 )
 
 efl_mono_src = [
@@ -47,7 +48,6 @@ efl_mono_src = [
      'Eo.cs',
      'EoPromises.cs',
      'Errors.cs',
-     'Evas.cs',
      'Events.cs',
      'FunctionPointers.cs',
      'FunctionPointerMarshalling.cs',
@@ -64,11 +64,33 @@ efl_mono_src = [
 efl_mono_suite = executable('efl-mono-suite',
   efl_mono_src,
   link_with : [efl_mono, efl_mono_test],
+  cs_args : extra_cs_args
 )
 
 env = environment()
 env.set('MONO_PATH', efl_mono_test_suite_path )
 
+if (cs_is_dotnet)
+env.set('LD_LIBRARY_PATH', efl_mono_test_suite_path )
+copy_prog = find_program(['cp', 'copy'])
+
+configure_file(input : 'efl-mono-suite.runtimeconfig.json',
+               output : 'efl-mono-suite.runtimeconfig.json',
+               copy : true)
+
+custom_target('copy_efl_mono_dll',
+              build_by_default : true,
+              input : efl_mono,
+              output : efl_mono.full_path().split('/')[-1],
+              command : [copy_prog, '@INPUT@', '@OUTPUT@'])
+
+custom_target('copy_efl_mono_lib_dll',
+              build_by_default : true,
+              input : efl_mono_lib,
+              output : efl_mono_lib.full_path().split('/')[-1],
+              command : [copy_prog, '@INPUT@', '@OUTPUT@'])
+endif
+
 config_libs = ['eina', 'ecore', 'eo', 'efl', 'evas', 'eldbus', 'elementary']
 load_lib = ''