From d696155adc26925b156d4c8b200b40409b072142 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 14 Oct 2024 10:24:40 +0200
Subject: [PATCH] dotnet: Fix shared libs copy in .Net runtime package

---
 .../dotnet/Google.OrTools.runtime.csproj.in   | 84 +++++++++++++++++++
 ortools/dotnet/Test.csproj.in                 |  8 +-
 2 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/ortools/dotnet/Google.OrTools.runtime.csproj.in b/ortools/dotnet/Google.OrTools.runtime.csproj.in
index ad6d3dba0c7..dcf27576a8c 100644
--- a/ortools/dotnet/Google.OrTools.runtime.csproj.in
+++ b/ortools/dotnet/Google.OrTools.runtime.csproj.in
@@ -27,6 +27,90 @@
     <Content Include="
       $<TARGET_FILE:google-ortools-native>
       $<$<STREQUAL:$<TARGET_PROPERTY:@PROJECT_NAME@,TYPE>,SHARED_LIBRARY>:;$<TARGET_SONAME_FILE:@PROJECT_NAME@>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::base>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::city>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::cord>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::cord_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::cordz_functions>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::cordz_handle>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::cordz_info>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::crc32c>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::crc_cord_state>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::crc_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::debugging_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::decode_rust_punycode>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::demangle_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::demangle_rust>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::die_if_null>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::examine_stack>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::exponential_biased>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_commandlineflag>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_commandlineflag_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_config>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_marshalling>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_parse>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_private_handle_accessor>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_program_name>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_reflection>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_usage>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::flags_usage_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::hash>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::int128>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::kernel_timeout_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::leak_check>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_flags>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_globals>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_initialize>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_check_op>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_conditions>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_fnmatch>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_format>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_globals>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_message>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_internal_proto>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::log_sink>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::low_level_hash>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::malloc_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_distributions>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_platform>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_pool_urbg>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_randen>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_randen_hwaes>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_randen_hwaes_impl>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_randen_slow>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_internal_seed_material>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::random_seed_gen_exception>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::raw_hash_set>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::raw_logging_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::spinlock_wait>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::stacktrace>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::status>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::statusor>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::str_format_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::strerror>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::strings>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::strings_internal>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::symbolize>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::synchronization>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::throw_delegate>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::time>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::time_zone>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
+      $<$<BOOL:${BUILD_absl}>:;$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
+
+      $<$<BOOL:${BUILD_re2}>:;$<TARGET_SONAME_FILE:re2::re2>>
+      $<$<BOOL:${BUILD_Protobuf}>:;$<TARGET_SONAME_FILE:protobuf::libprotobuf>>
+
+      $<$<BOOL:${BUILD_CoinUtils}>:;$<TARGET_SONAME_FILE:Coin::CoinUtils>>
+      $<$<BOOL:${BUILD_Osi}>:;$<TARGET_SONAME_FILE:Coin::Osi>>
+      $<$<BOOL:${BUILD_Clp}>:;$<TARGET_SONAME_FILE:Coin::Clp>;$<TARGET_SONAME_FILE:Coin::OsiClp>;$<TARGET_SONAME_FILE:Coin::ClpSolver>>
+      $<$<BOOL:${BUILD_Cgl}>:;$<TARGET_SONAME_FILE:Coin::Cgl>>
+      $<$<BOOL:${BUILD_Cbc}>:;$<TARGET_SONAME_FILE:Coin::Cbc>;$<TARGET_SONAME_FILE:Coin::OsiCbc>;$<TARGET_SONAME_FILE:Coin::CbcSolver>>
+
+      $<$<BOOL:${BUILD_HIGHS}>:;$<TARGET_SONAME_FILE:highs>>
     ">
       <PackagePath>runtimes/@DOTNET_RID@/native/%(Filename)%(Extension)</PackagePath>
       <Pack>true</Pack>
diff --git a/ortools/dotnet/Test.csproj.in b/ortools/dotnet/Test.csproj.in
index f10a2c90b47..9dd2471ecaa 100644
--- a/ortools/dotnet/Test.csproj.in
+++ b/ortools/dotnet/Test.csproj.in
@@ -33,10 +33,10 @@
 
   <ItemGroup>
     <Compile Include="@TEST_FILE_NAME@" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.8.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.8.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageReference Include="@DOTNET_PROJECT@" Version="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.*" />
   </ItemGroup>
 </Project>