try removing soversion of hacl_cpp lib and bifurcate the links for win (

#353) Co-authored-by: John Morgan <[email protected]>
Election-Tech-Initiative · Jun 28, 2023 · 6080212 · 6080212
1 parent fc73d7a
commit 6080212
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git 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
@@ -3,23 +3,41 @@
   <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>
   </ItemGroup>
   <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>
   </ItemGroup>
   <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
@@ -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