C#: Add tests cases for parsing dotnet restore output to find assets.json files.

Author: michaelnebel

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

@@ -43,9 +43,11 @@ private static IDotNet MakeDotnet(IDotNetCliInvoker dotnetCliInvoker) =>
         private static IList<string> MakeDotnetRestoreOutput() =>
             new List<string> {
                 "  Determining projects to restore...",
+                "  Writing assets file to disk. Path: /path/to/project.assets.json",
                 "  Restored /path/to/project.csproj (in 1.23 sec).",
                 "  Other output...",
                 "  More output...",
+                "  Assets file has not changed. Skipping assets file writing. Path: /path/to/project2.assets.json",
                 "  Restored /path/to/project2.csproj (in 4.56 sec).",
                 "  Other output...",
                 };
@@ -99,7 +101,7 @@ public void TestDotnetRestoreProjectToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false);
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, out var assets);
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -110,15 +112,18 @@ public void TestDotnetRestoreProjectToDirectory1()
         public void TestDotnetRestoreProjectToDirectory2()
         {
             // Setup
-            var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
+            var dotnetCliInvoker = new DotNetCliInvokerStub(MakeDotnetRestoreOutput());
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, "myconfig.config");
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, out var assets, "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);
         }
 
         [Fact]
@@ -129,14 +134,17 @@ public void TestDotnetRestoreSolutionToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects);
+            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects, out var assets);
 
             // 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);
         }
 
         [Fact]
@@ -148,12 +156,13 @@ public void TestDotnetRestoreSolutionToDirectory2()
             dotnetCliInvoker.Success = false;
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects);
+            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects, out var assets);
 
             // 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);
         }
 
         [Fact]

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

@@ -19,11 +19,16 @@ public DotNetStub(IList<string> runtimes, IList<string> sdks)
 
         public bool New(string folder) => true;
 
-        public bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, string? pathToNugetConfig = null) => true;
+        public bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> assets, string? pathToNugetConfig = null)
+        {
+            assets = Array.Empty<string>();
+            return true;
+        }
 
-        public bool RestoreSolutionToDirectory(string solution, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects)
+        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;
         }