Ensure sln load uses project absolute paths (#78772)

dibarbet · web-flow · commit 729bd2ff3011 · 2025-06-02T12:07:57.000-07:00
fixes issue found by integration tests in dotnet/vscode-csharp#8331 The new solution parser API gives us relative paths, but contracts in the project system require absolute paths ``` 2025-05-29 20:42:14.888 [info] [Error - 8:42:14 PM] [solution/open] [LSP] System.InvalidOperationException: Unexpected false - file LanguageServerProjectLoader.cs line 195 at Microsoft.CodeAnalysis.Contract.Fail(String message, Int32 lineNumber, String filePath) in /_/src/Dependencies/Contracts/Contract.cs:line 161 at Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.LanguageServerProjectLoader.ReloadProjectAsync(ProjectToLoad projectToLoad, ToastErrorReporter toastErrorReporter, BuildHostProcessManager buildHostProcessManager, CancellationToken cancellationToken) in /_/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectLoader.cs:line 195 at Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.LanguageServerProjectLoader.<>c.<<ReloadProjectsAsync>b__16_0>d.MoveNext() in /_/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectLoader.cs:line 158 --- End of stack trace from previous location --- at Microsoft.CodeAnalysis.Shared.Utilities.ProducerConsumer`1.<>c__DisplayClass11_0`3.<<RunParallelChannelAsync>b__2>d.MoveNext() in /_/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/ProducerConsumer.cs:line 256 --- End of stack trace from previous location --- at System.Threading.Tasks.Parallel.<>c__57`1.<<ForEachAsync>b__57_0>d.MoveNext() --- End of stack trace from previous location --- at Microsoft.CodeAnalysis.Shared.Utilities.ProducerConsumer`1.<>c__14`2.<<RunChannelAsync>b__14_3>d.MoveNext() in /_/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/ProducerConsumer.cs:line 385 --- End of stack trace from previous location --- at Microsoft.CodeAnalysis.Shared.Utilities.ProducerConsumer`1.PerformActionAndCloseWriterAsync[TArgs](Func`3 action, TArgs args, ChannelWriter`1 writer, CancellationToken cancellationToken) in /_/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/ProducerConsumer.cs:line 402 at Microsoft.CodeAnalysis.Shared.Utilities.ProducerConsumer`1.RunChannelAsync[TArgs,TResult](ProducerConsumerOptions options, Func`4 produceItems, Func`4 consumeItems, TArgs args, CancellationToken cancellationToken) in /_/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/ProducerConsumer.cs:line 362 at Microsoft.CodeAnalysis.Shared.Utilities.ProducerConsumer`1.RunParallelAsync[TSource,TArgs](IAsyncEnumerable`1 source, Func`5 produceItems, TArgs args, CancellationToken cancellationToken) in /_/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/ProducerConsumer.cs:line 229 at Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.LanguageServerProjectLoader.ReloadProjectsAsync(ImmutableSegmentedList`1 projectPathsToLoadOrReload, CancellationToken cancellationToken) in /_/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectLoader.cs:line 153 at Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.LanguageServerProjectLoader.ReloadProjectsAsync(ImmutableSegmentedList`1 projectPathsToLoadOrReload, CancellationToken cancellationToken) in /_/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectLoader.cs:line 179 at Microsoft.CodeAnalysis.Threading.AsyncBatchingWorkQueue`1.<>c__DisplayClass2_0.<<Convert>b__0>d.MoveNext() in /_/src/Dependencies/Threading/AsyncBatchingWorkQueue`1.cs:line 40 --- End of stack trace from previous location --- at Microsoft.CodeAnalysis.Threading.AsyncBatchingWorkQueue`2.ProcessNextBatchAsync() in /_/src/Dependencies/Threading/AsyncBatchingWorkQueue`2.cs:line 274 at Microsoft.CodeAnalysis.Threading.AsyncBatchingWorkQueue`2.<AddWork>g__ContinueAfterDelayAsync|16_1(Task lastTask) in /_/src/Dependencies/Threading/AsyncBatchingWorkQueue`2.cs:line 221 at Microsoft.CodeAnalysis.Threading.AsyncBatchingWorkQueue`2.WaitUntilCurrentBatchCompletesAsync() in /_/src/Dependencies/Threading/AsyncBatchingWorkQueue`2.cs:line 238 at Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.LanguageServerProjectSystem.OpenSolutionAsync(String solutionFilePath) in /_/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs:line 65 at Microsoft.CommonLanguageServerProtocol.Framework.QueueItem`1.StartRequestAsync[TRequest,TResponse](TRequest request, TRequestContext context, IMethodHandler handler, String language, CancellationToken cancellationToken) in /_/src/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/QueueItem.cs:line 203 ```
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs
@@ -57,7 +57,7 @@ public async Task OpenSolutionAsync(string solutionFilePath)
         _logger.LogInformation(string.Format(LanguageServerResources.Loading_0, solutionFilePath));
         ProjectFactory.SolutionPath = solutionFilePath;
 
-        var (_, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, CancellationToken.None);
+        var (_, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, DiagnosticReportingMode.Throw, CancellationToken.None);
         foreach (var (path, guid) in projects)
         {
             await BeginLoadingProjectAsync(path, guid);
diff --git a/src/Workspaces/MSBuild/Core/MSBuild/MSBuildProjectLoader.cs b/src/Workspaces/MSBuild/Core/MSBuild/MSBuildProjectLoader.cs
@@ -167,20 +167,20 @@ public async Task<SolutionInfo> LoadSolutionInfoAsync(
             throw new ArgumentNullException(nameof(solutionFilePath));
         }
 
-        var (absoluteSolutionPath, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, _pathResolver, cancellationToken).ConfigureAwait(false);
+        var reportingMode = GetReportingModeForUnrecognizedProjects();
+
+        var reportingOptions = new DiagnosticReportingOptions(
+            onPathFailure: reportingMode,
+            onLoaderFailure: reportingMode);
+
+        var (absoluteSolutionPath, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, _pathResolver, reportingMode, cancellationToken).ConfigureAwait(false);
         var projectPaths = projects.SelectAsArray(p => p.ProjectPath);
 
         using (_dataGuard.DisposableWait(cancellationToken))
         {
             SetSolutionProperties(absoluteSolutionPath);
         }
 
-        var reportingMode = GetReportingModeForUnrecognizedProjects();
-
-        var reportingOptions = new DiagnosticReportingOptions(
-            onPathFailure: reportingMode,
-            onLoaderFailure: reportingMode);
-
         var buildHostProcessManager = new BuildHostProcessManager(Properties, loggerFactory: _loggerFactory);
         await using var _ = buildHostProcessManager.ConfigureAwait(false);
 
diff --git a/src/Workspaces/MSBuild/Core/MSBuild/SolutionFileReader.cs b/src/Workspaces/MSBuild/Core/MSBuild/SolutionFileReader.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -14,12 +14,12 @@ namespace Microsoft.CodeAnalysis.MSBuild;
 
 internal partial class SolutionFileReader
 {
-    public static Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, CancellationToken cancellationToken)
+    public static Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)
     {
-        return ReadSolutionFileAsync(solutionFilePath, new PathResolver(diagnosticReporter: null), cancellationToken);
+        return ReadSolutionFileAsync(solutionFilePath, new PathResolver(diagnosticReporter: null), diagnosticReportingMode, cancellationToken);
     }
 
-    public static async Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, CancellationToken cancellationToken)
+    public static async Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)
     {
         Contract.ThrowIfFalse(pathResolver.TryGetAbsoluteSolutionPath(solutionFilePath, baseDirectory: Directory.GetCurrentDirectory(), DiagnosticReportingMode.Throw, out var absoluteSolutionPath));
 
@@ -31,7 +31,7 @@ internal partial class SolutionFileReader
             throw new Exception(string.Format(WorkspaceMSBuildResources.Failed_to_load_solution_filter_0, solutionFilePath));
         }
 
-        var projects = await TryReadSolutionFileAsync(absoluteSolutionPath, pathResolver, projectFilter, cancellationToken).ConfigureAwait(false);
+        var projects = await TryReadSolutionFileAsync(absoluteSolutionPath, pathResolver, projectFilter, diagnosticReportingMode, cancellationToken).ConfigureAwait(false);
         if (!projects.HasValue)
         {
             throw new Exception(string.Format(WorkspaceMSBuildResources.Failed_to_load_solution_0, absoluteSolutionPath));
@@ -40,7 +40,7 @@ internal partial class SolutionFileReader
         return (absoluteSolutionPath, projects.Value);
     }
 
-    private static async Task<ImmutableArray<(string ProjectPath, string ProjectGuid)>?> TryReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, ImmutableHashSet<string> projectFilter, CancellationToken cancellationToken)
+    private static async Task<ImmutableArray<(string ProjectPath, string ProjectGuid)>?> TryReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, ImmutableHashSet<string> projectFilter, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)
     {
         var serializer = SolutionSerializers.GetSerializerByMoniker(solutionFilePath);
         if (serializer == null)
@@ -57,17 +57,21 @@ internal partial class SolutionFileReader
         var builder = ImmutableArray.CreateBuilder<(string ProjectPath, string ProjectGuid)>();
         foreach (var projectModel in solutionModel.SolutionProjects)
         {
-            // If we are filtering based on a solution filter, then we need to verify the project is included.
-            if (!projectFilter.IsEmpty)
+            // If we didn't get an absolute path skip the file.  The solution may have an invalid project in it,
+            // but we don't want to throw on that here.  The path resolver will throw / report a diagnostic if it couldn't resolve the path.
+            if (pathResolver.TryGetAbsoluteProjectPath(projectModel.FilePath, baseDirectory, diagnosticReportingMode, out var absoluteProjectPath))
             {
-                Contract.ThrowIfFalse(pathResolver.TryGetAbsoluteProjectPath(projectModel.FilePath, baseDirectory, DiagnosticReportingMode.Throw, out var absoluteProjectPath));
-                if (!projectFilter.Contains(absoluteProjectPath))
+                // If we are filtering based on a solution filter, then we need to verify the project is included.
+                if (!projectFilter.IsEmpty)
                 {
-                    continue;
+                    if (!projectFilter.Contains(absoluteProjectPath))
+                    {
+                        continue;
+                    }
                 }
-            }
 
-            builder.Add((projectModel.FilePath, projectModel.Id.ToString()));
+                builder.Add((absoluteProjectPath, projectModel.Id.ToString()));
+            }
         }
 
         return builder.ToImmutable();
diff --git a/src/Workspaces/MSBuild/Test/Resources/SolutionFiles/EmptyLineBetweenProjectBlock.sln b/src/Workspaces/MSBuild/Test/Resources/SolutionFiles/EmptyLineBetweenProjectBlock.sln
@@ -1,26 +1,26 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ConsoleApplication2", "ConsoleApplication2\ConsoleApplication2.vbproj", "{378156D6-840C-47CC-A465-639548363FF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpProject", "CSharpProject\CSharpProject.csproj", "{686DD036-86AA-443E-8A10-DDB43266A8C4}"
 EndProject
 
 # Comment to test the handling of the parsing of .sln file with comments b/n project block
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{BF7B38CE-F5CA-4467-A3CF-D1796CE2BAC0}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VisualBasicProject", "VisualBasicProject\VisualBasicProject.vbproj", "{AC25ECDA-DE94-4FCF-A688-EB3A2BE3670C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{378156D6-840C-47CC-A465-639548363FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{378156D6-840C-47CC-A465-639548363FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{378156D6-840C-47CC-A465-639548363FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{378156D6-840C-47CC-A465-639548363FF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF7B38CE-F5CA-4467-A3CF-D1796CE2BAC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF7B38CE-F5CA-4467-A3CF-D1796CE2BAC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF7B38CE-F5CA-4467-A3CF-D1796CE2BAC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF7B38CE-F5CA-4467-A3CF-D1796CE2BAC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{686DD036-86AA-443E-8A10-DDB43266A8C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{686DD036-86AA-443E-8A10-DDB43266A8C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{686DD036-86AA-443E-8A10-DDB43266A8C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{686DD036-86AA-443E-8A10-DDB43266A8C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC25ECDA-DE94-4FCF-A688-EB3A2BE3670C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC25ECDA-DE94-4FCF-A688-EB3A2BE3670C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC25ECDA-DE94-4FCF-A688-EB3A2BE3670C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC25ECDA-DE94-4FCF-A688-EB3A2BE3670C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs b/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs
@@ -1002,13 +1002,11 @@ public async Task TestOpenSolution_WithLockedFile_LoadsWithEmptyText()
     public async Task TestOpenSolution_WithInvalidProjectPath_SkipTrue_SucceedsWithFailureEvent()
     {
         // when skipped we should see a diagnostic for the invalid project
-
-        CreateFiles(GetSimpleCSharpSolutionFiles()
-            .WithFile(@"TestSolution.sln", Resources.SolutionFiles.InvalidProjectPath));
-
         var solutionFilePath = GetSolutionFileName(@"TestSolution.sln");
+        CreateFiles(GetSimpleCSharpProjectFiles()
+            .WithFile(solutionFilePath, Resources.SolutionFiles.InvalidProjectPath));
 
-        using var workspace = CreateMSBuildWorkspace(throwOnWorkspaceFailed: false);
+        using var workspace = CreateMSBuildWorkspace(throwOnWorkspaceFailed: false, skipUnrecognizedProjects: true);
         var solution = await workspace.OpenSolutionAsync(solutionFilePath);
         Assert.Single(workspace.Diagnostics);
     }
@@ -1050,7 +1048,7 @@ public async Task TestOpenSolution_WithNonExistentProject_SkipTrue_SucceedsWithF
             .WithFile(@"TestSolution.sln", Resources.SolutionFiles.NonExistentProject));
         var solutionFilePath = GetSolutionFileName(@"TestSolution.sln");
 
-        using var workspace = CreateMSBuildWorkspace(throwOnWorkspaceFailed: false);
+        using var workspace = CreateMSBuildWorkspace(throwOnWorkspaceFailed: false, skipUnrecognizedProjects: true);
         var solution = await workspace.OpenSolutionAsync(solutionFilePath);
 
         Assert.Single(workspace.Diagnostics);
@@ -2653,11 +2651,12 @@ public async Task TestOpenSolution_SolutionFileHasEmptyLinesAndWhitespaceOnlyLin
     [WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/531543")]
     public async Task TestOpenSolution_SolutionFileHasEmptyLineBetweenProjectBlock()
     {
-        var files = new FileSet(
-            (@"TestSolution.sln", Resources.SolutionFiles.EmptyLineBetweenProjectBlock));
+        var solutionFilePath = GetSolutionFileName("TestSolution.sln");
+        var files = GetSimpleCSharpProjectFiles()
+            .Concat(GetSimpleVisualBasicProjectFiles())
+            .Concat([(solutionFilePath, Resources.SolutionFiles.EmptyLineBetweenProjectBlock)]);
 
         CreateFiles(files);
-        var solutionFilePath = GetSolutionFileName("TestSolution.sln");
 
         using var workspace = CreateMSBuildWorkspace(throwOnWorkspaceFailed: false);
         var solution = await workspace.OpenSolutionAsync(solutionFilePath);
diff --git a/src/Workspaces/MSBuild/Test/WorkspaceTestBase.cs b/src/Workspaces/MSBuild/Test/WorkspaceTestBase.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.UnitTests.TestFiles;
 using Roslyn.Test.Utilities;
@@ -84,18 +85,26 @@ protected void CreateCSharpFiles()
     }
 
     protected static FileSet GetSimpleCSharpSolutionFiles()
+    {
+        return GetSimpleCSharpProjectFiles().WithFile(@"TestSolution.sln", Resources.SolutionFiles.CSharp);
+    }
+
+    protected static FileSet GetSimpleCSharpProjectFiles()
     {
         return new FileSet(
-            (@"TestSolution.sln", Resources.SolutionFiles.CSharp),
             (@"CSharpProject\CSharpProject.csproj", Resources.ProjectFiles.CSharp.CSharpProject),
             (@"CSharpProject\CSharpClass.cs", Resources.SourceFiles.CSharp.CSharpClass),
             (@"CSharpProject\Properties\AssemblyInfo.cs", Resources.SourceFiles.CSharp.AssemblyInfo));
     }
 
     protected static FileSet GetSimpleVisualBasicSolutionFiles()
+    {
+        return GetSimpleVisualBasicProjectFiles().WithFile(@"TestSolution.sln", Resources.SolutionFiles.VisualBasic);
+    }
+
+    protected static FileSet GetSimpleVisualBasicProjectFiles()
     {
         return new FileSet(
-            (@"TestSolution.sln", Resources.SolutionFiles.VisualBasic),
             (@"VisualBasicProject\VisualBasicProject.vbproj", Resources.ProjectFiles.VisualBasic.VisualBasicProject),
             (@"VisualBasicProject\VisualBasicClass.vb", Resources.SourceFiles.VisualBasic.VisualBasicClass),
             (@"VisualBasicProject\My Project\Application.Designer.vb", Resources.SourceFiles.VisualBasic.Application_Designer),

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public async Task OpenSolutionAsync(string solutionFilePath)`
`57`	`57`	`_logger.LogInformation(string.Format(LanguageServerResources.Loading_0, solutionFilePath));`
`58`	`58`	`ProjectFactory.SolutionPath = solutionFilePath;`
`59`	`59`
`60`		`- var (_, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, CancellationToken.None);`
	`60`	`+ var (_, projects) = await SolutionFileReader.ReadSolutionFileAsync(solutionFilePath, DiagnosticReportingMode.Throw, CancellationToken.None);`
`61`	`61`	`foreach (var (path, guid) in projects)`
`62`	`62`	`{`
`63`	`63`	`await BeginLoadingProjectAsync(path, guid);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Licensed to the .NET Foundation under one or more agreements.`
	`1`	`+// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`@@ -14,12 +14,12 @@ namespace Microsoft.CodeAnalysis.MSBuild;`
`14`	`14`
`15`	`15`	`internal partial class SolutionFileReader`
`16`	`16`	`{`
`17`		`- public static Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, CancellationToken cancellationToken)`
	`17`	`+ public static Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)`
`18`	`18`	`{`
`19`		`- return ReadSolutionFileAsync(solutionFilePath, new PathResolver(diagnosticReporter: null), cancellationToken);`
	`19`	`+ return ReadSolutionFileAsync(solutionFilePath, new PathResolver(diagnosticReporter: null), diagnosticReportingMode, cancellationToken);`
`20`	`20`	`}`
`21`	`21`
`22`		`- public static async Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, CancellationToken cancellationToken)`
	`22`	`+ public static async Task<(string AbsoluteSolutionPath, ImmutableArray<(string ProjectPath, string ProjectGuid)> Projects)> ReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)`
`23`	`23`	`{`
`24`	`24`	`Contract.ThrowIfFalse(pathResolver.TryGetAbsoluteSolutionPath(solutionFilePath, baseDirectory: Directory.GetCurrentDirectory(), DiagnosticReportingMode.Throw, out var absoluteSolutionPath));`
`25`	`25`
`@@ -31,7 +31,7 @@ internal partial class SolutionFileReader`
`31`	`31`	`throw new Exception(string.Format(WorkspaceMSBuildResources.Failed_to_load_solution_filter_0, solutionFilePath));`
`32`	`32`	`}`
`33`	`33`
`34`		`- var projects = await TryReadSolutionFileAsync(absoluteSolutionPath, pathResolver, projectFilter, cancellationToken).ConfigureAwait(false);`
	`34`	`+ var projects = await TryReadSolutionFileAsync(absoluteSolutionPath, pathResolver, projectFilter, diagnosticReportingMode, cancellationToken).ConfigureAwait(false);`
`35`	`35`	`if (!projects.HasValue)`
`36`	`36`	`{`
`37`	`37`	`throw new Exception(string.Format(WorkspaceMSBuildResources.Failed_to_load_solution_0, absoluteSolutionPath));`
`@@ -40,7 +40,7 @@ internal partial class SolutionFileReader`
`40`	`40`	`return (absoluteSolutionPath, projects.Value);`
`41`	`41`	`}`
`42`	`42`
`43`		`- private static async Task<ImmutableArray<(string ProjectPath, string ProjectGuid)>?> TryReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, ImmutableHashSet<string> projectFilter, CancellationToken cancellationToken)`
	`43`	`+ private static async Task<ImmutableArray<(string ProjectPath, string ProjectGuid)>?> TryReadSolutionFileAsync(string solutionFilePath, PathResolver pathResolver, ImmutableHashSet<string> projectFilter, DiagnosticReportingMode diagnosticReportingMode, CancellationToken cancellationToken)`
`44`	`44`	`{`
`45`	`45`	`var serializer = SolutionSerializers.GetSerializerByMoniker(solutionFilePath);`
`46`	`46`	`if (serializer == null)`
`@@ -57,17 +57,21 @@ internal partial class SolutionFileReader`
`57`	`57`	`var builder = ImmutableArray.CreateBuilder<(string ProjectPath, string ProjectGuid)>();`
`58`	`58`	`foreach (var projectModel in solutionModel.SolutionProjects)`
`59`	`59`	`{`
`60`		`- // If we are filtering based on a solution filter, then we need to verify the project is included.`
`61`		`- if (!projectFilter.IsEmpty)`
	`60`	`+ // If we didn't get an absolute path skip the file. The solution may have an invalid project in it,`
	`61`	`+ // but we don't want to throw on that here. The path resolver will throw / report a diagnostic if it couldn't resolve the path.`
	`62`	`+ if (pathResolver.TryGetAbsoluteProjectPath(projectModel.FilePath, baseDirectory, diagnosticReportingMode, out var absoluteProjectPath))`
`62`	`63`	`{`
`63`		`- Contract.ThrowIfFalse(pathResolver.TryGetAbsoluteProjectPath(projectModel.FilePath, baseDirectory, DiagnosticReportingMode.Throw, out var absoluteProjectPath));`
`64`		`- if (!projectFilter.Contains(absoluteProjectPath))`
	`64`	`+ // If we are filtering based on a solution filter, then we need to verify the project is included.`
	`65`	`+ if (!projectFilter.IsEmpty)`
`65`	`66`	`{`
`66`		`- continue;`
	`67`	`+ if (!projectFilter.Contains(absoluteProjectPath))`
	`68`	`+ {`
	`69`	`+ continue;`
	`70`	`+ }`
`67`	`71`	`}`
`68`		`- }`
`69`	`72`
`70`		`- builder.Add((projectModel.FilePath, projectModel.Id.ToString()));`
	`73`	`+ builder.Add((absoluteProjectPath, projectModel.Id.ToString()));`
	`74`	`+ }`
`71`	`75`	`}`
`72`	`76`
`73`	`77`	`return builder.ToImmutable();`