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
58 changes: 29 additions & 29 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,50 @@

<ItemGroup>
<PackageVersion Include="AssemblyMetadata.Generators" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.9.0" />
<PackageVersion Include="Scriban" Version="7.2.6" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.11.0" />
<PackageVersion Include="Scriban" Version="7.4.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
<PackageVersion Include="Verify.XunitV3" Version="31.27.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageVersion Include="Verify.XunitV3" Version="32.0.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0" />
</ItemGroup>

<!-- IH.Shared dependencies -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.10" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.8.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.11" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-rc.1.26425.128" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-rc.1.26425.128" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-rc.1.26425.128" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.9.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-rc.1.26425.128" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.10" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.11" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.301" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.8.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.9.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.10" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.11" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.20" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.20" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.20" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.10" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.11" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
Expand All @@ -58,10 +58,10 @@

<!-- IH.Generators dependencies -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.9.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
Expand Down Expand Up @@ -94,8 +94,8 @@

<ItemGroup>
<GlobalPackageReference Include="DotNet.ReproducibleBuilds" Version="2.0.5" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.137" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.158" PrivateAssets="All" />
<GlobalPackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.231" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.164" PrivateAssets="All" />
<GlobalPackageReference Include="MinVer" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/Immediate.Handlers.Analyzers/InvalidHandlerUsageAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,27 @@ private record struct InvalidSymbolLocation(Location Location, INamedTypeSymbol
AllInterfaces: var interfaces,
} ints when
Enumerable
.Select([baseType, .. interfaces], t => GetInvalidSymbol(t, new(SymbolEqualityComparer.Default), token))
.Select([baseType, .. interfaces], t => GetInvalidSymbol(t, [with(SymbolEqualityComparer.Default)], token))
.FirstOrDefault(x => x is { }) is { } invalidSymbol =>
new(GetTypeIdentifierLocation(ints, token), invalidSymbol),

IParameterSymbol { Type: INamedTypeSymbol type } ips
when GetInvalidSymbol(type, new(SymbolEqualityComparer.Default), token) is { } invalidSymbol =>
when GetInvalidSymbol(type, [with(SymbolEqualityComparer.Default)], token) is { } invalidSymbol =>
new(GetTypeLocation(ips, token), invalidSymbol),

IFieldSymbol { Type: INamedTypeSymbol type } ifs
when GetInvalidSymbol(type, new(SymbolEqualityComparer.Default), token) is { } invalidSymbol =>
when GetInvalidSymbol(type, [with(SymbolEqualityComparer.Default)], token) is { } invalidSymbol =>
new(GetTypeLocation(ifs, token), invalidSymbol),

IPropertySymbol { Type: INamedTypeSymbol type } ips
when GetInvalidSymbol(type, new(SymbolEqualityComparer.Default), token) is { } invalidSymbol =>
when GetInvalidSymbol(type, [with(SymbolEqualityComparer.Default)], token) is { } invalidSymbol =>
new(GetTypeLocation(ips, token), invalidSymbol),

IMethodSymbol
{
ReturnType: INamedTypeSymbol type,
MethodKind: not (MethodKind.PropertyGet or MethodKind.PropertySet),
} ims when GetInvalidSymbol(type, new(SymbolEqualityComparer.Default), token) is { } invalidSymbol =>
} ims when GetInvalidSymbol(type, [with(SymbolEqualityComparer.Default)], token) is { } invalidSymbol =>
new(GetTypeLocation(ims, token), invalidSymbol),

_ => null,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using Immediate.Handlers.Shared;
using Microsoft.Extensions.DependencyInjection;

namespace Immediate.Handlers.FunctionalTests.Behavior.Constraints;

Expand All @@ -12,21 +10,6 @@ public record C : A;

public record D : B;

[SuppressMessage("Naming", "CA1707", Justification = "Test names.")]
public sealed partial class Tests
{
private static IServiceCollection ConfigureBehaviors(IServiceCollection services)
{
_ = services.AddSingleton<BehaviorWalker>();
_ = services.AddScoped(typeof(BehaviorA<,>));
_ = services.AddScoped(typeof(BehaviorB<,>));
_ = services.AddScoped(typeof(BehaviorC<,>));
_ = services.AddScoped(typeof(BehaviorD<,>));

return services;
}
}

public sealed class BehaviorWalker
{
public IList<string> BehaviorsRan { get; init; } = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public sealed partial class Tests
[Fact]
public async Task BehaviorShouldConstrain_A()
{
IServiceCollection services = new ServiceCollection();
services = ConfigureBehaviors(services);
var services = new ServiceCollection()
.AddSingleton<BehaviorWalker>();
services = BehaviorShouldConstrainA.AddHandlers(services);
var serviceProvider = services.BuildServiceProvider();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public sealed partial class Tests
[Fact]
public async Task BehaviorShouldConstrain_B()
{
IServiceCollection services = new ServiceCollection();
services = ConfigureBehaviors(services);
var services = new ServiceCollection()
.AddSingleton<BehaviorWalker>();
services = BehaviorShouldConstrainB.AddHandlers(services);
var serviceProvider = services.BuildServiceProvider();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public sealed partial class Tests
[Fact]
public async Task BehaviorShouldConstrain_C()
{
IServiceCollection services = new ServiceCollection();
services = ConfigureBehaviors(services);
var services = new ServiceCollection()
.AddSingleton<BehaviorWalker>();
services = BehaviorShouldConstrainC.AddHandlers(services);
var serviceProvider = services.BuildServiceProvider();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public sealed partial class Tests
[Fact]
public async Task BehaviorShouldConstrain_D()
{
IServiceCollection services = new ServiceCollection();
services = ConfigureBehaviors(services);
var services = new ServiceCollection()
.AddSingleton<BehaviorWalker>();
services = BehaviorShouldConstrainD.AddHandlers(services);
var serviceProvider = services.BuildServiceProvider();

Expand Down
2 changes: 1 addition & 1 deletion tests/Immediate.Handlers.Tests/Utility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static class Utility
"net11.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"11.0.0-preview.6.26359.118"
"11.0.0-rc.1.26425.128"
),
Path.Combine("ref", "net11.0")
);
Expand Down