A little cleanup to ensure a project file base path (#232)

phmonte · Dec 18, 2023 · 4e44107 · 4e44107
1 parent 1b0c85b
commit 4e44107
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,7 @@
+# 5.0.2
+
+- Ensures paths being passed to Roslyn in Buildalyzer.Workspaces are absolute (#232, thanks @tjchester).
+
 # 5.0.1
 
 - Added support for additional files on `GetWorkspace()` (#231, thanks @Corniel).

diff --git a/src/Buildalyzer.Workspaces/AnalyzerResultExtensions.cs b/src/Buildalyzer.Workspaces/AnalyzerResultExtensions.cs
@@ -287,7 +287,7 @@ private static IEnumerable<DocumentInfo> GetAdditionalDocuments(IAnalyzerResult
  {
  string projectDirectory = Path.GetDirectoryName(analyzerResult.ProjectFilePath);
  string[] additionalFiles = analyzerResult.AdditionalFiles ?? Array.Empty<string>();
- return GetDocuments(additionalFiles.Select(x => Path.Combine(projectDirectory, x)), projectId);
+ return GetDocuments(additionalFiles.Select(x => Path.Combine(projectDirectory!, x)), projectId);
  }
 
  private static IEnumerable<MetadataReference> GetMetadataReferences(IAnalyzerResult analyzerResult) =>
@@ -300,8 +300,9 @@ private static IEnumerable<AnalyzerReference> GetAnalyzerReferences(IAnalyzerRes
  {
  IAnalyzerAssemblyLoader loader = workspace.Services.GetRequiredService<IAnalyzerService>().GetLoader();
 
- return analyzerResult.AnalyzerReferences?.Where(x => File.Exists(Path.GetFullPath(x)))
- .Select(x => new AnalyzerFileReference(Path.GetFullPath(x), loader))
+ string projectDirectory = Path.GetDirectoryName(analyzerResult.ProjectFilePath);
+ return analyzerResult.AnalyzerReferences?.Where(x => File.Exists(Path.GetFullPath(x, projectDirectory!)))
+ .Select(x => new AnalyzerFileReference(Path.GetFullPath(x, projectDirectory!), loader))
  ?? (IEnumerable<AnalyzerReference>)Array.Empty<AnalyzerReference>();
  }