Merge pull request #13689 from tamasvajk/fix-conflict

C#: Add missing parameter to interface

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp.Standalone/DotNet.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Semmle.Util;
@@ -7,7 +7,7 @@ namespace Semmle.BuildAnalyser
 {
     internal interface IDotNet
     {
-        bool RestoreToDirectory(string project, string directory);
+        bool RestoreToDirectory(string project, string directory, string? pathToNugetConfig = null);
         bool New(string folder);
         bool AddPackage(string folder, string package);
         public IList<string> GetListedRuntimes();

csharp/extractor/Semmle.Extraction.Tests/Runtime.cs

@@ -15,7 +15,7 @@ internal class DotNetStub : IDotNet
 
         public bool New(string folder) => true;
 
-        public bool RestoreToDirectory(string project, string directory) => true;
+        public bool RestoreToDirectory(string project, string directory, string? pathToNugetConfig = null) => true;
 
         public IList<string> GetListedRuntimes() => runtimes;
     }