Merge pull request #26 from endjin/feature/add-slnx-support

Author: patriksvensson

src/Covenant.Core/Covenant.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Covenant.CycloneDx/Covenant.CycloneDx.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Covenant.Spdx/Covenant.Spdx.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Covenant/Analysis/Dotnet/DotnetAnalyzer.cs

@@ -1,6 +1,8 @@
 using System.Security.Cryptography;
+using System.Threading;
 using Buildalyzer;
-using Microsoft.Build.Construction;
+using Microsoft.VisualStudio.SolutionPersistence;
+using Microsoft.VisualStudio.SolutionPersistence.Serializer;
 
 namespace Covenant.Analysis.Dotnet;
 
@@ -16,9 +18,10 @@ internal class DotnetAnalyzer : Analyzer
     private readonly DotnetAssetFileReader _assetFileReader;
     private readonly AnalyzerManager _analyzerManager;
     private bool _enabled = true;
+    private static readonly string[] _solutionExtensions = new[] { ".sln", ".slnx" };
 
     public override bool Enabled => _enabled;
-    public override string[] Patterns { get; } = new[] { "**/*.sln" };
+    public override string[] Patterns { get; } = _solutionExtensions.Select(e => $"**/*{e}").ToArray();
 
     public DotnetAnalyzer(
         IFileSystem fileSystem, IEnvironment environment, IGlobber globber)
@@ -53,9 +56,10 @@ public override bool ShouldTraverse(DirectoryPath path)
 
     public override bool CanHandle(AnalysisContext context, FilePath path)
     {
-        var isSolution = path.GetExtension()?.Equals(".sln", StringComparison.OrdinalIgnoreCase) ?? false;
-        var isCsProject = path.GetExtension()?.Equals(".csproj", StringComparison.OrdinalIgnoreCase) ?? false;
-        var isFsProject = path.GetExtension()?.Equals(".fsproj", StringComparison.OrdinalIgnoreCase) ?? false;
+        var extension = path.GetExtension() ?? string.Empty;
+        var isSolution = _solutionExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase);
+        var isCsProject = extension.Equals(".csproj", StringComparison.OrdinalIgnoreCase);
+        var isFsProject = extension.Equals(".fsproj", StringComparison.OrdinalIgnoreCase);
         return isSolution || isCsProject || isFsProject;
     }
 
@@ -64,22 +68,23 @@ public override void Analyze(AnalysisContext context, FilePath path)
         path = path.MakeAbsolute(_environment);
         var extension = path.GetExtension() ?? string.Empty;
 
-        if (extension.Equals(".sln", StringComparison.OrdinalIgnoreCase))
+        if (_solutionExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
         {
             // Analyze solution
-            var solution = SolutionFile.Parse(path.FullPath);
+            ISolutionSerializer? serializer = SolutionSerializers.GetSerializerByMoniker(path.FullPath);
+            if (serializer is null)
+            {
+                return;
+            }
 
-            // Collect all projects
-            var projects = solution.ProjectsInOrder.Where(
-                csproj => csproj.ProjectType != SolutionProjectType.SolutionFolder
-                    && csproj.ProjectType != SolutionProjectType.Unknown);
+            var solution = serializer.OpenAsync(path.FullPath, CancellationToken.None).Result;
 
             // Add all components in all projects
             var assetFiles = new List<AssetFile>();
-            foreach (var csproj in projects)
+            foreach (var csproj in solution.SolutionProjects)
             {
-                var (version, copyright, analyzerResult) = PerformDesignTimeBuild(context, csproj.AbsolutePath);
-                var assetsFile = ReadAssetFile(context, csproj.AbsolutePath, analyzerResult);
+                var (version, copyright, analyzerResult) = PerformDesignTimeBuild(context, csproj.FilePath);
+                var assetsFile = ReadAssetFile(context, csproj.FilePath, analyzerResult);
                 if (assetsFile != null)
                 {
                     assetFiles.Add(assetsFile);

src/Covenant/Covenant.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <PackageId>Covenant</PackageId>
@@ -35,6 +35,7 @@
   <ItemGroup>
     <PackageReference Include="Buildalyzer" Version="6.0.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NuGet.Packaging" Version="6.9.1" />
     <PackageReference Include="Rosetta" Version="0.5.0" />