Merge branch 'fix-missing-sdk-error' into main

Author: 0xced

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased][Unreleased]
+
+* Fixed a bug where `nugraph` could fail with `InvalidProjectFileException` if run from a directory containing a `Directory.Build.props` file.
+
 ## [0.5.0][0.5.0] - 2025-06-27
 
 * Links to nuget.org are now added only for packages which are actually available on the NuGet Gallery. Previously, a non-working link to nuget.org would be added for packages coming from private NuGet feeds.

src/nugraph/DotnetSdk.cs

@@ -31,7 +31,12 @@ public static class DotnetSdk
     public static IReadOnlyCollection<NuGetFramework> GetSupportedTargetFrameworks()
     {
         using var xmlReader = new XElement("Project", new XAttribute("Sdk", "Microsoft.NET.Sdk")).CreateReader();
-        var project = new Project(xmlReader);
+        var globalProperties = new Dictionary<string, string>
+        {
+            ["ImportDirectoryBuildProps"] = "false",
+            ["ImportDirectoryBuildTargets"] = "false",
+        };
+        var project = new Project(xmlReader, globalProperties, toolsVersion: null);
 
         var supportedTargetFrameworks = project.Items
             .Where(e => e.ItemType == "SupportedTargetFramework")

src/nugraph/TemporaryProject.cs

@@ -12,30 +12,43 @@
 using NuGet.Frameworks;
 using NuGet.Packaging.Core;
 using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
 using static NuGet.Frameworks.FrameworkConstants.CommonFrameworks;
 
 namespace nugraph;
 
-internal sealed class TemporaryProject : IDisposable
+public sealed class TemporaryProject : IDisposable
 {
     private static readonly Encoding Utf8NoBom = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
 
     private readonly DirectoryInfo _directory;
 
-    private TemporaryProject(PackageIdentity package, NuGetFramework targetFramework)
+    public TemporaryProject() : this(package: null, targetFramework: null)
+    {
+    }
+
+    private TemporaryProject(PackageIdentity? package, NuGetFramework? targetFramework)
     {
         _directory = new DirectoryInfo(Path.Combine(Path.GetTempPath(), "nugraph", Path.GetRandomFileName().Replace(".", "", StringComparison.OrdinalIgnoreCase)));
         _directory.Create();
 
-        var project = new XElement("Project", new XAttribute("Sdk", "Microsoft.NET.Sdk"),
-            new XElement("PropertyGroup",
-                new XElement("TargetFramework", targetFramework.GetShortFolderName())),
-            new XElement("ItemGroup",
+        var project = new XElement("Project", new XAttribute("Sdk", "Microsoft.NET.Sdk"));
+
+        if (targetFramework != null)
+        {
+            project.Add(new XElement("PropertyGroup",
+                new XElement("TargetFramework", targetFramework.GetShortFolderName())));
+        }
+
+        if (package != null)
+        {
+            project.Add(new XElement("ItemGroup",
                 new XElement("PackageReference", new XAttribute("Include", package.Id), new XAttribute("Version", package.Version?.ToString() ?? "*"))));
+        }
 
         File = new FileInfo(Path.Combine(_directory.FullName, "project.csproj"));
-        Package = package;
-        TargetFramework = targetFramework;
+        Package = package ?? new PackageIdentity("", new NuGetVersion(0, 0, 0));
+        TargetFramework = targetFramework ?? NuGetFramework.UnsupportedFramework;
 
         var settings = new XmlWriterSettings { Indent = true, OmitXmlDeclaration = true, Encoding = Utf8NoBom };
         using var xmlWriter = XmlWriter.Create(File.FullName, settings);
@@ -44,6 +57,8 @@ private TemporaryProject(PackageIdentity package, NuGetFramework targetFramework
 
     public static async Task<TemporaryProject> CreateAsync(PackageIdentity package, NuGetFramework? targetFramework, DirectoryInfo? sdk, ISettings nugetSettings, ILogger logger, CancellationToken cancellationToken)
     {
+        ArgumentNullException.ThrowIfNull(logger, nameof(logger));
+
         var (identity, resolvedTargetFramework) = await ResolveAsync(package, targetFramework, sdk, nugetSettings, logger, cancellationToken);
         return new TemporaryProject(identity, resolvedTargetFramework);
     }

tests/nugraph.Tests/NugraphTests.cs

@@ -56,6 +56,28 @@ public async Task Package_Serilog()
                                 """);
     }
 
+    [Test]
+    public async Task Package_Serilog_WorkingDirectoryUsingArcadeSdk()
+    {
+        using var project = new TemporaryProject();
+        var workingDirectory = project.File.Directory!.FullName;
+        // lang=xml
+        const string directoryBuildProps =
+            """
+            <Project>
+              <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+            </Project>
+            """;
+        await File.WriteAllTextAsync(Path.Combine(workingDirectory, "Directory.Build.props"), directoryBuildProps);
+
+        var result = await nugraph.RunAsync(["Serilog"], workingDirectory: workingDirectory);
+
+        result.Should().Match(stdOutPattern:"https://mermaid.live/view#pako:*", stdErrPattern: """
+                                Generating dependency graph for Serilog
+                                Generating dependency graph for Serilog *
+                                """);
+    }
+
     [Test]
     public async Task Package_Serilog_430_net60()
     {