From 43ee345f01e2ecb7b3d93fa90c0a8cc639afde97 Mon Sep 17 00:00:00 2001
From: Yatao Li <yatli@microsoft.com>
Date: Tue, 15 Jan 2019 03:06:36 +0900
Subject: [PATCH] dotnet deps hack for test

---
 .travis.yml                                  |  2 +-
 cmake/modules/FindDotnet.cmake               |  2 +-
 contrib/ci/scripts/test_z3_examples_cmake.sh |  8 +++++++-
 examples/dotnet/CMakeLists.txt               | 20 +++++++++++++++++++-
 src/api/dotnet/CMakeLists.txt                |  2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdd572852..12e62ed3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ env:
     # 64-bit UBSan Debug build
     - LINUX_BASE=ubuntu_16.04 C_COMPILER=/usr/bin/clang-3.9 CXX_COMPILER=/usr/bin/clang++-3.9 TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug UBSAN_BUILD=1 RUN_UNIT_TESTS=SKIP
     # 64-bit ASan Debug build
-    - LINUX_BASE=ubuntu_16.04 C_COMPILER=/usr/bin/clang-3.9 CXX_COMPILER=/usr/bin/clang++-3.9 TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug ASAN_BUILD=1 RUN_UNIT_TESTS=SKIP ASAN_DSO=/usr/lib/clang/3.9/lib/linux/libclang_rt.asan-x86_64.so DOTNET_BINDINGS=0
+    - LINUX_BASE=ubuntu_16.04 C_COMPILER=/usr/bin/clang-3.9 CXX_COMPILER=/usr/bin/clang++-3.9 TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug ASAN_BUILD=1 RUN_UNIT_TESTS=SKIP ASAN_DSO=/usr/lib/clang/3.9/lib/linux/libclang_rt.asan-x86_64.so 
     # Build for running unit tests under ASan/UBSan
     # FIXME: We should really be doing a debug build but the unit tests run too
     # slowly when we do that.
diff --git a/cmake/modules/FindDotnet.cmake b/cmake/modules/FindDotnet.cmake
index 191364858..98c5f2079 100644
--- a/cmake/modules/FindDotnet.cmake
+++ b/cmake/modules/FindDotnet.cmake
@@ -218,7 +218,7 @@ FUNCTION(DOTNET_GET_DEPS _DN_PROJECT arguments)
     ELSEIF(_DN_X64)
         SET(_DN_PLATFORM x64)
     ELSEIF(_DN_ANYCPU)
-        SET(_DN_PLATFORM "Any CPU")
+        SET(_DN_PLATFORM "AnyCPU")
     ENDIF()
 
     # If package version is not set, first fallback to DOTNET_PACKAGE_VERSION
diff --git a/contrib/ci/scripts/test_z3_examples_cmake.sh b/contrib/ci/scripts/test_z3_examples_cmake.sh
index 1e75a5701..a149a1d83 100755
--- a/contrib/ci/scripts/test_z3_examples_cmake.sh
+++ b/contrib/ci/scripts/test_z3_examples_cmake.sh
@@ -89,7 +89,13 @@ fi
 
 if [ "X${DOTNET_BINDINGS}" = "X1" ]; then
   # Run .NET example
-  run_quiet run_non_native_binding dotnet ${Z3_BUILD_DIR}/dotnet/netcoreapp2.0/dotnet.dll
+  if [ "X${ASAN_BUILD}" = "X1" ]; then
+    # The dotnet test get stuck on ASAN
+    # so don't run it for now.
+    echo "Skipping .NET example under ASan build"
+  else
+    run_quiet run_non_native_binding dotnet ${Z3_BUILD_DIR}/dotnet/netcoreapp2.0/dotnet.dll
+  fi
 fi
 
 if [ "X${JAVA_BINDINGS}" = "X1" ]; then
diff --git a/examples/dotnet/CMakeLists.txt b/examples/dotnet/CMakeLists.txt
index d145a2269..108326f83 100644
--- a/examples/dotnet/CMakeLists.txt
+++ b/examples/dotnet/CMakeLists.txt
@@ -3,7 +3,7 @@ find_package(Dotnet REQUIRED)
 if("${TARGET_ARCHITECTURE}" STREQUAL "i686")
     set(Z3_DOTNET_PLATFORM "x86")
 else()
-    set(Z3_DOTNET_PLATFORM "Any CPU")
+    set(Z3_DOTNET_PLATFORM "AnyCPU")
 endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dotnet.csproj dotnet.csproj COPYONLY)
@@ -14,3 +14,21 @@ ADD_DOTNET(${CMAKE_CURRENT_BINARY_DIR}/dotnet.csproj
     NETCOREAPP
     CUSTOM_BUILDPROPS "<Z3_VERSION>${Z3_VERSION_MAJOR}.${Z3_VERSION_MINOR}.${Z3_VERSION_PATCH}</Z3_VERSION>"
     DEPENDS Microsoft.Z3)
+
+if(UNIX AND NOT APPLE)
+    set(z3_dotnet_native_lib ${CMAKE_BINARY_DIR}/libz3.so)
+    set(z3_dotnet_test_manual_copy_deps
+        ${CMAKE_BINARY_DIR}/Microsoft.Z3/netstandard2.0/Microsoft.Z3.dll 
+        ${z3_dotnet_native_lib}
+        )
+
+    add_custom_target(
+        z3_dotnet_test_manual_copy_assembly_hack ALL
+        COMMAND ${CMAKE_COMMAND} -E copy ${z3_dotnet_test_manual_copy_deps} ${CMAKE_BINARY_DIR}/dotnet/netcoreapp2.0/
+        # hack the libz3 entry in deps so it's easy enough for dotnet to reach it...
+        COMMAND sed \"s/runtimes\\/.*libz3\\.so/libz3.so/\" -i ${CMAKE_BINARY_DIR}/dotnet/netcoreapp2.0/dotnet.deps.json
+        )
+
+    add_dependencies(z3_dotnet_test_manual_copy_assembly_hack BUILD_dotnet)
+endif()
+
diff --git a/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt
index 4f4230ff2..3ff1a484a 100644
--- a/src/api/dotnet/CMakeLists.txt
+++ b/src/api/dotnet/CMakeLists.txt
@@ -143,7 +143,7 @@ set(Z3_DOTNET_NUPKG_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}")
 if("${TARGET_ARCHITECTURE}" STREQUAL "i686")
     set(Z3_DOTNET_PLATFORM "x86")
 else()
-    set(Z3_DOTNET_PLATFORM "Any CPU")
+    set(Z3_DOTNET_PLATFORM "AnyCPU")
 endif()
 
 # TODO conditional for signing. we can then enable the ``Release_delaysign`` configuration