From 146a11d7da1c1686044690f66a6b4f4835ae57d1 Mon Sep 17 00:00:00 2001
From: FaulMit <48646918+FaulMit@users.noreply.github.com>
Date: Sun, 2 Aug 2026 18:47:21 +0200
Subject: [PATCH] Include FFmpeg in first clean publish

---
 src/Captail/Captail.csproj | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Captail/Captail.csproj b/src/Captail/Captail.csproj
index 049f697..fbd530c 100644
--- a/src/Captail/Captail.csproj
+++ b/src/Captail/Captail.csproj
@@ -62,6 +62,28 @@
     <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\..\tools\AcquireFfmpegRuntime.ps1&quot;" />
   </Target>
 
+  <Target Name="CopyFfmpegRuntimeToBuild"
+          AfterTargets="Build"
+          DependsOnTargets="AcquireFfmpegRuntime">
+    <ItemGroup>
+      <_FfmpegBuildFile Include="$(FfmpegRuntimeRoot)\**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_FfmpegBuildFile)"
+          DestinationFiles="@(_FfmpegBuildFile->'$(OutDir)ffmpeg\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true" />
+  </Target>
+
+  <Target Name="CopyFfmpegRuntimeToPublish"
+          AfterTargets="Publish"
+          DependsOnTargets="AcquireFfmpegRuntime">
+    <ItemGroup>
+      <_FfmpegPublishFile Include="$(FfmpegRuntimeRoot)\**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_FfmpegPublishFile)"
+          DestinationFiles="@(_FfmpegPublishFile->'$(PublishDir)ffmpeg\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true" />
+  </Target>
+
   <Target Name="BuildObsBridge" BeforeTargets="Build">
     <Exec Condition="!Exists('$(ObsBridgeBuild)\CaptailObsBridge.sln')"
           Command="cmake -S &quot;$(ObsBridgeSource)&quot; -B &quot;$(ObsBridgeBuild)&quot; -G &quot;Visual Studio 17 2022&quot; -A x64" />
@@ -110,12 +132,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-    <Content Include="$(FfmpegRuntimeRoot)\**\*">
-      <Link>ffmpeg\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
   </ItemGroup>
 
 </Project>