diff --git a/ScipDotnet.Tests/ScipDotnet.Tests.csproj b/ScipDotnet.Tests/ScipDotnet.Tests.csproj
index e717dde..e957400 100644
--- a/ScipDotnet.Tests/ScipDotnet.Tests.csproj
+++ b/ScipDotnet.Tests/ScipDotnet.Tests.csproj
@@ -1,7 +1,7 @@
- net10.0;net9.0;net8.0;net7.0;net6.0
+ net10.0;net9.0;net8.0
enable
enable
false
diff --git a/ScipDotnet/IndexCommandHandler.cs b/ScipDotnet/IndexCommandHandler.cs
index 63cdb74..3ffe98e 100644
--- a/ScipDotnet/IndexCommandHandler.cs
+++ b/ScipDotnet/IndexCommandHandler.cs
@@ -116,13 +116,14 @@ private static async Task ScipIndex(IHost host, IndexCommandOptions options)
}
private static string FixThisProblem(string examplePath) =>
- "To fix this problem, pass the path of a solution (.sln) or project (.csproj/.vbrpoj) file to the `scip-dotnet index` command. " +
+ "To fix this problem, pass the path of a solution (.sln/.slnx) or project (.csproj/.vbrpoj) file to the `scip-dotnet index` command. " +
$"For example, run: scip-dotnet index {examplePath}";
private static List FindSolutionOrProjectFile(FileInfo workingDirectory, ILogger logger)
{
var paths = Directory.GetFiles(workingDirectory.FullName).Where(file =>
string.Equals(Path.GetExtension(file), ".sln", StringComparison.OrdinalIgnoreCase) ||
+ string.Equals(Path.GetExtension(file), ".slnx", StringComparison.OrdinalIgnoreCase) ||
string.Equals(Path.GetExtension(file), ".csproj", StringComparison.OrdinalIgnoreCase) ||
string.Equals(Path.GetExtension(file), ".vbproj", StringComparison.OrdinalIgnoreCase)
).ToList();
@@ -133,7 +134,7 @@ private static List FindSolutionOrProjectFile(FileInfo workingDirector
}
logger.LogError(
- "No solution (.sln) or .csproj/.vbproj file detected in the working directory '{WorkingDirectory}'. {FixThis}",
+ "No solution (.sln/.slnx) or .csproj/.vbproj file detected in the working directory '{WorkingDirectory}'. {FixThis}",
workingDirectory.FullName, FixThisProblem("SOLUTION_FILE"));
return new List();
}
diff --git a/ScipDotnet/Program.cs b/ScipDotnet/Program.cs
index ec6ab57..c51c6b8 100644
--- a/ScipDotnet/Program.cs
+++ b/ScipDotnet/Program.cs
@@ -21,7 +21,7 @@ public static async Task Main(string[] args)
{
var indexCommand = new Command("index", "Index a solution file")
{
- new Argument("projects", "Path to the .sln (solution) or .csproj/.vbproj file")
+ new Argument("projects", "Path to the .sln/.slnx (solution) or .csproj/.vbproj file")
{ Arity = ArgumentArity.ZeroOrMore },
new Option("--output", () => "index.scip",
"Path to the output SCIP index file"),
diff --git a/ScipDotnet/ScipDotnet.csproj b/ScipDotnet/ScipDotnet.csproj
index 6816cb1..020ba6d 100644
--- a/ScipDotnet/ScipDotnet.csproj
+++ b/ScipDotnet/ScipDotnet.csproj
@@ -8,7 +8,7 @@
LICENSE
readme.md
DotnetTool
- net10.0;net9.0;net8.0;net7.0;net6.0
+ net10.0;net9.0;net8.0
true
scip-dotnet
https://github.com/sourcegraph/scip-dotnet
@@ -19,14 +19,14 @@
-
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/ScipDotnet/ScipProjectIndexer.cs b/ScipDotnet/ScipProjectIndexer.cs
index 00306f0..d8a5123 100644
--- a/ScipDotnet/ScipProjectIndexer.cs
+++ b/ScipDotnet/ScipProjectIndexer.cs
@@ -20,7 +20,7 @@ public ScipProjectIndexer(ILogger logger) =>
private void Restore(IndexCommandOptions options, FileInfo project)
{
- var arguments = project.Extension.Equals(".sln") ? $"restore {project.FullName} /p:EnableWindowsTargeting=true" : "restore /p:EnableWindowsTargeting=true";
+ var arguments = project.Extension.Equals(".sln") || project.Extension.Equals(".slnx") ? $"restore {project.FullName} /p:EnableWindowsTargeting=true" : "restore /p:EnableWindowsTargeting=true";
if (options.NugetConfigPath != null)
{
arguments += $" --configfile \"{options.NugetConfigPath.FullName}\"";