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
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ dotnet_diagnostic.CS1712.severity = error # CS1712: Type parameter

dotnet_diagnostic.CA1822.severity = none # CA1822: Mark members as static

dotnet_diagnostic.MA0002.severity = none # MA0002: IEqualityComparer<string> or IComparer<string> is missing

[tests/*.g.verified.cs]

# Mark code as excluded and generated
Expand Down
60 changes: 30 additions & 30 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,57 @@

<ItemGroup>
<PackageVersion Include="AssemblyMetadata.Generators" Version="2.2.0" />
<PackageVersion Include="Immediate.Handlers" Version="3.11.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />
<PackageVersion Include="Immediate.Handlers" Version="4.0.0" />
<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.Testing.Extensions.CodeCoverage" Version="18.9.0" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.11" />
<PackageVersion Include="Scriban" Version="7.2.5" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.20" />
<PackageVersion Include="Scriban" Version="7.2.6" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
<PackageVersion Include="Verify.XunitV3" Version="31.24.1" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageVersion Include="Verify.XunitV3" Version="31.28.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.AspNet110" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.9" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Basic.Reference.Assemblies.AspNet110" Version="1.8.11" />
<PackageVersion Include="Basic.Reference.Assemblies.Net110" Version="1.8.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="11.0.0-preview.7.26381.103" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="11.0.0-preview.7.26381.103" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.7.26381.103" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.AspNet100" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.9" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageVersion Include="Basic.Reference.Assemblies.AspNet100" Version="1.8.11" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.AspNet90" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.9" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.18" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.18" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.18" />
<PackageVersion Include="Basic.Reference.Assemblies.AspNet90" Version="1.8.11" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.19" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.19" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.19" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageVersion Include="Basic.Reference.Assemblies.AspNet80" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.9" />
<PackageVersion Include="Basic.Reference.Assemblies.AspNet80" Version="1.8.11" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
</ItemGroup>

<!-- IA.Generators dependencies -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net11.0' ">
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.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 @@ -88,8 +88,8 @@

<ItemGroup>
<GlobalPackageReference Include="DotNet.ReproducibleBuilds" Version="2.0.5" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.123" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.157" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="3.0.163" PrivateAssets="All" />
<GlobalPackageReference Include="Meziantou.Polyfill" Version="1.0.160" PrivateAssets="All" />
<GlobalPackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<IsRoslynComponent>true</IsRoslynComponent>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Immediate.Apis/Immediate.Apis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@
Pack="true"
PackagePath="analyzers/dotnet/roslyn5.0/cs" />

<!-- Specifically use ns2.0 for VS -->
<TfmSpecificPackageFile
Include="../Immediate.Apis.CodeFixes/bin/$(Configuration)/net10.0/Immediate.Apis.CodeFixes.dll"
Include="../Immediate.Apis.CodeFixes/bin/$(Configuration)/netstandard2.0/Immediate.Apis.CodeFixes.dll"
Pack="true"
PackagePath="analyzers/dotnet/roslyn5.0/cs" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,34 @@ public HandleBehavior(
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped
)
{
services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime));
services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery1.Query, int>), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime));
services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime));

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery1.Handler),
typeof(global::Dummy.GetUsersQuery1.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery1.Query, int>),
typeof(global::Dummy.GetUsersQuery1.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery1.HandleBehavior),
typeof(global::Dummy.GetUsersQuery1.HandleBehavior),
lifetime
)
);

return services;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,34 @@ public HandleBehavior(
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped
)
{
services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime));
services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery2.Query, int>), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime));
services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime));

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery2.Handler),
typeof(global::Dummy.GetUsersQuery2.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery2.Query, int>),
typeof(global::Dummy.GetUsersQuery2.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery2.HandleBehavior),
typeof(global::Dummy.GetUsersQuery2.HandleBehavior),
lifetime
)
);

return services;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,34 @@ public HandleBehavior(
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped
)
{
services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime));
services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery1.Query, int>), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime));
services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime));

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery1.Handler),
typeof(global::Dummy.GetUsersQuery1.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery1.Query, int>),
typeof(global::Dummy.GetUsersQuery1.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery1.HandleBehavior),
typeof(global::Dummy.GetUsersQuery1.HandleBehavior),
lifetime
)
);

return services;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,34 @@ public HandleBehavior(
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped
)
{
services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime));
services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery2.Query, int>), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime));
services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime));

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery2.Handler),
typeof(global::Dummy.GetUsersQuery2.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Immediate.Handlers.Shared.IHandler<global::Dummy.GetUsersQuery2.Query, int>),
typeof(global::Dummy.GetUsersQuery2.Handler),
lifetime
)
);

global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd(
services,
global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe(
typeof(global::Dummy.GetUsersQuery2.HandleBehavior),
typeof(global::Dummy.GetUsersQuery2.HandleBehavior),
lifetime
)
);

return services;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing;

public static class HandlerServiceCollectionExtensions
{
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services
)
{

return services;
}

public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers(
this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services,
global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped,
Expand Down
Loading