From ecfe6ec84b41114d8b2646e32ff7b26e7d24430b Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Thu, 4 Dec 2025 10:00:00 +0100
Subject: [PATCH] Fix SDK requiring two builds

---
 util/RustSdk/RustSdk.csproj | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/util/RustSdk/RustSdk.csproj b/util/RustSdk/RustSdk.csproj
index 071d134142..6a747748bb 100644
--- a/util/RustSdk/RustSdk.csproj
+++ b/util/RustSdk/RustSdk.csproj
@@ -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>