Merge pull request #204 from EFNext/fix-net10-sdk-requirement

PhenX · web-flow · commit fba76e1b121c · 2026-04-28T22:38:14.000+02:00
Fix net8.0 compatibility
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,4 +1,20 @@
 <Project>
+  <PropertyGroup>
+    <!--
+      RoslynAnalyzerVersion controls which Roslyn version the source generator is compiled against.
+      Auto-detected from the .NET SDK major version encoded in $(MSBuildSDKsPath):
+        - SDK 10+ → 5.0.0  (full C# 14 extension-member support; ROSLYN_5_0_OR_LATER is defined)
+        - SDK 9   → 4.14.0 (no C# 14; the generator DLL loads on SDK 9 and SDK 10)
+      Override at the CLI: dotnet build -p:RoslynAnalyzerVersion=4.14.0
+    -->
+    <!-- Extract the SDK major version from the path (e.g. "…\sdk\10.0.203\Sdks" → "10") -->
+    <_DotNetSdkMajorVersion>$([System.Text.RegularExpressions.Regex]::Match('$(MSBuildSDKsPath)', '[\\/]sdk[\\/](\d+)\.').Groups[1].Value)</_DotNetSdkMajorVersion>
+    <!-- SDK 10+ ships Roslyn 5.0 — auto-enable full C# 14 support -->
+    <RoslynAnalyzerVersion Condition="'$(RoslynAnalyzerVersion)' == '' AND '$(_DotNetSdkMajorVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals('$(_DotNetSdkMajorVersion).0.0', '10.0.0'))">5.0.0</RoslynAnalyzerVersion>
+    <!-- SDK 9 or unknown: Roslyn 4.14.0 is safe on both SDK 9 and SDK 10 hosts -->
+    <RoslynAnalyzerVersion Condition="'$(RoslynAnalyzerVersion)' == ''">4.14.0</RoslynAnalyzerVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
 	<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,6 +1,9 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- RoslynAnalyzerVersion is auto-detected in Directory.Build.props (SDK 10+ → 5.0.0, SDK 9 → 4.14.0).
+         The fallback here covers any edge case where Directory.Build.props runs after this file. -->
+    <RoslynAnalyzerVersion Condition="'$(RoslynAnalyzerVersion)' == ''">4.14.0</RoslynAnalyzerVersion>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
@@ -26,8 +29,8 @@
     <PackageVersion Include="EFCore.BulkExtensions" Version="8.0.4" />
     <PackageVersion Include="coverlet.collector" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynAnalyzerVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynAnalyzerVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
diff --git a/src/EntityFrameworkCore.Projectables.CodeFixes/BlockBodyExperimentalCodeFixProvider.cs b/src/EntityFrameworkCore.Projectables.CodeFixes/BlockBodyExperimentalCodeFixProvider.cs
@@ -16,7 +16,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;
 [Shared]
 public sealed class BlockBodyExperimentalCodeFixProvider : CodeFixProvider
 {
-    public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0001"];
+    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0001");
 
     public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
 
diff --git a/src/EntityFrameworkCore.Projectables.CodeFixes/FactoryMethodToCtorCodeFixProvider.cs b/src/EntityFrameworkCore.Projectables.CodeFixes/FactoryMethodToCtorCodeFixProvider.cs
@@ -20,7 +20,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;
 public sealed class FactoryMethodToCtorCodeFixProvider : CodeFixProvider
 {
     /// <inheritdoc />
-    public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0012"];
+    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0012");
 
     /// <inheritdoc />
     public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
diff --git a/src/EntityFrameworkCore.Projectables.CodeFixes/MissingParameterlessConstructorCodeFixProvider.cs b/src/EntityFrameworkCore.Projectables.CodeFixes/MissingParameterlessConstructorCodeFixProvider.cs
@@ -19,7 +19,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;
 [Shared]
 public sealed class MissingParameterlessConstructorCodeFixProvider : CodeFixProvider
 {
-    public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0008"];
+    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0008");
 
     public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
 
diff --git a/src/EntityFrameworkCore.Projectables.CodeFixes/NullConditionalRewriteUnsupportedCodeFixProvider.cs b/src/EntityFrameworkCore.Projectables.CodeFixes/NullConditionalRewriteUnsupportedCodeFixProvider.cs
@@ -20,7 +20,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;
 [Shared]
 public sealed class NullConditionalRewriteUnsupportedCodeFixProvider : CodeFixProvider
 {
-    public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0002"];
+    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0002");
 
     public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
 
diff --git a/src/EntityFrameworkCore.Projectables.Generator/EntityFrameworkCore.Projectables.Generator.csproj b/src/EntityFrameworkCore.Projectables.Generator/EntityFrameworkCore.Projectables.Generator.csproj
@@ -8,6 +8,14 @@
 	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
+  <!-- Define ROSLYN_5_0_OR_LATER when building with .NET SDK 10+ (NETCoreSdkVersion is set by
+       Microsoft.NET.Sdk.props, which runs before this project file body is evaluated).
+       This enables C# 14 extension-type support in the generator code.
+       On SDK 9 the constant is absent and extension block members are skipped safely. -->
+  <PropertyGroup Condition="'$(NETCoreSdkVersion)' != '' AND $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.0'))">
+    <DefineConstants>$(DefineConstants);ROSLYN_5_0_OR_LATER</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
 	<Compile Include="..\EntityFrameworkCore.Projectables.Abstractions\NullConditionalRewriteSupport.cs" Link="Infrastructure\NullConditionalRewriteSupport.cs" />
 	<Compile Include="..\EntityFrameworkCore.Projectables\Services\ProjectionExpressionClassNameGenerator.cs" Link="Infrastructure\ProjectionExpressionClassNameGenerator.cs" />
diff --git a/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.BodyProcessors.cs b/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.BodyProcessors.cs
@@ -120,7 +120,11 @@ private static bool TryApplyExpressionPropertyBody(
         // implicit @this receiver parameter.  If the expression property lambda uses a
         // different parameter name (e.g. c => c.Value > 0), rename it so the generated
         // code references @this instead of an undefined identifier.
+#if ROSLYN_5_0_OR_LATER
         var isExtensionMember = memberSymbol.ContainingType is { IsExtension: true };
+#else
+        var isExtensionMember = false;
+#endif
         var hasImplicitReceiver = isExtensionMember
             || !originalMethodDecl.Modifiers.Any(SyntaxKind.StaticKeyword);
 
diff --git a/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.Helpers.cs b/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.Helpers.cs
@@ -66,6 +66,7 @@ private static void ApplyExtensionBlockTypeParameters(
         ISymbol memberSymbol,
         ProjectableDescriptor descriptor)
     {
+#if ROSLYN_5_0_OR_LATER
         if (memberSymbol.ContainingType is not { IsExtension: true } extensionType
             || extensionType.TypeParameters.IsDefaultOrEmpty)
         {
@@ -95,6 +96,7 @@ private static void ApplyExtensionBlockTypeParameters(
             descriptor.ConstraintClauses ??= SyntaxFactory.List<TypeParameterConstraintClauseSyntax>();
             descriptor.ConstraintClauses = descriptor.ConstraintClauses.Value.Add(BuildConstraintClause(tp));
         }
+#endif
     }
 
     /// <summary>
diff --git a/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.MemberBodyResolver.cs b/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.MemberBodyResolver.cs
@@ -78,7 +78,11 @@ x is IPropertySymbol xProperty &&
         {
             if (memberSymbol is IMethodSymbol exprCheckMethod)
             {
+#if ROSLYN_5_0_OR_LATER
                 var isExtensionBlock = memberSymbol.ContainingType is { IsExtension: true };
+#else
+                var isExtensionBlock = false;
+#endif
                 var hasImplicitThis = !exprCheckMethod.IsStatic || isExtensionBlock;
                 var expectedFuncArgCount = exprCheckMethod.Parameters.Length + (hasImplicitThis ? 2 : 1);
 
@@ -88,9 +92,14 @@ x is IPropertySymbol xProperty &&
                 ITypeSymbol? expectedReceiverType = null;
                 if (hasImplicitThis)
                 {
-                    expectedReceiverType = isExtensionBlock
-                        ? exprCheckMethod.ContainingType.ExtensionParameter?.Type
-                        : exprCheckMethod.ContainingType;
+                    expectedReceiverType =
+#if ROSLYN_5_0_OR_LATER
+                        isExtensionBlock
+                            ? exprCheckMethod.ContainingType.ExtensionParameter?.Type
+                            : exprCheckMethod.ContainingType;
+#else
+                        exprCheckMethod.ContainingType;
+#endif
                 }
 
                 compatibleExprPropertyCandidates = exprPropertyCandidates.Where(x =>
diff --git a/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.cs b/src/EntityFrameworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.cs
@@ -34,6 +34,7 @@ static internal partial class ProjectableInterpreter
         }
 
         // 2. Detect C# 14 extension member context
+#if ROSLYN_5_0_OR_LATER
         var isExtensionMember = memberSymbol.ContainingType is { IsExtension: true };
         IParameterSymbol? extensionParameter = null;
         ITypeSymbol? extensionReceiverType = null;
@@ -43,6 +44,11 @@ static internal partial class ProjectableInterpreter
             extensionParameter = extensionType.ExtensionParameter;
             extensionReceiverType = extensionParameter?.Type;
         }
+#else
+        var isExtensionMember = false;
+        IParameterSymbol? extensionParameter = null;
+        ITypeSymbol? extensionReceiverType = null;
+#endif
 
         // 3. Create syntax rewriters
         var targetTypeForRewriting = isExtensionMember && extensionReceiverType is INamedTypeSymbol receiverNamedType
diff --git a/src/EntityFrameworkCore.Projectables.Generator/ProjectionExpressionGenerator.cs b/src/EntityFrameworkCore.Projectables.Generator/ProjectionExpressionGenerator.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using EntityFrameworkCore.Projectables.CodeFixes;
 using EntityFrameworkCore.Projectables.Generator.Comparers;
+using EntityFrameworkCore.Projectables.Generator.Infrastructure;
 using EntityFrameworkCore.Projectables.Generator.Interpretation;
 using EntityFrameworkCore.Projectables.Generator.Models;
 using EntityFrameworkCore.Projectables.Generator.Registry;
@@ -71,6 +72,16 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             static (spc, source) =>
             {
                 var ((member, attribute, globalOptions), compilation) = source;
+
+#if !ROSLYN_5_0_OR_LATER
+                // C# 14 extension block members have a parent that is NOT a class/struct/interface/record.
+                // Without ROSLYN_5_0_OR_LATER support, skip them gracefully to avoid generating invalid code.
+                if (!IsInsideKnownMemberContainer(member))
+                {
+                    return;
+                }
+#endif
+
                 var semanticModel = compilation.GetSemanticModel(member.SyntaxTree);
                 var memberSymbol = semanticModel.GetDeclaredSymbol(member);
 
@@ -87,6 +98,14 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             static (source, cancellationToken) => {
                 var ((member, _, _), compilation) = source;
 
+#if !ROSLYN_5_0_OR_LATER
+                // Same guard: skip C# 14 extension block members that we can't handle without Roslyn 5.0.
+                if (!IsInsideKnownMemberContainer(member))
+                {
+                    return null;
+                }
+#endif
+
                 var semanticModel = compilation.GetSemanticModel(member.SyntaxTree);
                 var memberSymbol = semanticModel.GetDeclaredSymbol(member, cancellationToken);
 
@@ -308,6 +327,25 @@ static TypeArgumentListSyntax GetLambdaTypeArgumentListSyntax(ProjectableDescrip
         }
     }
 
+#if !ROSLYN_5_0_OR_LATER
+    /// <summary>
+    /// Returns <c>true</c> when the member is directly inside a known C# type body
+    /// (class, struct, interface, or record).
+    /// <para>
+    /// C# 14 extension block members (<c>extension(T t) { … }</c>) have a parent node that is
+    /// NOT one of these types.  Because full support for extension members requires
+    /// <c>ROSLYN_5_0_OR_LATER</c>, this helper is used as an early-exit guard so that the
+    /// generator never attempts to emit code for members it cannot handle, avoiding CS1520 /
+    /// CS0710 compile errors in the generated files.
+    /// </para>
+    /// </summary>
+    private static bool IsInsideKnownMemberContainer(MemberDeclarationSyntax member)
+        => member.Parent is ClassDeclarationSyntax
+            or StructDeclarationSyntax
+            or InterfaceDeclarationSyntax
+            or RecordDeclarationSyntax;
+#endif
+
     /// <summary>
     /// Extracts a <see cref="ProjectionRegistryEntry"/> from a member declaration.
     /// Returns null when the member does not have [Projectable], is an extension member,
@@ -318,10 +356,12 @@ static TypeArgumentListSyntax GetLambdaTypeArgumentListSyntax(ProjectableDescrip
         var containingType = memberSymbol.ContainingType;
 
         // Skip C# 14 extension type members — they require special handling (fall back to reflection)
+#if ROSLYN_5_0_OR_LATER
         if (containingType is { IsExtension: true })
         {
             return null;
         }
+#endif
 
         // Skip generic classes: the registry only supports closed constructed types.
         if (containingType.TypeParameters.Length > 0)
@@ -353,9 +393,9 @@ static TypeArgumentListSyntax GetLambdaTypeArgumentListSyntax(ProjectableDescrip
                 memberLookupName = memberSymbol.Name;
             }
 
-            parameterTypeNames = [
-                ..methodSymbol.Parameters.Select(p => p.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))
-            ];
+            parameterTypeNames = methodSymbol.Parameters
+                .Select(p => p.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))
+                .ToImmutableArray();
         }
         else
         {
diff --git a/src/EntityFrameworkCore.Projectables.Generator/SyntaxRewriters/ExpressionSyntaxRewriter.cs b/src/EntityFrameworkCore.Projectables.Generator/SyntaxRewriters/ExpressionSyntaxRewriter.cs
@@ -123,6 +123,7 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, NullCondition
     public override SyntaxNode? VisitIdentifierName(IdentifierNameSyntax node)
     {
         // Handle C# 14 extension parameter replacement (e.g., `e` in `extension(Entity e)` becomes `@this`)
+#if ROSLYN_5_0_OR_LATER
         if (_extensionParameterName is not null && node.Identifier.Text == _extensionParameterName)
         {
             var symbol = _semanticModel.GetSymbolInfo(node).Symbol;
@@ -135,7 +136,7 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, NullCondition
                     .WithTrailingTrivia(node.GetTrailingTrivia());
             }
         }
-
+#endif
         var identifierSymbol = _semanticModel.GetSymbolInfo(node).Symbol;
         if (identifierSymbol is not null)
         {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;`
`16`	`16`	`[Shared]`
`17`	`17`	`public sealed class BlockBodyExperimentalCodeFixProvider : CodeFixProvider`
`18`	`18`	`{`
`19`		`- public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0001"];`
	`19`	`+ public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0001");`
`20`	`20`
`21`	`21`	`public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;`
`20`	`20`	`public sealed class FactoryMethodToCtorCodeFixProvider : CodeFixProvider`
`21`	`21`	`{`
`22`	`22`	`/// <inheritdoc />`
`23`		`- public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0012"];`
	`23`	`+ public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0012");`
`24`	`24`
`25`	`25`	`/// <inheritdoc />`
`26`	`26`	`public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace EntityFrameworkCore.Projectables.CodeFixes;`
`19`	`19`	`[Shared]`
`20`	`20`	`public sealed class MissingParameterlessConstructorCodeFixProvider : CodeFixProvider`
`21`	`21`	`{`
`22`		`- public override ImmutableArray<string> FixableDiagnosticIds => ["EFP0008"];`
	`22`	`+ public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create("EFP0008");`
`23`	`23`
`24`	`24`	`public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ private static void ApplyExtensionBlockTypeParameters(`
`66`	`66`	`ISymbol memberSymbol,`
`67`	`67`	`ProjectableDescriptor descriptor)`
`68`	`68`	`{`
	`69`	`+#if ROSLYN_5_0_OR_LATER`
`69`	`70`	`if (memberSymbol.ContainingType is not { IsExtension: true } extensionType`
`70`	`71`	`\|\| extensionType.TypeParameters.IsDefaultOrEmpty)`
`71`	`72`	`{`
`@@ -95,6 +96,7 @@ private static void ApplyExtensionBlockTypeParameters(`
`95`	`96`	`descriptor.ConstraintClauses ??= SyntaxFactory.List<TypeParameterConstraintClauseSyntax>();`
`96`	`97`	`descriptor.ConstraintClauses = descriptor.ConstraintClauses.Value.Add(BuildConstraintClause(tp));`
`97`	`98`	`}`
	`99`	`+#endif`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`/// <summary>`