mirror of
https://github.com/bitwarden/server
synced 2025-12-06 00:03:34 +00:00
Fix SDK requiring two builds
This commit is contained in:
@@ -10,22 +10,6 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="rust/target/release/libsdk*.dylib">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/osx-arm64/native/libsdk.dylib</Link>
|
||||
</Content>
|
||||
<Content Include="./rust/target/release/libsdk*.so">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/linux-x64/native/libsdk.so</Link>
|
||||
</Content>
|
||||
<Content Include="./rust/target/release/libsdk*.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/windows-x64/native/libsdk.dll</Link>
|
||||
</Content>
|
||||
|
||||
<!-- This is a work around because this file is compiled by the PreBuild event below, and won't
|
||||
always be detected -->
|
||||
<Compile Remove="NativeMethods.g.cs" />
|
||||
@@ -35,6 +19,23 @@
|
||||
<Exec Command="cargo build --release" WorkingDirectory="$(ProjectDir)/rust" />
|
||||
<ItemGroup>
|
||||
<Compile Include="NativeMethods.g.cs" />
|
||||
|
||||
<!-- Include native libraries after they've been built -->
|
||||
<Content Include="rust/target/release/libsdk*.dylib">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/osx-arm64/native/libsdk.dylib</Link>
|
||||
</Content>
|
||||
<Content Include="./rust/target/release/libsdk*.so">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/linux-x64/native/libsdk.so</Link>
|
||||
</Content>
|
||||
<Content Include="./rust/target/release/libsdk*.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<PackageCopyToOutput>true</PackageCopyToOutput>
|
||||
<Link>runtimes/windows-x64/native/libsdk.dll</Link>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user