Merge pull request #21016 from michaelnebel/csharp/slnx

C#: Support `.slnx.` solution files.

Author: michaelnebel

csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs

@@ -182,8 +182,16 @@ protected Autobuilder(IBuildActions actions, TAutobuildOptions options, Diagnost
                 if (ret is not null)
                     return ret;
 
+                // Then look for language specific solution files, e.g. `.slnx` files
+                if (Options.Language.SolutionExtension is string solutionExtension)
+                {
+                    ret = FindFiles(solutionExtension, f => new Solution<TAutobuildOptions>(this, f, false))?.ToList();
+                    if (ret is not null)
+                        return ret;
+                }
+
                 // Finally look for language specific project files, e.g. `.csproj` files
-                ret = FindFiles(this.Options.Language.ProjectExtension, f => new Project<TAutobuildOptions>(this, f))?.ToList();
+                ret = FindFiles(Options.Language.ProjectExtension, f => new Project<TAutobuildOptions>(this, f))?.ToList();
                 return ret ?? new List<IProjectOrSolution>();
             });
 

csharp/autobuilder/Semmle.Autobuild.Shared/BUILD.bazel

@@ -12,5 +12,6 @@ codeql_csharp_library(
     deps = [
         "//csharp/extractor/Semmle.Util",
         "@paket.main//microsoft.build",
+        "@paket.main//microsoft.visualstudio.solutionpersistence",
     ],
 )

csharp/autobuilder/Semmle.Autobuild.Shared/Solution.cs

@@ -4,12 +4,11 @@
 using System.Linq;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Exceptions;
-using Semmle.Util.Logging;
 
 namespace Semmle.Autobuild.Shared
 {
     /// <summary>
-    /// A solution file, extension .sln.
+    /// A solution file, extension .sln or .slnx.
     /// </summary>
     public interface ISolution : IProjectOrSolution
     {

csharp/autobuilder/Semmle.Autobuild.Shared/paket.references

@@ -1 +1,2 @@
 Microsoft.Build
+Microsoft.VisualStudio.SolutionPersistence

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel

@@ -15,6 +15,7 @@ codeql_csharp_library(
     deps = [
         "//csharp/extractor/Semmle.Extraction.CSharp",
         "//csharp/extractor/Semmle.Util",
+        "@paket.main//microsoft.visualstudio.solutionpersistence",
         "@paket.main//newtonsoft.json",
         "@paket.main//nuget.versioning",
     ],

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs

@@ -37,7 +37,7 @@ public FileProvider(DirectoryInfo sourceDir, ILogger logger)
             smallNonBinary = new Lazy<string[]>(() => ReturnAndLogFiles("small non-binary", SelectSmallFiles(allNonBinary.Value).SelectFileNames().ToArray()));
             sources = new Lazy<string[]>(() => SelectTextFileNamesByExtension("source", ".cs"));
             projects = new Lazy<string[]>(() => SelectTextFileNamesByExtension("project", ".csproj"));
-            solutions = new Lazy<string[]>(() => SelectTextFileNamesByExtension("solution", ".sln"));
+            solutions = new Lazy<string[]>(() => SelectTextFileNamesByExtension("solution", ".sln", ".slnx"));
             dlls = new Lazy<string[]>(() => SelectBinaryFileNamesByExtension("DLL", ".dll"));
             nugetConfigs = new Lazy<string[]>(() => SelectTextFileNamesByName("nuget.config"));
             globalJsons = new Lazy<string[]>(() => SelectTextFileNamesByName("global.json"));

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SolutionFile.cs

@@ -6,7 +6,7 @@
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     /// <summary>
-    /// Access data in a .sln file.
+    /// Access data in a .sln or .slnx file.
     /// </summary>
     internal class SolutionFile
     {
@@ -17,7 +17,7 @@ internal class SolutionFile
         /// <summary>
         /// Read the file.
         /// </summary>
-        /// <param name="filename">The filename of the .sln.</param>
+        /// <param name="filename">The filename of the .sln or .slnx.</param>
         public SolutionFile(string filename)
         {
             // SolutionFile.Parse() expects a rooted path.
@@ -26,7 +26,7 @@ public SolutionFile(string filename)
         }
 
         /// <summary>
-        /// Projects directly included in the .sln file.
+        /// Projects directly included in the .sln or .slnx file.
         /// </summary>
         public IEnumerable<string> MsBuildProjects
         {

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/paket.references

@@ -1,2 +1,3 @@
+Microsoft.VisualStudio.SolutionPersistence
 Newtonsoft.Json
 NuGet.Versioning

csharp/extractor/Semmle.Util/Language.cs

@@ -2,21 +2,27 @@
 {
     public sealed class Language
     {
-        public static Language Cpp { get; } = new Language(".vcxproj", "CPP");
-        public static Language CSharp { get; } = new Language(".csproj", "CSHARP");
+        public static Language Cpp { get; } = new Language("CPP", ".vcxproj");
+        public static Language CSharp { get; } = new Language("CSHARP", ".csproj", ".slnx");
 
         public bool ProjectFileHasThisLanguage(string path) =>
             System.IO.Path.GetExtension(path) == ProjectExtension;
 
         public string ProjectExtension { get; }
+        public string? SolutionExtension { get; }
         public string UpperCaseName { get; }
 
-        private Language(string extension, string name)
+        private Language(string name, string projectExtension)
         {
-            ProjectExtension = extension;
+            ProjectExtension = projectExtension;
             UpperCaseName = name;
         }
 
+        private Language(string name, string projectExtension, string solutionExtension) : this(name, projectExtension)
+        {
+            SolutionExtension = solutionExtension;
+        }
+
         public override string ToString() =>
             ProjectExtension == Cpp.ProjectExtension ? "C/C++" : "C#";
     }

csharp/paket.dependencies

@@ -15,3 +15,4 @@ nuget Microsoft.NET.Test.Sdk
 nuget Microsoft.CodeAnalysis.CSharp 5.0.0
 nuget Microsoft.CodeAnalysis 5.0.0
 nuget Microsoft.Build 18.0.2
+nuget Microsoft.VisualStudio.SolutionPersistence