try/finally block, package versions, method visibility, accept filepaths with spaces

Author: ellahathaway

src/SourceBuild/content/eng/Versions.props

@@ -26,5 +26,7 @@
     <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltArtifactsVersion>
     <!-- msbuild -->
     <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
+    <!-- command-line-api -->
+    <SystemCommandLineVersion>2.0.0-beta4.24069.1</SystemCommandLineVersion>
   </PropertyGroup>
 </Project>

src/SourceBuild/content/eng/tools/BinaryToolKit/BinaryToolKit.csproj

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="CheckRuntimeVersion">
 
-  <Import Project="Versions.props"/>
-
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -16,9 +14,9 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(RuntimeVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(RuntimeVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(RuntimeVersion)" />
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
   </ItemGroup>
 

src/SourceBuild/content/eng/tools/BinaryToolKit/DetectBinaries.cs

@@ -9,8 +9,8 @@ namespace BinaryToolKit;
 
 public static class DetectBinaries
 {
-    private static readonly string Utf16Marker = "UTF-16";
-    private static readonly int ChunkSize = 4096;
+    private const string Utf16Marker = "UTF-16";
+    private const int ChunkSize = 4096;
     private static readonly Regex GitCleanRegex = new Regex(@"Would (remove|skip)( repository)? (.*)");
 
     public static async Task<List<string>> ExecuteAsync(string targetDirectory)
@@ -40,32 +40,40 @@ private static async Task<List<string>> GetIgnoredPatternsAsync(string targetDir
     {
         string gitDirectory = Path.Combine(targetDirectory, ".git");
         bool isGitRepo = Directory.Exists(gitDirectory);
-        if (!isGitRepo)
+
+        try 
         {
-            // Configure a fake git repo to use so that we can run git clean -ndx
-            await ExecuteProcessAsync("git", $"-C {targetDirectory} init -q");
-        }
+            if (!isGitRepo)
+            {
+                // Configure a fake git repo to use so that we can run git clean -ndx
+                await ExecuteProcessAsync("git", $"-C {targetDirectory} init -q");
+            }
 
-        await ExecuteProcessAsync("git", $"-C {targetDirectory} config --global safe.directory {targetDirectory}");
+            await ExecuteProcessAsync("git", $"-C {targetDirectory} config --global safe.directory {targetDirectory}");
 
-        string output = await ExecuteProcessAsync("git", $"-C {targetDirectory} clean -ndx");
+            string output = await ExecuteProcessAsync("git", $"-C {targetDirectory} clean -ndx");
 
-        List<string> ignoredPaths = output.Split(Environment.NewLine)
-            .Select(line => GitCleanRegex.Match(line))
-            .Where(match => match.Success)
-            .Select(match => match.Groups[3].Value)
-            .ToList();
+            List<string> ignoredPaths = output.Split(Environment.NewLine)
+                .Select(line => GitCleanRegex.Match(line))
+                .Where(match => match.Success)
+                .Select(match => match.Groups[3].Value)
+                .ToList();
 
-        if (!isGitRepo)
-        {
-            Directory.Delete(gitDirectory, true);
+            if (isGitRepo)
+            {
+                ignoredPaths.Add(".git");
+            }
+
+            return ignoredPaths;
         }
-        else
+        finally
         {
-            ignoredPaths.Add(".git");
+            // Ensure .git directory is deleted if it wasn't originally a git repo
+            if (!isGitRepo && Directory.Exists(gitDirectory))
+            {
+                Directory.Delete(gitDirectory, true);
+            }
         }
-
-        return ignoredPaths;
     }
 
     private static async Task<bool> IsBinaryAsync(string filePath)
@@ -96,7 +104,7 @@ private static async Task<bool> IsNotUTF16Async(string file)
     {
         if (Environment.OSVersion.Platform == PlatformID.Unix)
         {
-            string output = await ExecuteProcessAsync("file", file);
+            string output = await ExecuteProcessAsync("file",  $"\"{file}\"");
             output = output.Split(":")[1].Trim();
 
             if (output.Contains(Utf16Marker))

src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs

@@ -9,7 +9,7 @@ namespace BinaryToolKit;
 
 public class Program
 {
-    static async Task<int> Main(string[] args)
+    public static async Task<int> Main(string[] args)
     {
         CliArgument<string> TargetDirectory = new("target-directory")
         {
@@ -73,4 +73,4 @@ await binaryTool.ExecuteAsync(
 
         return await rootCommand.Parse(args).InvokeAsync();
     }
-}
+}