Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mcp/CWM.RoslynNavigator/src/CWM.RoslynNavigator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<!-- NuGet package metadata -->
<PackageId>CWM.RoslynNavigator</PackageId>
<Version>0.7.2</Version>
<Version>0.7.3</Version>
<Authors>Mukesh Murugan</Authors>
<Company>codewithmukesh</Company>
<Product>CWM.RoslynNavigator</Product>
Expand All @@ -40,6 +40,10 @@
<None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="CWM.RoslynNavigator.Tests" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="ModelContextProtocol" Version="0.2.0-preview.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
Expand Down
49 changes: 40 additions & 9 deletions mcp/CWM.RoslynNavigator/src/Tools/GetProjectGraphTool.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.ComponentModel;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Xml.Linq;
using CWM.RoslynNavigator.Responses;
using ModelContextProtocol.Server;
Expand Down Expand Up @@ -67,18 +68,48 @@ private static string DetectTargetFramework(Microsoft.CodeAnalysis.Project proje
}

// Strategy 2: Check preprocessor symbols (e.g., NET10_0, NET8_0)
var preprocessorSymbol = project.ParseOptions?.PreprocessorSymbolNames
.Where(s => s.StartsWith("NET"))
.OrderByDescending(s => s.Length)
.FirstOrDefault();

if (preprocessorSymbol is not null)
if (project.ParseOptions?.PreprocessorSymbolNames is { } symbols)
{
// Convert "NET10_0" to "net10.0", "NET8_0_OR_GREATER" stays as-is but we prefer exact match
var exact = preprocessorSymbol.Replace("_OR_GREATER", "");
return exact.ToLowerInvariant().Replace('_', '.');
var detected = DetectFromPreprocessorSymbols(symbols);
if (detected is not null)
return detected;
}

return "unknown";
}

// Exact TFM symbols: NET10_0, NETSTANDARD2_0, NETCOREAPP3_1. Anchored so compat
// symbols like NETCOREAPP1_0_OR_GREATER (issue #19) never match.
private static readonly Regex ExactTfmSymbol =
new(@"^(NETSTANDARD|NETCOREAPP|NET)(\d+)_(\d+)$", RegexOptions.Compiled);

// .NET Framework symbols have no underscore: NET48, NET472
private static readonly Regex FrameworkTfmSymbol = new(@"^NET(\d{2,3})$", RegexOptions.Compiled);

internal static string? DetectFromPreprocessorSymbols(IEnumerable<string> symbols)
{
var symbolList = symbols.ToList();

// A compilation defines exactly one exact TFM symbol alongside many *_OR_GREATER
// compat symbols. Only the exact one names the real target framework.
var exact = symbolList
.Select(s => ExactTfmSymbol.Match(s))
.Where(m => m.Success)
.Select(m => (Prefix: m.Groups[1].Value, Major: int.Parse(m.Groups[2].Value), Minor: int.Parse(m.Groups[3].Value)))
.OrderByDescending(t => t.Major)
.ThenByDescending(t => t.Minor)
.Select(t => (string?)$"{t.Prefix.ToLowerInvariant()}{t.Major}.{t.Minor}")
.FirstOrDefault();

if (exact is not null)
return exact;

return symbolList
.Select(s => FrameworkTfmSymbol.Match(s))
.Where(m => m.Success)
.Select(m => m.Groups[1].Value)
.OrderByDescending(v => int.Parse(v.PadRight(3, '0')))
.Select(v => (string?)$"net{v}")
.FirstOrDefault();
}
}
90 changes: 90 additions & 0 deletions mcp/CWM.RoslynNavigator/tests/Tools/DetectTargetFrameworkTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
using CWM.RoslynNavigator.Tools;

namespace CWM.RoslynNavigator.Tests.Tools;

/// <summary>
/// Regression tests for issue #19: net10.0 projects were reported as "netcoreapp1.0"
/// because the longest NET-prefixed preprocessor symbol (NETCOREAPP1_0_OR_GREATER)
/// won over the exact TFM symbol (NET10_0).
/// </summary>
public class DetectTargetFrameworkTests
{
[Fact]
public void DetectFromPreprocessorSymbols_Net10_ReturnsNet10()
{
// Real symbol set the SDK defines for a net10.0 compilation
string[] symbols =
[
"TRACE", "DEBUG", "NET", "NET10_0", "NETCOREAPP",
"NET5_0_OR_GREATER", "NET6_0_OR_GREATER", "NET7_0_OR_GREATER",
"NET8_0_OR_GREATER", "NET9_0_OR_GREATER", "NET10_0_OR_GREATER",
"NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER",
"NETCOREAPP2_0_OR_GREATER", "NETCOREAPP2_1_OR_GREATER",
"NETCOREAPP2_2_OR_GREATER", "NETCOREAPP3_0_OR_GREATER",
"NETCOREAPP3_1_OR_GREATER",
];

Assert.Equal("net10.0", GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}

[Fact]
public void DetectFromPreprocessorSymbols_Net8_ReturnsNet8()
{
string[] symbols =
[
"TRACE", "NET", "NET8_0", "NETCOREAPP",
"NET5_0_OR_GREATER", "NET6_0_OR_GREATER", "NET7_0_OR_GREATER", "NET8_0_OR_GREATER",
"NETCOREAPP1_0_OR_GREATER", "NETCOREAPP2_0_OR_GREATER",
"NETCOREAPP3_0_OR_GREATER", "NETCOREAPP3_1_OR_GREATER",
];

Assert.Equal("net8.0", GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}

[Fact]
public void DetectFromPreprocessorSymbols_NetStandard20_ReturnsNetStandard20()
{
string[] symbols =
[
"TRACE", "NETSTANDARD", "NETSTANDARD2_0",
"NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
"NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER",
];

Assert.Equal("netstandard2.0", GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}

[Fact]
public void DetectFromPreprocessorSymbols_NetCoreApp31_ReturnsNetCoreApp31()
{
string[] symbols =
[
"TRACE", "NETCOREAPP", "NETCOREAPP3_1",
"NETCOREAPP1_0_OR_GREATER", "NETCOREAPP2_0_OR_GREATER",
"NETCOREAPP3_0_OR_GREATER", "NETCOREAPP3_1_OR_GREATER",
];

Assert.Equal("netcoreapp3.1", GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}

[Fact]
public void DetectFromPreprocessorSymbols_NetFramework48_ReturnsNet48()
{
string[] symbols =
[
"TRACE", "NETFRAMEWORK", "NET48",
"NET20_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER",
"NET45_OR_GREATER", "NET472_OR_GREATER", "NET48_OR_GREATER",
];

Assert.Equal("net48", GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}

[Fact]
public void DetectFromPreprocessorSymbols_NoTfmSymbols_ReturnsNull()
{
string[] symbols = ["TRACE", "DEBUG", "MY_CUSTOM_FLAG"];

Assert.Null(GetProjectGraphTool.DetectFromPreprocessorSymbols(symbols));
}
}
Loading