From 6080212337df1cd3aca0fc80967fcb477a8320b7 Mon Sep 17 00:00:00 2001
From: AddressXception <github@addressxception.com>
Date: Wed, 28 Jun 2023 15:36:20 +0000
Subject: [PATCH] try removing soversion of hacl_cpp lib and bifurcate the
 links for win (#353)

Co-authored-by: John Morgan <70619927+john-s-morgan@users.noreply.github.com>
---
 .../ElectionGuard.Encryption.csproj            |  4 ++--
 .../Electionguard.Encryption.targets           | 18 ++++++++++++++++++
 libs/hacl/CMakeLists.txt                       |  4 ----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj b/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj
index d86b98537..fbe2d7722 100644
--- a/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj
+++ b/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/ElectionGuard.Encryption.csproj
@@ -10,7 +10,7 @@
     <AssemblyFileVersion>1.75.17.0</AssemblyFileVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <Platforms>arm64;x64</Platforms>
+    <Platforms>arm64;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Package -->
@@ -27,7 +27,7 @@
     <PackageIcon>icon.png</PackageIcon>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> -->
     <!-- <PackageReleaseNotes>Changelog</PackageReleaseNotes> -->
     <Platforms>arm64;x64;x86</Platforms>
   </PropertyGroup>
diff --git a/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/Electionguard.Encryption.targets b/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/Electionguard.Encryption.targets
index b66557bf5..498faa6ef 100644
--- a/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/Electionguard.Encryption.targets
+++ b/bindings/netstandard/ElectionGuard/ElectionGuard.Encryption/Electionguard.Encryption.targets
@@ -3,7 +3,13 @@
   <ItemGroup Condition="'$(Platform)' == 'arm64' AND '$(OS)' == 'Windows_NT'">
     <None Name="Windows MSVC arm64" Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\electionguard.dll">
       <Link>electionguard.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC arm64 HACL" Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\hacl.dll">
       <Link>hacl.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC arm64 HACL_CPP" Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\hacl_cpp.dll">
       <Link>hacl_cpp.dll</Link>
       <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -11,7 +17,13 @@
   <ItemGroup Condition="'$(Platform)' == 'x86' AND '$(OS)' == 'Windows_NT'">
     <None Name="Windows MSVC x86" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\electionguard.dll">
       <Link>electionguard.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC x86 HACL" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\hacl.dll">
       <Link>hacl.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC x86 HACL_CPP" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\hacl_cpp.dll">
       <Link>hacl_cpp.dll</Link>
       <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -19,7 +31,13 @@
   <ItemGroup Condition="'$(Platform)' == 'x64' AND '$(OS)' == 'Windows_NT'">
     <None Name="Windows MSVC x64" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\electionguard.dll">
       <Link>electionguard.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC x64 HACL" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\hacl.dll">
       <Link>hacl.dll</Link>
+      <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Name="Windows MSVC x64 HACL_CPP" Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\hacl_cpp.dll">
       <Link>hacl_cpp.dll</Link>
       <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/libs/hacl/CMakeLists.txt b/libs/hacl/CMakeLists.txt
index 14a818967..41caceba4 100644
--- a/libs/hacl/CMakeLists.txt
+++ b/libs/hacl/CMakeLists.txt
@@ -45,10 +45,6 @@ else()
 endif()
 
 add_library(${HACL_CPP_ALIAS_NAME} ALIAS ${HACL_CPP_TARGET_NAME})
-set_target_properties(${HACL_CPP_TARGET_NAME} PROPERTIES
-    VERSION ${hacl_VERSION}
-    SOVERSION ${hacl_VERSION_MAJOR})
-
 target_compile_features(${HACL_CPP_TARGET_NAME} PUBLIC cxx_std_17)
 
 # Dependencies