Refactor dotnet restore calls

tamasvajk · tamasvajk · commit 30095e317925 · 2024-01-24T13:56:40.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -677,9 +677,9 @@ private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions, out
             var projects = solutions.SelectMany(solution =>
                 {
                     logger.LogInfo($"Restoring solution {solution}...");
-                    var success = dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: true, out var restoredProjects, out var a);
-                    assetFiles.AddRange(a);
-                    return restoredProjects;
+                    var res = dotnet.Restore(new(solution, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
+                    assetFiles.AddRange(res.AssetsFilePaths);
+                    return res.RestoredProjects;
                 });
             assets = assetFiles;
             return projects;
@@ -697,8 +697,8 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
             Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, project =>
             {
                 logger.LogInfo($"Restoring project {project}...");
-                var success = dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: true, out var a, out var _);
-                assetFiles.AddRange(a);
+                var res = dotnet.Restore(new(project, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
+                assetFiles.AddRange(res.AssetsFilePaths);
             });
             assets = assetFiles;
         }
@@ -757,18 +757,18 @@ private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPa
                     return;
                 }
 
-                success = dotnet.RestoreProjectToDirectory(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: false, out var _, out var outputLines, pathToNugetConfig: nugetConfig);
-                if (!success)
+                var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig));
+                if (!res.Success)
                 {
-                    if (outputLines?.Any(s => s.Contains("NU1301")) == true)
+                    if (res.HasNugetPackageSourceError)
                     {
                         // Restore could not be completed because the listed source is unavailable. Try without the nuget.config:
-                        success = dotnet.RestoreProjectToDirectory(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: false, out var _, out var _, pathToNugetConfig: null, force: true);
+                        res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: null, ForceReevaluation: true));
                     }
 
                     // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.
 
-                    if (!success)
+                    if (!res.Success)
                     {
                         logger.LogInfo($"Failed to restore nuget package {package}");
                     }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -41,11 +41,11 @@ private void Info()
             }
         }
 
-        private string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching)
+        private string GetRestoreArgs(RestoreSettings restoreSettings)
         {
-            var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";
+            var args = $"restore --no-dependencies \"{restoreSettings.File}\" --packages \"{restoreSettings.PackageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";
 
-            if (forceDotnetRefAssemblyFetching)
+            if (restoreSettings.ForceDotnetRefAssemblyFetching)
             {
                 // Ugly hack: we set the TargetFrameworkRootPath and NetCoreTargetingPackRoot properties to an empty folder:
                 var path = ".empty";
@@ -58,46 +58,24 @@ private string GetRestoreArgs(string projectOrSolutionFile, string packageDirect
                 args += $" /p:TargetFrameworkRootPath=\"{path}\" /p:NetCoreTargetingPackRoot=\"{path}\"";
             }
 
-            return args;
-        }
-
-        private static IEnumerable<string> GetFirstGroupOnMatch(Regex regex, IEnumerable<string> lines) =>
-            lines
-                .Select(line => regex.Match(line))
-                .Where(match => match.Success)
-                .Select(match => match.Groups[1].Value);
-
-        private static IEnumerable<string> GetAssetsFilePaths(IEnumerable<string> lines) =>
-            GetFirstGroupOnMatch(AssetsFileRegex(), lines);
-
-        private static IEnumerable<string> GetRestoredProjects(IEnumerable<string> lines) =>
-            GetFirstGroupOnMatch(RestoredProjectRegex(), lines);
-
-        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> assets, out IList<string> outputLines, string? pathToNugetConfig = null, bool force = false)
-        {
-            var args = GetRestoreArgs(projectFile, packageDirectory, forceDotnetRefAssemblyFetching);
-            if (pathToNugetConfig != null)
+            if (restoreSettings.PathToNugetConfig != null)
             {
-                args += $" --configfile \"{pathToNugetConfig}\"";
+                args += $" --configfile \"{restoreSettings.PathToNugetConfig}\"";
             }
 
-            if (force)
+            if (restoreSettings.ForceReevaluation)
             {
                 args += " --force";
             }
 
-            var success = dotnetCliInvoker.RunCommand(args, out outputLines);
-            assets = success ? GetAssetsFilePaths(outputLines) : Array.Empty<string>();
-            return success;
+            return args;
         }
 
-        public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects, out IEnumerable<string> assets)
+        public RestoreResult Restore(RestoreSettings restoreSettings)
         {
-            var args = GetRestoreArgs(solutionFile, packageDirectory, forceDotnetRefAssemblyFetching);
+            var args = GetRestoreArgs(restoreSettings);
             var success = dotnetCliInvoker.RunCommand(args, out var output);
-            projects = success ? GetRestoredProjects(output) : Array.Empty<string>();
-            assets = success ? GetAssetsFilePaths(output) : Array.Empty<string>();
-            return success;
+            return new(success, output);
         }
 
         public bool New(string folder)
@@ -130,11 +108,5 @@ public bool Exec(string execArgs)
             var args = $"exec {execArgs}";
             return dotnetCliInvoker.RunCommand(args);
         }
-
-        [GeneratedRegex("Restored\\s+(.+\\.csproj)", RegexOptions.Compiled)]
-        private static partial Regex RestoredProjectRegex();
-
-        [GeneratedRegex("[Assets\\sfile\\shas\\snot\\schanged.\\sSkipping\\sassets\\sfile\\swriting.|Writing\\sassets\\sfile\\sto\\sdisk.]\\sPath:\\s(.+)", RegexOptions.Compiled)]
-        private static partial Regex AssetsFileRegex();
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -1,15 +1,43 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal interface IDotNet
     {
-        bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> assets, out IList<string> outputLines, string? pathToNugetConfig = null, bool force = false);
-        bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects, out IEnumerable<string> assets);
+        RestoreResult Restore(RestoreSettings restoreSettings);
         bool New(string folder);
         bool AddPackage(string folder, string package);
         IList<string> GetListedRuntimes();
         IList<string> GetListedSdks();
         bool Exec(string execArgs);
     }
+
+    internal record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? PathToNugetConfig = null, bool ForceReevaluation = false);
+
+    internal partial record class RestoreResult(bool Success, IList<string> Output)
+    {
+        private readonly Lazy<IEnumerable<string>> assetsFilePaths = new(() => GetFirstGroupOnMatch(AssetsFileRegex(), Output));
+        public IEnumerable<string> AssetsFilePaths => Success ? assetsFilePaths.Value : Array.Empty<string>();
+
+        private readonly Lazy<IEnumerable<string>> restoredProjects = new(() => GetFirstGroupOnMatch(RestoredProjectRegex(), Output));
+        public IEnumerable<string> RestoredProjects => Success ? restoredProjects.Value : Array.Empty<string>();
+
+        private readonly Lazy<bool> hasNugetPackageSourceError = new(() => Output.Any(s => s.Contains("NU1301")));
+        public bool HasNugetPackageSourceError => hasNugetPackageSourceError.Value;
+
+        private static IEnumerable<string> GetFirstGroupOnMatch(Regex regex, IEnumerable<string> lines) =>
+            lines
+                .Select(line => regex.Match(line))
+                .Where(match => match.Success)
+                .Select(match => match.Groups[1].Value);
+
+        [GeneratedRegex("Restored\\s+(.+\\.csproj)", RegexOptions.Compiled)]
+        private static partial Regex RestoredProjectRegex();
+
+        [GeneratedRegex("[Assets\\sfile\\shas\\snot\\schanged.\\sSkipping\\sassets\\sfile\\swriting.|Writing\\sassets\\sfile\\sto\\sdisk.]\\sPath:\\s(.+)", RegexOptions.Compiled)]
+        private static partial Regex AssetsFileRegex();
+    }
 }
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
@@ -101,7 +101,7 @@ public void TestDotnetRestoreProjectToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, out var assets, out var _);
+            dotnet.Restore(new("myproject.csproj", "mypackages", false));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -116,14 +116,14 @@ public void TestDotnetRestoreProjectToDirectory2()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, out var assets, out var _, pathToNugetConfig: "myconfig.config");
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, "myconfig.config"));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
             Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\"", lastArgs);
-            Assert.Equal(2, assets.Count());
-            Assert.Contains("/path/to/project.assets.json", assets);
-            Assert.Contains("/path/to/project2.assets.json", assets);
+            Assert.Equal(2, res.AssetsFilePaths.Count());
+            Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
+            Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
         }
 
         [Fact]
@@ -134,14 +134,14 @@ public void TestDotnetRestoreProjectToDirectory3()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, out var assets, out var _, pathToNugetConfig: "myconfig.config", force: true);
+            var res = dotnet.Restore(new("myproject.csproj", "mypackages", false, "myconfig.config", true));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
             Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\" --force", lastArgs);
-            Assert.Equal(2, assets.Count());
-            Assert.Contains("/path/to/project.assets.json", assets);
-            Assert.Contains("/path/to/project2.assets.json", assets);
+            Assert.Equal(2, res.AssetsFilePaths.Count());
+            Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
+            Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
         }
 
         [Fact]
@@ -152,17 +152,17 @@ public void TestDotnetRestoreSolutionToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects, out var assets);
+            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
             Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
-            Assert.Equal(2, projects.Count());
-            Assert.Contains("/path/to/project.csproj", projects);
-            Assert.Contains("/path/to/project2.csproj", projects);
-            Assert.Equal(2, assets.Count());
-            Assert.Contains("/path/to/project.assets.json", assets);
-            Assert.Contains("/path/to/project2.assets.json", assets);
+            Assert.Equal(2, res.RestoredProjects.Count());
+            Assert.Contains("/path/to/project.csproj", res.RestoredProjects);
+            Assert.Contains("/path/to/project2.csproj", res.RestoredProjects);
+            Assert.Equal(2, res.AssetsFilePaths.Count());
+            Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
+            Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
         }
 
         [Fact]
@@ -174,13 +174,13 @@ public void TestDotnetRestoreSolutionToDirectory2()
             dotnetCliInvoker.Success = false;
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects, out var assets);
+            var res = dotnet.Restore(new("mysolution.sln", "mypackages", false));
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
             Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
-            Assert.Empty(projects);
-            Assert.Empty(assets);
+            Assert.Empty(res.RestoredProjects);
+            Assert.Empty(res.AssetsFilePaths);
         }
 
         [Fact]
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
@@ -19,19 +19,7 @@ public DotNetStub(IList<string> runtimes, IList<string> sdks)
 
         public bool New(string folder) => true;
 
-        public bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> assets, out IList<string> outputLines, string? pathToNugetConfig = null, bool force = false)
-        {
-            assets = Array.Empty<string>();
-            outputLines = Array.Empty<string>();
-            return true;
-        }
-
-        public bool RestoreSolutionToDirectory(string solution, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects, out IEnumerable<string> assets)
-        {
-            projects = Array.Empty<string>();
-            assets = Array.Empty<string>();
-            return true;
-        }
+        public RestoreResult Restore(RestoreSettings restoreSettings) => new(true, Array.Empty<string>());
 
         public IList<string> GetListedRuntimes() => runtimes;
 

Original file line number	Diff line number	Diff line change
`@@ -677,9 +677,9 @@ private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions, out`
`677`	`677`	`var projects = solutions.SelectMany(solution =>`
`678`	`678`	`{`
`679`	`679`	`logger.LogInfo($"Restoring solution {solution}...");`
`680`		`- var success = dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: true, out var restoredProjects, out var a);`
`681`		`- assetFiles.AddRange(a);`
`682`		`- return restoredProjects;`
	`680`	`+ var res = dotnet.Restore(new(solution, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));`
	`681`	`+ assetFiles.AddRange(res.AssetsFilePaths);`
	`682`	`+ return res.RestoredProjects;`
`683`	`683`	`});`
`684`	`684`	`assets = assetFiles;`
`685`	`685`	`return projects;`
`@@ -697,8 +697,8 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin`
`697`	`697`	`Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, project =>`
`698`	`698`	`{`
`699`	`699`	`logger.LogInfo($"Restoring project {project}...");`
`700`		`- var success = dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: true, out var a, out var _);`
`701`		`- assetFiles.AddRange(a);`
	`700`	`+ var res = dotnet.Restore(new(project, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));`
	`701`	`+ assetFiles.AddRange(res.AssetsFilePaths);`
`702`	`702`	`});`
`703`	`703`	`assets = assetFiles;`
`704`	`704`	`}`
`@@ -757,18 +757,18 @@ private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPa`
`757`	`757`	`return;`
`758`	`758`	`}`
`759`	`759`
`760`		`- success = dotnet.RestoreProjectToDirectory(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: false, out var _, out var outputLines, pathToNugetConfig: nugetConfig);`
`761`		`- if (!success)`
	`760`	`+ var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig));`
	`761`	`+ if (!res.Success)`
`762`	`762`	`{`
`763`		`- if (outputLines?.Any(s => s.Contains("NU1301")) == true)`
	`763`	`+ if (res.HasNugetPackageSourceError)`
`764`	`764`	`{`
`765`	`765`	`// Restore could not be completed because the listed source is unavailable. Try without the nuget.config:`
`766`		`- success = dotnet.RestoreProjectToDirectory(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: false, out var _, out var _, pathToNugetConfig: null, force: true);`
	`766`	`+ res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: null, ForceReevaluation: true));`
`767`	`767`	`}`
`768`	`768`
`769`	`769`	`// TODO: the restore might fail, we could retry with a prerelease (- instead of *) version of the package.`
`770`	`770`
`771`		`- if (!success)`
	`771`	`+ if (!res.Success)`
`772`	`772`	`{`
`773`	`773`	`logger.LogInfo($"Failed to restore nuget package {package}");`
`774`	`774`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ private void Info()`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- private string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching)`
	`44`	`+ private string GetRestoreArgs(RestoreSettings restoreSettings)`
`45`	`45`	`{`
`46`		`- var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";`
	`46`	`+ var args = $"restore --no-dependencies \"{restoreSettings.File}\" --packages \"{restoreSettings.PackageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";`
`47`	`47`
`48`		`- if (forceDotnetRefAssemblyFetching)`
	`48`	`+ if (restoreSettings.ForceDotnetRefAssemblyFetching)`
`49`	`49`	`{`
`50`	`50`	`// Ugly hack: we set the TargetFrameworkRootPath and NetCoreTargetingPackRoot properties to an empty folder:`
`51`	`51`	`var path = ".empty";`
`@@ -58,46 +58,24 @@ private string GetRestoreArgs(string projectOrSolutionFile, string packageDirect`
`58`	`58`	`args += $" /p:TargetFrameworkRootPath=\"{path}\" /p:NetCoreTargetingPackRoot=\"{path}\"";`
`59`	`59`	`}`
`60`	`60`
`61`		`- return args;`
`62`		`- }`
`63`		`-`
`64`		`- private static IEnumerable<string> GetFirstGroupOnMatch(Regex regex, IEnumerable<string> lines) =>`
`65`		`- lines`
`66`		`- .Select(line => regex.Match(line))`
`67`		`- .Where(match => match.Success)`
`68`		`- .Select(match => match.Groups[1].Value);`
`69`		`-`
`70`		`- private static IEnumerable<string> GetAssetsFilePaths(IEnumerable<string> lines) =>`
`71`		`- GetFirstGroupOnMatch(AssetsFileRegex(), lines);`
`72`		`-`
`73`		`- private static IEnumerable<string> GetRestoredProjects(IEnumerable<string> lines) =>`
`74`		`- GetFirstGroupOnMatch(RestoredProjectRegex(), lines);`
`75`		`-`
`76`		`- public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> assets, out IList<string> outputLines, string? pathToNugetConfig = null, bool force = false)`
`77`		`- {`
`78`		`- var args = GetRestoreArgs(projectFile, packageDirectory, forceDotnetRefAssemblyFetching);`
`79`		`- if (pathToNugetConfig != null)`
	`61`	`+ if (restoreSettings.PathToNugetConfig != null)`
`80`	`62`	`{`
`81`		`- args += $" --configfile \"{pathToNugetConfig}\"";`
	`63`	`+ args += $" --configfile \"{restoreSettings.PathToNugetConfig}\"";`
`82`	`64`	`}`
`83`	`65`
`84`		`- if (force)`
	`66`	`+ if (restoreSettings.ForceReevaluation)`
`85`	`67`	`{`
`86`	`68`	`args += " --force";`
`87`	`69`	`}`
`88`	`70`
`89`		`- var success = dotnetCliInvoker.RunCommand(args, out outputLines);`
`90`		`- assets = success ? GetAssetsFilePaths(outputLines) : Array.Empty<string>();`
`91`		`- return success;`
	`71`	`+ return args;`
`92`	`72`	`}`
`93`	`73`
`94`		`- public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects, out IEnumerable<string> assets)`
	`74`	`+ public RestoreResult Restore(RestoreSettings restoreSettings)`
`95`	`75`	`{`
`96`		`- var args = GetRestoreArgs(solutionFile, packageDirectory, forceDotnetRefAssemblyFetching);`
	`76`	`+ var args = GetRestoreArgs(restoreSettings);`
`97`	`77`	`var success = dotnetCliInvoker.RunCommand(args, out var output);`
`98`		`- projects = success ? GetRestoredProjects(output) : Array.Empty<string>();`
`99`		`- assets = success ? GetAssetsFilePaths(output) : Array.Empty<string>();`
`100`		`- return success;`
	`78`	`+ return new(success, output);`
`101`	`79`	`}`
`102`	`80`
`103`	`81`	`public bool New(string folder)`
`@@ -130,11 +108,5 @@ public bool Exec(string execArgs)`
`130`	`108`	`var args = $"exec {execArgs}";`
`131`	`109`	`return dotnetCliInvoker.RunCommand(args);`
`132`	`110`	`}`
`133`		`-`
`134`		`- [GeneratedRegex("Restored\\s+(.+\\.csproj)", RegexOptions.Compiled)]`
`135`		`- private static partial Regex RestoredProjectRegex();`
`136`		`-`
`137`		`- [GeneratedRegex("[Assets\\sfile\\shas\\snot\\schanged.\\sSkipping\\sassets\\sfile\\swriting.\|Writing\\sassets\\sfile\\sto\\sdisk.]\\sPath:\\s(.+)", RegexOptions.Compiled)]`
`138`		`- private static partial Regex AssetsFileRegex();`
`139`	`111`	`}`
`140`	`112`	`}`