fixing spacing + optimizing nugets

microsoft · Oct 26, 2020 · ec4e414 · ec4e414
1 parent 8b88a71
commit ec4e414
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/Sarif.Multitool.Library/MergeCommand.cs b/src/Sarif.Multitool.Library/MergeCommand.cs
@@ -54,7 +54,7 @@ public int Run(MergeOptions mergeOptions)
 
  var logLoadOptions = new BoundedChannelOptions(1000)
  {
- SingleWriter = true, 
+ SingleWriter = true,
  SingleReader = false,
  };
  _logLoadChannel = Channel.CreateBounded<string>(logLoadOptions);
@@ -170,10 +170,10 @@ private async Task<bool> MergeSarifLogsAsync()
  if (!_ruleIdToRunsMap.TryGetValue(key, out Run splitRun))
  {
  IEqualityComparer<Run> comparer = Microsoft.CodeAnalysis.Sarif.Run.ValueComparer;
- splitRun = _ruleIdToRunsMap[key] = new Run() 
- { 
+ splitRun = _ruleIdToRunsMap[key] = new Run()
+ {
  Tool = emptyRun.Tool,
- Results = new List<Result>() 
+ Results = new List<Result>()
  };
  splitLog.Runs.Add(splitRun);
  }
@@ -230,7 +230,7 @@ private void ProcessInputSarifLog(string filePath)
  {
  new FixupVisitor().VisitSarifLog(sarifLog);
  }
- 
+
  _mergeLogsChannel.Writer.WriteAsync(sarifLog);
  Interlocked.Decrement(ref _filesToProcessCount);
 
@@ -257,7 +257,7 @@ private async Task<bool> FindFilesAsync()
  {
  directory = @".\";
  }
- 
+
  foreach (string file in Directory.EnumerateFiles(directory, filter, searchOption))
  {
  Interlocked.Increment(ref _filesToProcessCount);
@@ -293,7 +293,7 @@ public override Run VisitRun(Run node)
  {
  _run = node;
  _run = base.VisitRun(node);
- 
+
  _run.Invocations = null;
  _run.Artifacts = null;
  _run.Tool.Driver = new ToolComponent
@@ -309,7 +309,7 @@ public override Run VisitRun(Run node)
 
  public override Result VisitResult(Result node)
  {
- node.RuleIndex = -1; 
+ node.RuleIndex = -1;
  return base.VisitResult(node);
  }
 

diff --git a/src/Sarif.Multitool/Sarif.Multitool.csproj b/src/Sarif.Multitool/Sarif.Multitool.csproj
@@ -40,10 +40,6 @@
 
  <ItemGroup>
  <PackageReference Include="CommandLineParser" Version="2.7.82" />
- <PackageReference Include="Microsoft.Json.Pointer" Version="1.1.2" />
- <PackageReference Include="Microsoft.Json.Schema" Version="1.1.2" />
- <PackageReference Include="Microsoft.Json.Schema.Validation" Version="1.1.2" />
- <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Test.UnitTests.Sarif.Multitool.Library/MergeCommandTests.cs b/src/Test.UnitTests.Sarif.Multitool.Library/MergeCommandTests.cs
@@ -37,7 +37,7 @@ public MergeCommandTests(ITestOutputHelper outputHelper) : base(outputHelper) {
  [Trait(TestTraits.Bug, "https://github.com/microsoft/sarif-sdk/issues/1592")]
  public void MergeCommand_WhenThereAreNoInputFiles_ProducesEmptyRunsArray()
  {
-// RunTest("NoInputFiles.sarif");
+ RunTest("NoInputFiles.sarif");
  }
 
  protected override string ConstructTestOutputFromInputResource(string inputResourceName, object parameter)