Merge pull request #450 from gteijeiro/codex/add-slnx-support

Add support for .slnx solution references

Author: waf

CSharpRepl.Services/Roslyn/MetadataResolvers/SolutionFileMetadataResolver.cs

@@ -28,6 +28,8 @@ public SolutionFileMetadataResolver(DotnetBuilder builder, IConsoleEx console)
     public override bool CanResolve(string reference) =>
         reference.EndsWith(".sln", StringComparison.OrdinalIgnoreCase) ||
         reference.EndsWith(".sln\"", StringComparison.OrdinalIgnoreCase) ||
+        reference.EndsWith(".slnx", StringComparison.OrdinalIgnoreCase) ||
+        reference.EndsWith(".slnx\"", StringComparison.OrdinalIgnoreCase) ||
         reference.EndsWith(".csproj", StringComparison.OrdinalIgnoreCase) ||
         reference.EndsWith(".csproj\"", StringComparison.OrdinalIgnoreCase);
 
@@ -57,7 +59,7 @@ private async Task<ImmutableArray<PortableExecutableReference>> GetMetadataRefer
         var projects = Path.GetExtension(solutionOrProject) switch
         {
             ".csproj" => [await workspace.OpenProjectAsync(solutionOrProject, cancellationToken: cancellationToken)],
-            ".sln" => (await workspace.OpenSolutionAsync(solutionOrProject, cancellationToken: cancellationToken)).Projects,
+            ".sln" or ".slnx" => (await workspace.OpenSolutionAsync(solutionOrProject, cancellationToken: cancellationToken)).Projects,
             _ => throw new ArgumentException("Unexpected filetype for file " + solutionOrProject)
         };
 
@@ -78,4 +80,4 @@ private async Task<ImmutableArray<PortableExecutableReference>> GetMetadataRefer
             .Distinct()
             .ToImmutableArray();
     }
-}
+}

CSharpRepl.Tests/Data/DemoSolution/DemoSolution.slnx

@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="DemoSolution.DemoProject1/DemoSolution.DemoProject1.csproj" />
+  <Project Path="DemoSolution.DemoProject2/DemoSolution.DemoProject2.csproj" />
+</Solution>

CSharpRepl.Tests/EvaluationTests.cs

@@ -156,6 +156,18 @@ public async Task Evaluate_SolutionReference_ReferencesAllProjects()
         Assert.IsType<EvaluationResult.Success>(importProject2Result);
     }
 
+    [Fact]
+    public async Task Evaluate_SolutionReference_ReferencesAllProjects_FromSlnx()
+    {
+        var referenceResult = await services.EvaluateAsync(@"#r ""./Data/DemoSolution/DemoSolution.slnx""");
+        var importProject1Result = await services.EvaluateAsync(@"using DemoSolution.DemoProject1;");
+        var importProject2Result = await services.EvaluateAsync(@"using DemoSolution.DemoProject2;");
+
+        Assert.IsType<EvaluationResult.Success>(referenceResult);
+        Assert.IsType<EvaluationResult.Success>(importProject1Result);
+        Assert.IsType<EvaluationResult.Success>(importProject2Result);
+    }
+
     [Fact]
     public async Task Evaluate_SolutionReference_ReferencesMultipleTargetFrameworks()
     {

CSharpRepl/ReadEvalPrintLoop.cs

@@ -167,7 +167,7 @@ [underline]Adding References[/]
 Use the {Reference()} command to add reference to:
   - assembly ({Reference("AssemblyName")} or {Reference("path/to/assembly.dll")}),
   - NuGet package ({Reference("nuget: PackageName")} or {Reference("nuget: PackageName, version")}),
-  - project ({Reference("path/to/my.csproj")} or {Reference("path/to/my.sln")}).
+  - project ({Reference("path/to/my.csproj")}, {Reference("path/to/my.sln")}, or {Reference("path/to/my.slnx")}).
 
 Use {Preprocessor("#load", "path-to-file")} to evaluate C# stored in files (e.g. csx files). This can
 be useful, for example, to build a [{ToColor("string")}].profile.csx[/] that includes libraries you want

README.md

@@ -107,7 +107,7 @@ When you're done with your session, you can type `exit` or press <kbd>Ctrl+D</kb
 Use the `#r` command to add assembly or nuget references.
 
 - For assembly references, run `#r "AssemblyName"` or `#r "path/to/assembly.dll"`
-- For project references, run `#r "path/to/project.csproj"`. Solution files (.sln) can also be referenced.
+- For project references, run `#r "path/to/project.csproj"`. Solution files (`.sln` and `.slnx`) can also be referenced.
 - For nuget references, run `#r "nuget: PackageName"` to install the latest version of a package, or `#r "nuget: PackageName, 13.0.5"` to install a specific version (13.0.5 in this case).
 
 <p align="center">