Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency Rocket.Surgery.Nuke to 2.9.7 #2428

Merged
merged 3 commits into from
Dec 21, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ jobs:
id: lintFiles
run: |
dotnet .build/bin/Debug/.build.dll --target LintFiles --skip Restore
- name: Regenerate Build Configurations
id: regenerateBuildConfigurations
run: |
dotnet .build/bin/Debug/.build.dll --target RegenerateBuildConfigurations
- name: Prettier
id: prettier
run: |
Expand All @@ -98,6 +94,10 @@ jobs:
id: jetBrainsCleanupCode
run: |
dotnet .build/bin/Debug/.build.dll --target JetBrainsCleanupCode
- name: Regenerate Build Configurations
id: regenerateBuildConfigurations
run: |
dotnet .build/bin/Debug/.build.dll --target RegenerateBuildConfigurations
- name: Generate Solution Items
id: generateSolutionItems
run: |
Expand Down
29 changes: 15 additions & 14 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>

<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
Expand Down Expand Up @@ -42,11 +43,11 @@
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageVersion Include="Polyfill" Version="7.7.1" />
<PackageVersion Include="Polyfill" Version="7.8.0" />
<PackageVersion Include="GitVersion.Tool" Version="6.1.0" />
<PackageVersion Include="Nuke.Common" Version="9.0.3" />
<PackageVersion Include="ReportGenerator" Version="5.4.1" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.6" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.7" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
Expand Down Expand Up @@ -93,6 +94,7 @@
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.12.0" />
Expand All @@ -110,14 +112,14 @@
<PackageVersion Include="Polly" Version="8.5.0" />
<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.34" />
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.1-beta.34" />
<PackageVersion Include="Rocket.Surgery.CommandLine" Version="14.0.1-beta.34" />
<PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.1-beta.34" />
<PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="13.0.0-beta.24" />
<PackageVersion Include="Rocket.Surgery.Extensions" Version="13.0.0-beta.24" />
<PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.1-beta.34" />
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.1-beta.34" />
<PackageVersion Include="Rocket.Surgery.Conventions" Version="14.0.1-beta.37" />
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="14.0.1-beta.37" />
<PackageVersion Include="Rocket.Surgery.CommandLine" Version="14.0.1-beta.37" />
<PackageVersion Include="Rocket.Surgery.Conventions.DryIoc" Version="14.0.1-beta.37" />
<PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="13.0.0-beta.26" />
<PackageVersion Include="Rocket.Surgery.Extensions" Version="13.0.0-beta.26" />
<PackageVersion Include="Rocket.Surgery.Hosting" Version="14.0.1-beta.37" />
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="14.0.1-beta.37" />
<PackageVersion Include="Scrutor" Version="5.0.2" />
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
Expand Down Expand Up @@ -164,14 +166,13 @@
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="9.0.3" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
<PackageVersion Include="Verify.Xunit" Version="28.6.0" />
<PackageVersion Include="Verify.Xunit" Version="28.6.1" />
<PackageVersion Include="Verify.NodaTime" Version="2.2.0" />
<PackageVersion Include="Verify.SystemJson" Version="1.4.1" />
<PackageVersion Include="Verify.NewtonsoftJson" Version="1.1.0" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
</ItemGroup>
<Import
Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')"
/>
Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>
<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" VersionOverride="4.6.0" PrivateAssets="all">
<Version>4.12.0</Version>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Rocket.Surgery.LaunchPad.Analyzers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Polyfill" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
<ProjectReference
Include="../Analyzers.roslyn4.6/Rocket.Surgery.LaunchPad.Analyzers.roslyn4.6.csproj"
PrivateAssets="all"
Expand Down
35 changes: 22 additions & 13 deletions src/Foundation/Conventions/OptionsConvention.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Diagnostics;
using System.Reflection;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Rocket.Surgery.Conventions;
using Rocket.Surgery.Conventions.DependencyInjection;
using Rocket.Surgery.DependencyInjection.Compiled;

namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;

Expand All @@ -12,7 +14,7 @@ namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;
[ExportConvention]
[ConventionCategory(ConventionCategory.Core)]
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.NonPublicMethods)]
[System.Diagnostics.DebuggerDisplay("{DebuggerDisplay,nq}")]
[DebuggerDisplay("{DebuggerDisplay,nq}")]
public class OptionsConvention : IServiceConvention
{
[RequiresUnreferencedCode(
Expand All @@ -23,10 +25,8 @@ public class OptionsConvention : IServiceConvention
string? name,
IConfiguration config
)
where TOptions : class
{
return services.Configure<TOptions>(name, config);
}
where TOptions : class =>
services.Configure<TOptions>(name, config);

private readonly MethodInfo _configureMethod;

Expand All @@ -35,23 +35,32 @@ IConfiguration config
/// </summary>
public OptionsConvention() => _configureMethod = GetType().GetMethod(nameof(Configure), BindingFlags.NonPublic | BindingFlags.Static)!;

[System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]
[DebuggerBrowsable(DebuggerBrowsableState.Never)]
private string DebuggerDisplay => ToString();

/// <inheritdoc />
public void Register(IConventionContext context, IConfiguration configuration, IServiceCollection services)
{
var classes = context.TypeProvider.GetTypes(
s => s.FromAssemblies()
.GetTypes(z => z.WithAttribute<RegisterOptionsConfigurationAttribute>())
);
var classes = context
.TypeProvider
.GetTypes(
s => s
.FromAssemblies()
.GetTypes(
z => z
.NotInfoOf(TypeInfoFilter.Abstract, TypeInfoFilter.Static, TypeInfoFilter.GenericType)
.WithAnyAttribute(typeof(RegisterOptionsConfigurationAttribute))
)
);

foreach (var options in classes)
{
var attribute = options.GetCustomAttribute<RegisterOptionsConfigurationAttribute>()!;
#pragma warning disable IL2060
_ = _configureMethod.MakeGenericMethod(options).Invoke(null, [services, attribute.OptionsName, configuration.GetSection(attribute.ConfigurationKey)]);
#pragma warning restore IL2060
#pragma warning disable IL2060
_ = _configureMethod
.MakeGenericMethod(options)
.Invoke(null, [services, attribute.OptionsName, configuration.GetSection(attribute.ConfigurationKey)]);
#pragma warning restore IL2060
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Polyfill" PrivateAssets="all" />
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Features" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
<ProjectReference
Include="..\..\src\AspNetCore.FluentValidation.OpenApi\Rocket.Surgery.LaunchPad.AspNetCore.FluentValidation.OpenApi.csproj"
IncludeAssets="all"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ type PageInfo {
type Query {
nodaTimeTest(inputs: NodaTimeInputsInput!): NodaTimeOutputs!
geometryTest(inputs: GeometryInputsInput!): GeometryOutputs!
launchRecords("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: LaunchRecordFilterInput @cost(weight: "10") order: [LaunchRecordSortInput!] @cost(weight: "10")): LaunchRecordsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
rockets("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: ReadyRocketFilterInput @cost(weight: "10") order: [ReadyRocketSortInput!] @cost(weight: "10")): RocketsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
launchRecords("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: LaunchRecordFilterInput @cost(weight: "10") order: [LaunchRecordSortInput!] @cost(weight: "10")): LaunchRecordsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 10, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
rockets("Returns the first _n_ elements from the list." first: Int "Returns the elements in the list that come after the specified cursor." after: String "Returns the last _n_ elements from the list." last: Int "Returns the elements in the list that come before the specified cursor." before: String where: ReadyRocketFilterInput @cost(weight: "10") order: [ReadyRocketSortInput!] @cost(weight: "10")): RocketsConnection @listSize(assumedSize: 50, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 10, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
}

"A rocket in inventory"
Expand Down Expand Up @@ -597,7 +597,7 @@ enum SortEnumType {
directive @cost("The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc." weight: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION

"The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!] "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean! = true) on FIELD_DEFINITION
directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean! = true) on FIELD_DEFINITION

"The `@specifiedBy` directive is used within the type system definition language to provide a URL for specifying the behavior of custom scalar definitions."
directive @specifiedBy("The specifiedBy URL points to a human-readable specification. This field will only read a result for scalar types." url: String!) on SCALAR
Expand Down
Loading