Skip to content

Commit

Permalink
wired in categories and dep updates (#2295)
Browse files Browse the repository at this point in the history
* wired in categories and dep updates

* Automatically linting code

* fixed failing tests

* whoops

* Automatically linting code

---------

Co-authored-by: Rocket Understudy <33589210+rsg-bot@users.noreply.github.com>
  • Loading branch information
david-driscoll and rsg-bot authored Oct 22, 2024
1 parent 031bb98 commit e86bf2a
Show file tree
Hide file tree
Showing 64 changed files with 364 additions and 253 deletions.
107 changes: 53 additions & 54 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<PackageVersion Include="xunit.analyzers" Version="1.16.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageVersion Include="JetBrains.ExternalAnnotations" Version="10.2.153" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.1" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.9.1" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageVersion Include="Polyfill" Version="7.0.0" />
<PackageVersion Include="GitVersion.Tool" Version="6.0.3" />
Expand All @@ -41,73 +41,72 @@
<PackageVersion Include="Grpc.AspNetCore" Version="2.66.0" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
<PackageVersion Include="HotChocolate" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Abstractions" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Data" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Diagnostics" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Execution.Abstractions" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Data.EntityFramework" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Data.Spatial" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Types.Analyzers" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Types.CursorPagination" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Types.OffsetPagination" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Types.NodaTime" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate.Types.Spatial" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Transport.Http" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Core" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Server" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Maui" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Blazor" Version="14.0.0-rc.2" />
<PackageVersion Include="StrawberryShake.Razor" Version="14.0.0-rc.2" />
<PackageVersion Include="HotChocolate" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Abstractions" Version="14.0.0" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Data" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Diagnostics" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Execution.Abstractions" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Data.EntityFramework" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Data.Spatial" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Types.Analyzers" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Types.CursorPagination" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Types.OffsetPagination" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Types.NodaTime" Version="14.0.0" />
<PackageVersion Include="HotChocolate.Types.Spatial" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Transport.Http" Version="14.0.0" />
<PackageVersion Include="StrawberryShake" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Core" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Server" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Maui" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Blazor" Version="14.0.0" />
<PackageVersion Include="StrawberryShake.Razor" Version="14.0.0" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" />
<PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
<PackageVersion Include="MicroElements.Swashbuckle.FluentValidation" Version="6.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NetTopologySuite" Version="2.5.0" />
<PackageVersion Include="NetTopologySuite.Features" Version="2.2.0" />
<PackageVersion Include="NetTopologySuite.IO.GeoJSON4STJ" Version="4.0.0" />
<PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
<PackageVersion Include="NodaTime" Version="3.1.12" />
<PackageVersion Include="NodaTime" Version="3.2.0" />
<PackageVersion Include="NodaTime.Serialization.JsonNet" Version="3.1.0" />
<PackageVersion Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
<PackageVersion Include="NodaTime.Testing" Version="3.1.12" />
<PackageVersion Include="NodaTime.Testing" Version="3.2.0" />
<PackageVersion Include="Polly" Version="8.4.2" />
<PackageVersion Include="StronglyTypedId" Version="1.0.0-beta08" />
<PackageVersion Include="Rocket.Surgery.Build.Information" Version="3.3.11" />
<PackageVersion Include="Rocket.Surgery.Conventions" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.CommandLine" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.Conventions.DependencyModel" Version="14.0.1-beta.14" />
<PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.Conventions" Version="14.0.1-beta.16" />
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.1-beta.16" />
<PackageVersion Include="Rocket.Surgery.CommandLine" Version="14.0.1-beta.16" />
<PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.1-beta.16" />
<PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="12.2.1" />
<PackageVersion Include="Rocket.Surgery.Extensions" Version="12.2.1" />
<PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.1-beta.15" />
<PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.1-beta.16" />
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.1-beta.16" />
<PackageVersion Include="Scrutor" Version="5.0.1" />
<PackageVersion Include="Serilog" Version="4.0.2" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.3" />
Expand All @@ -124,20 +123,20 @@
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
<PackageVersion Include="Serilog.Enrichers.Span" Version="3.1.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.8.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.8.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.9.0" />
<PackageVersion Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="8.0.1" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Interactive" Version="6.0.1" />
<PackageVersion Include="System.Interactive.Async" Version="6.0.1" />
<PackageVersion Include="System.Reactive" Version="6.0.1" />
<PackageVersion Include="System.Reactive.Observable.Aliases" Version="6.0.1" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
<PackageVersion Include="NSwag.ApiDescription.Client" Version="14.1.0" />
<PackageVersion Include="Riok.Mapperly" Version="4.0.0" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.10" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.10" />
<PackageVersion Include="OpenTelemetry" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand All @@ -155,9 +154,9 @@
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="8.1.0-next.1" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="Verify.Xunit" Version="26.6.0" />
<PackageVersion Include="Verify.Xunit" Version="27.0.1" />
<PackageVersion Include="Verify.NodaTime" Version="2.2.0" />
<PackageVersion Include="Verify.SystemJson" Version="1.3.1" />
<PackageVersion Include="Verify.SystemJson" Version="1.4.0" />
<PackageVersion Include="Verify.NewtonsoftJson" Version="1.1.0" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
<PackageReference Include="Polyfill" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="4.6.0"
PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="4.6.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<Using Remove="System.Diagnostics.CodeAnalysis.NotNullAttribute" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
/// <seealso cref="IServiceConvention" />
[PublicAPI]
[ExportConvention]
[ConventionCategory(ConventionCategory.Application)]
public class NewtonsoftJsonConvention : IServiceConvention
{
private readonly FoundationOptions _options;
Expand Down Expand Up @@ -54,4 +55,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
)
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
/// </summary>
[PublicAPI]
[ExportConvention]
[ConventionCategory(ConventionCategory.Application)]
public class AspNetCoreSpatialConvention : IServiceConvention
{
/// <inheritdoc />
Expand Down
3 changes: 2 additions & 1 deletion src/AspNetCore/Conventions/AspNetCoreConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
/// <seealso cref="IServiceConvention" />
[PublicAPI]
[ExportConvention]
[ConventionCategory(ConventionCategory.Application)]
public class AspNetCoreConvention : IServiceConvention
{
internal static void PopulateDefaultParts(
Expand Down Expand Up @@ -123,4 +124,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
}
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public class AspNetCoreConventionInstrumentationConvention : IOpenTelemetryConvention
{
/// <inheritdoc />
Expand All @@ -24,4 +25,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
builder.WithTracing(b => b.AddAspNetCoreInstrumentation(options => options.RecordException = true));
builder.WithMetrics(b => b.AddAspNetCoreInstrumentation());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[BeforeConvention(typeof(Foundation.Conventions.FluentValidationConvention))]
[ConventionCategory(ConventionCategory.Application)]
public class AspNetCoreValidationBehaviorConvention : ISetupConvention
{
/// <inheritdoc />
Expand Down
3 changes: 2 additions & 1 deletion src/AspNetCore/Conventions/FluentValidationConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public partial class FluentValidationConvention : IServiceConvention
{
private static void AddFluentValidationRules(IServiceCollection services)
Expand Down Expand Up @@ -133,4 +134,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I

// AddFluentValidationRules(services);
}
}
}
3 changes: 2 additions & 1 deletion src/AspNetCore/Conventions/ProblemDetailsConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public class ProblemDetailsConvention : IServiceConvention
{
/// <inheritdoc />
Expand Down Expand Up @@ -82,4 +83,4 @@ out var clientErrorData
}
);
}
}
}
1 change: 1 addition & 0 deletions src/AspNetCore/Conventions/RestfulConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public class RestfulConvention : IServiceConvention
{
/// <inheritdoc />
Expand Down
3 changes: 2 additions & 1 deletion src/AspNetCore/Conventions/SwashbuckleConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public partial class SwashbuckleConvention : IServiceConvention
{
[LoggerMessage(
Expand Down Expand Up @@ -139,4 +140,4 @@ string schemaIdSelector(Type type)
}
);
}
}
}
3 changes: 2 additions & 1 deletion src/AspNetCore/Conventions/SystemJsonTextConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace Rocket.Surgery.LaunchPad.AspNetCore.Conventions;
[PublicAPI]
[ExportConvention]
[AfterConvention(typeof(AspNetCoreConvention))]
[ConventionCategory(ConventionCategory.Application)]
public class SystemJsonTextConvention : IServiceConvention
{
private readonly FoundationOptions _options;
Expand Down Expand Up @@ -56,4 +57,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
.Create(nameof(HttpJsonOptions))
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;
/// </summary>
[PublicAPI]
[ExportConvention]
[ConventionCategory(ConventionCategory.Core)]
public class NewtonsoftJsonConvention : IServiceConvention, ISerilogConvention
{
/// <inheritdoc />
Expand Down Expand Up @@ -44,4 +45,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
)
);
}
}
}
1 change: 1 addition & 0 deletions src/Foundation/Conventions/DefaultConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;
/// <seealso cref="IServiceConvention" />
[PublicAPI]
[ExportConvention]
[ConventionCategory(ConventionCategory.Core)]
public class DefaultConvention : IServiceConvention
{
/// <summary>
Expand Down
3 changes: 2 additions & 1 deletion src/Foundation/Conventions/FluentValidationConvention.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;
[ExportConvention]
[AfterConvention(typeof(MediatRConvention))]
[AfterConvention(typeof(HealthChecksConvention))]
[ConventionCategory(ConventionCategory.Core)]
public class FluentValidationConvention : IServiceConvention
{
private readonly FoundationOptions _options;
Expand Down Expand Up @@ -90,4 +91,4 @@ public void Register(IConventionContext context, IConfiguration configuration, I
ServiceDescriptor.Describe(typeof(IStreamPipelineBehavior<,>), typeof(ValidationStreamPipelineBehavior<,>), _options.MediatorLifetime)
);
}
}
}
Loading

0 comments on commit e86bf2a

Please sign in to comment.