Add mkvalidator.exe to test project

MikeMoolenaar · Jan 2, 2024 · 220a76b · 220a76b
1 parent 30db10c
commit 220a76b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/MatroskaLib/MatroskaLib.Test/Helpers/MkvValidator.cs b/MatroskaLib/MatroskaLib.Test/Helpers/MkvValidator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 
 namespace MatroskaLib.Test.Helpers;
@@ -29,8 +30,10 @@ public static void Validate(string filePath)
         p.StartInfo.UseShellExecute = false;
         p.StartInfo.RedirectStandardError = true;
         p.StartInfo.CreateNoWindow = true;
-        p.StartInfo.FileName = "mkvalidator";
-        p.StartInfo.Arguments = "\"" + filePath + "\"";
+        p.StartInfo.FileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 
+            "mkvalidator.exe" : 
+            "mkvalidator";
+        p.StartInfo.Arguments = $"\"{filePath}\"";
         p.Start();
         output = p.StandardError.ReadToEnd();
         p.Close();

diff --git a/MatroskaLib/MatroskaLib.Test/MatroskaLib.Test.csproj b/MatroskaLib/MatroskaLib.Test/MatroskaLib.Test.csproj
@@ -57,5 +57,10 @@
   <ItemGroup>
     <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="mkvalidator.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
 
 </Project>
diff --git a/MatroskaLib/MatroskaLib.Test/mkvalidator.exe b/MatroskaLib/MatroskaLib.Test/mkvalidator.exe
diff --git a/...efaultTrackChanger/MkvDefaultTrackChanger.WinForms/MkvDefaultTrackChanger.WinForms.csproj b/...efaultTrackChanger/MkvDefaultTrackChanger.WinForms/MkvDefaultTrackChanger.WinForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-Windows</TargetFramework>
     <RootNamespace>MkvDefaultTrackChanger.WinForms</RootNamespace>
   </PropertyGroup>