From 534de98ff36a89613ecdfefaf83faf204983f4b6 Mon Sep 17 00:00:00 2001
From: Yatao Li <yatli@microsoft.com>
Date: Mon, 10 Sep 2018 15:05:22 +0800
Subject: [PATCH] fine-tune native assembly packing

---
 src/api/dotnet/CMakeLists.txt         | 2 +-
 src/api/dotnet/Microsoft.Z3.csproj.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt
index 6a70f43b5..07091cab9 100644
--- a/src/api/dotnet/CMakeLists.txt
+++ b/src/api/dotnet/CMakeLists.txt
@@ -142,7 +142,7 @@ set(Z3_DOTNET_NUPKG_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Z3.csproj.in ${CMAKE_CURRENT_BINARY_DIR}/build/Microsoft.Z3.csproj)
 ADD_DOTNET(${CMAKE_CURRENT_BINARY_DIR}/build/Microsoft.Z3.csproj
     VERSION ${Z3_DOTNET_NUPKG_VERSION}
-    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Z3.csproj.in
+    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Z3.csproj.in ${Z3_DOTNET_ASSEMBLY_SOURCES}
     PACKAGE Microsoft.Z3)
 
 add_dependencies(BUILD_Microsoft.Z3 libz3)
diff --git a/src/api/dotnet/Microsoft.Z3.csproj.in b/src/api/dotnet/Microsoft.Z3.csproj.in
index cbbddc63f..01d18def9 100644
--- a/src/api/dotnet/Microsoft.Z3.csproj.in
+++ b/src/api/dotnet/Microsoft.Z3.csproj.in
@@ -59,7 +59,7 @@ ${Z3_DOTNET_COMPILE_ITEMS}
   <!-- Native binaries -->
   <ItemGroup>
     <!--TODO detect if we're building x86.-->
-    <Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.dll" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.dll')">
+    <Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll')">
       <PackagePath>runtimes\win-x64\native</PackagePath>
     </Content>
     <Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.so" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libz3.so')">