update

CHKZL · Jun 23, 2024 · 18bac83 · 18bac83
1 parent 1e9fa7c
commit 18bac83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/.github/workflows/DDTV_Test.yml b/.github/workflows/DDTV_Test.yml
@@ -150,15 +150,11 @@ jobs:
         run: cp -r Static Server/build_output/Static
 
 
-      - name: Move ffmpeg (Windows)  
-        if: runner.os == 'Windows'
-        shell: pwsh
+      - name: Copy ffmpeg.exe (Windows)
+        if: matrix.os == 'windows-latest'
         run: |
-          $source = "Server/build_output/Plugins/*"
-          $destination = "Server/build_output/Plugins"
-    
-          New-Item -ItemType Directory -Force -Path $destination
-          Move-Item -Path $source -Destination $destination -Force
+          mkdir Server\\build_output\\Plugins\\ffmpeg
+          copy Server\\Plugins\\ffmpeg\\ffmpeg.exe Server\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
 
       - name: Move all files to bin folder and create shortcut (Linux or macOS)
         if: runner.os != 'Windows'

diff --git a/Server/Server.csproj b/Server/Server.csproj
@@ -19,23 +19,11 @@
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 	</ItemGroup>
 
-	<!--包含ffmpeg.exe -->
-	<ItemGroup Condition="'@(Contain-&gt;Contains($(RuntimeIdentifier)))' == 'True'">
-		<None Update="Plugins\ffmpeg\ffmpeg.exe">
-			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-		</None>
-	</ItemGroup>
 
 	<ItemGroup>
 		<Contain Include="win-x86;win-x64" />
 	</ItemGroup>
 
-	<!-- 不包含ffmpeg.exe -->
-	<ItemGroup Condition="'@(Exclud-&gt;Contains($(RuntimeIdentifier)))' == 'True'">
-		<None Update="Plugins\ffmpeg\ffmpeg.exe">
-			<CopyToPublishDirectory>Never</CopyToPublishDirectory>
-		</None>
-	</ItemGroup>
 	<ItemGroup>
 	  <Content Include="resource\DDTV.ico" />
 	</ItemGroup>
@@ -51,7 +39,7 @@
 
 
 	<ItemGroup>
-	  <None Update="PluginsPlugins\ffmpeg\ffmpeg.exe">
+	  <None Update="Plugins\ffmpeg\ffmpeg.exe">
 	    <CopyToOutputDirectory>Never</CopyToOutputDirectory>
 	  </None>
 	  <None Update="resource\DDTV.ico">