将ffmpeg依赖移动到编译流程中，不再使用ci进行文件移动

CHKZL · Jul 6, 2024 · a12943c · a12943c
1 parent 9794cdb
commit a12943c
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 165 deletions.
diff --git a/.github/workflows/DDTV_Dev.yml b/.github/workflows/DDTV_Dev.yml
@@ -149,13 +149,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Server/build_output/Static
 
-
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Server/build_output/Plugins/Plugins/ffmpeg
-          copy Server/Plugins/ffmpeg/ffmpeg.exe Server/build_output/Plugins/Plugins/ffmpeg/ffmpeg.exe
-
       - name: Move all files to bin folder and create shortcut (Linux or macOS)
         if: runner.os != 'Windows'
         run: |       
@@ -301,12 +294,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Desktop/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Desktop\\build_output\\Plugins\\ffmpeg
-          copy Desktop\\Plugins\\ffmpeg\\ffmpeg.exe Desktop\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
-
       - name: Copy VLC (Windows)  
         if: runner.os == 'Windows'
         shell: pwsh
@@ -430,12 +417,6 @@ jobs:
 
       - name: Copy Static folder to build_output
         run: cp -r Static Client/build_output/Static
-
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Client\\build_output\\Plugins\\ffmpeg
-          copy Client\\Plugins\\ffmpeg\\ffmpeg.exe Client\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
 
       - name: Move all files to bin folder and create shortcut (Windows)  
         if: runner.os == 'Windows'

diff --git a/.github/workflows/DDTV_Release.yml b/.github/workflows/DDTV_Release.yml
@@ -149,12 +149,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Server/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Server/build_output/Plugins/Plugins/ffmpeg
-          copy Server/Plugins/ffmpeg/ffmpeg.exe Server/build_output/Plugins/Plugins/ffmpeg/ffmpeg.exe
-
       - name: Move all files to bin folder and create shortcut (Linux or macOS)
         if: runner.os != 'Windows'
         run: |       
@@ -313,12 +307,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Desktop/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Desktop\\build_output\\Plugins\\ffmpeg
-          copy Desktop\\Plugins\\ffmpeg\\ffmpeg.exe Desktop\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
-
       - name: Copy VLC (Windows)  
         if: runner.os == 'Windows'
         shell: pwsh
@@ -442,12 +430,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Client/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Client\\build_output\\Plugins\\ffmpeg
-          copy Client\\Plugins\\ffmpeg\\ffmpeg.exe Client\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
-          
       - name: Move all files to bin folder and create shortcut (Windows)  
         if: runner.os == 'Windows'
         shell: pwsh

diff --git a/.github/workflows/DDTV_Test.yml b/.github/workflows/DDTV_Test.yml
@@ -149,13 +149,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Server/build_output/Static
 
-
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Server/build_output/Plugins/Plugins/ffmpeg
-          copy Server/Plugins/ffmpeg/ffmpeg.exe Server/build_output/Plugins/Plugins/ffmpeg/ffmpeg.exe
-
       - name: Move all files to bin folder and create shortcut (Linux or macOS)
         if: runner.os != 'Windows'
         run: |       
@@ -301,12 +294,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Desktop/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Desktop\\build_output\\Plugins\\ffmpeg
-          copy Desktop\\Plugins\\ffmpeg\\ffmpeg.exe Desktop\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
-
       - name: Copy VLC (Windows)  
         if: runner.os == 'Windows'
         shell: pwsh
@@ -431,12 +418,6 @@ jobs:
       - name: Copy Static folder to build_output
         run: cp -r Static Client/build_output/Static
 
-      - name: Copy ffmpeg.exe (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          mkdir Client\\build_output\\Plugins\\ffmpeg
-          copy Client\\Plugins\\ffmpeg\\ffmpeg.exe Client\\build_output\\Plugins\\ffmpeg\\ffmpeg.exe
-          
       - name: Move all files to bin folder and create shortcut (Windows)  
         if: runner.os == 'Windows'
         shell: pwsh

diff --git a/Client/Client.csproj b/Client/Client.csproj
@@ -1,34 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Globals">
-    <WebView2LoaderPreference>Static</WebView2LoaderPreference>
-  </PropertyGroup>
+	<PropertyGroup Label="Globals">
+		<WebView2LoaderPreference>Static</WebView2LoaderPreference>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWPF>true</UseWPF>
-    <ApplicationIcon>DDTV.ico</ApplicationIcon>
-    <Version>5.0.0.0</Version>
-    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
-    <BaseOutputPath>bin\</BaseOutputPath>
-    <StartupObject>Client.App</StartupObject>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UseWPF>true</UseWPF>
+		<ApplicationIcon>DDTV.ico</ApplicationIcon>
+		<Version>5.0.0.0</Version>
+		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+		<BaseOutputPath>bin\</BaseOutputPath>
+		<StartupObject>Client.App</StartupObject>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="DDTV.ico" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="DDTV.ico" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+		<None Update="plugins\ffmpeg\ffmpeg.exe">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2420.47" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2420.47" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Server\Server.csproj" />
-    <ProjectReference Include="..\Core\Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Server\Server.csproj" />
+		<ProjectReference Include="..\Core\Core.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/Desktop/Desktop.csproj b/Desktop/Desktop.csproj
@@ -1,91 +1,97 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup Label="Globals">
-    <WebView2LoaderPreference>Static</WebView2LoaderPreference>
-  </PropertyGroup>
+	<PropertyGroup Label="Globals">
+		<WebView2LoaderPreference>Static</WebView2LoaderPreference>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
-	<UseWindowsForms>true</UseWindowsForms>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWPF>true</UseWPF>
-    <PackageIcon>DDTV.ico</PackageIcon>
-    <Platforms>AnyCPU</Platforms>
-    <ApplicationIcon>Assets\DDTV.ico</ApplicationIcon>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows7.0</TargetFramework>
+		<UseWindowsForms>true</UseWindowsForms>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UseWPF>true</UseWPF>
+		<PackageIcon>DDTV.ico</PackageIcon>
+		<Platforms>AnyCPU</Platforms>
+		<ApplicationIcon>Assets\DDTV.ico</ApplicationIcon>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Assets\DDTV.ico" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="Assets\DDTV.ico" />
+	</ItemGroup>
 
-  <ItemGroup>
-	  <Resource Include="Assets\DDTV.ico">
-		  <Pack>True</Pack>
-		  <PackagePath>\</PackagePath>
-		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Resource>
-  </ItemGroup>
+	<ItemGroup>
+		<Resource Include="Assets\DDTV.ico">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Resource>
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="LibVLCSharp.WPF" Version="3.8.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
-    <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.5" />
-    <PackageReference Include="Notification.Wpf" Version="8.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
-    <PackageReference Include="WPF-UI" Version="3.0.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="LibVLCSharp.WPF" Version="3.8.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+		<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.5" />
+		<PackageReference Include="Notification.Wpf" Version="8.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
+		<PackageReference Include="WPF-UI" Version="3.0.4" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Server\Server.csproj" />
-    <ProjectReference Include="..\Core\Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Server\Server.csproj" />
+		<ProjectReference Include="..\Core\Core.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Control\CardControl.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Views\Windows\AddRoom.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+		<Compile Update="Views\Control\CardControl.xaml.cs">
+			<SubType>Code</SubType>
+		</Compile>
+		<Compile Update="Views\Windows\AddRoom.xaml.cs">
+			<SubType>Code</SubType>
+		</Compile>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Resource\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Resource\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Update="DDTV.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Update="DDTV.ico">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 
-  <ItemGroup>
-    <Page Update="Views\Pages\ToolsPage.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
+	</ItemGroup>
+	<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+		<None Update="plugins\ffmpeg\ffmpeg.exe">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Page Update="Views\Pages\ToolsPage.xaml">
+			<SubType>Designer</SubType>
+		</Page>
+	</ItemGroup>
 
 </Project>
diff --git a/Server/Server.csproj b/Server/Server.csproj
@@ -10,6 +10,7 @@
 		<ApplicationIcon>resource\DDTV.ico</ApplicationIcon>
 		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>true</AppendRuntimeIdentifierToOutputPath>
+		<UserSecretsId>c7792cf9-4736-4012-b71e-6b5c7d889774</UserSecretsId>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -25,7 +26,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="resource\DDTV.ico" />
+		<Content Include="resource\DDTV.ico" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+		<None Update="plugins\ffmpeg\ffmpeg.exe">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -39,12 +45,12 @@
 
 
 	<ItemGroup>
-	  <None Update="resource\DDTV.ico">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	  <None Update="resource\not_found.png">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
+		<None Update="resource\DDTV.ico">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="resource\not_found.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>