Moving lib to not be in a folder

BoomDAO · Apr 11, 2023 · 24e0319 · 24e0319
1 parent aa18e9e
commit 24e0319
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/src/EdjCase.Cryptography.BLS/EdjCase.Cryptography.BLS.csproj b/src/EdjCase.Cryptography.BLS/EdjCase.Cryptography.BLS.csproj
@@ -26,25 +26,23 @@
 			<PackagePath>\</PackagePath>
 		</None>
 	</ItemGroup>
-
 	<ItemGroup>
-		<None Include=".\lib\bls384_256.dll" Pack="true" PackagePath="runtimes\win-x64\native">
+		<None Include="bls384_256.dll" Pack="true" PackagePath="runtimes\win-x64\native">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+	  <None Update="bls384_256.dylib" Pack="true" PackagePath="runtimes\osx-x64\native">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="bls384_256.so" Pack="true" PackagePath="runtimes\linux-x64\native">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
 	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Vsxmd" Version="1.4.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
-	<ItemGroup>
-	  <None Update="lib\bls384_256.dylib" Pack="true" PackagePath="runtimes\osx-x64\native">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="lib\bls384_256.so" Pack="true" PackagePath="runtimes\linux-x64\native">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
 
 </Project>
diff --git a/src/EdjCase.Cryptography.BLS/Interop.cs b/src/EdjCase.Cryptography.BLS/Interop.cs
@@ -11,7 +11,6 @@ internal class Interop
 		public const int BN254 = 0;
 		public const int BLS12_381 = 5;
 
-		const int IoEcComp = 512; // fixed byte representation
 		public const int FR_UNIT_SIZE = 4;
 		public const int FP_UNIT_SIZE = 6;
 		public const int BLS_COMPILER_TIME_VAR_ADJ = 0;
@@ -32,7 +31,7 @@ internal class Interop
 			HashToCurve = 5, // irtf-cfrg-hash-to-curve
 		}
 
-		public const string dllName = "lib/bls384_256";
+		public const string dllName = "bls384_256";
 		[DllImport(dllName)] public static extern int blsInit(int curveType, int compiledTimeVar);
 		[DllImport(dllName)] public static extern int blsGetFrByteSize();
 		[DllImport(dllName)] public static extern int blsGetG1ByteSize();

diff --git a/...jCase.Cryptography.BLS/lib/bls384_256.dll → src/EdjCase.Cryptography.BLS/bls384_256.dll b/...jCase.Cryptography.BLS/lib/bls384_256.dll → src/EdjCase.Cryptography.BLS/bls384_256.dll
diff --git a/...ase.Cryptography.BLS/lib/bls384_256.dylib → ...EdjCase.Cryptography.BLS/bls384_256.dylib b/...ase.Cryptography.BLS/lib/bls384_256.dylib → ...EdjCase.Cryptography.BLS/bls384_256.dylib
diff --git a/...djCase.Cryptography.BLS/lib/bls384_256.so → src/EdjCase.Cryptography.BLS/bls384_256.so b/...djCase.Cryptography.BLS/lib/bls384_256.so → src/EdjCase.Cryptography.BLS/bls384_256.so