Skip to content

Commit

Permalink
Removed depdency on Rocket.Surgery.DependencyInjection as the type pr… (
Browse files Browse the repository at this point in the history
#1978)

* Removed depdency on Rocket.Surgery.DependencyInjection as the type provider is not really being used any more (by conventions)

* removed IConventionFactory and replaced with a simple delegate

* all but command line

* fixed failing tests

* fixed failing tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
david-driscoll and renovate[bot] authored Dec 30, 2024
1 parent 0d29d06 commit 3fb601a
Show file tree
Hide file tree
Showing 913 changed files with 12,770 additions and 14,664 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,9 @@ dotnet_diagnostic.CA1513.severity = none
# CA1514: Avoid redundant length argument
dotnet_diagnostic.CA1514.severity = none

# CA1515: Consider making public types internal
dotnet_diagnostic.CA1515.severity = none

# CA1700: Do not name enum values 'Reserved'
dotnet_diagnostic.CA1700.severity = none
# Options: api_surface
Expand Down Expand Up @@ -3099,6 +3102,8 @@ dotnet_diagnostic.rcs9010.severity = none
# Specify ExportCodeFixProviderAttribute.Name
dotnet_diagnostic.rcs9011.severity = none

dotnet_diagnostic.RMG012.severity = error # Unmapped target member
dotnet_diagnostic.RMG020.severity = error # Unmapped source member

# Refactorings

Expand Down
15 changes: 15 additions & 0 deletions Conventions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{6DA138
.editorconfig = .build\.editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.Conventions.Serilog", "src\Conventions.Serilog\Rocket.Surgery.Conventions.Serilog.csproj", "{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -620,6 +622,18 @@ Global
{8A70E596-7382-4094-B048-EBA6D9EF2CFF}.Release|x64.Build.0 = Release|Any CPU
{8A70E596-7382-4094-B048-EBA6D9EF2CFF}.Release|x86.ActiveCfg = Release|Any CPU
{8A70E596-7382-4094-B048-EBA6D9EF2CFF}.Release|x86.Build.0 = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|x64.ActiveCfg = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|x64.Build.0 = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|x86.ActiveCfg = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Debug|x86.Build.0 = Debug|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|Any CPU.Build.0 = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|x64.ActiveCfg = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|x64.Build.0 = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|x86.ActiveCfg = Release|Any CPU
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -666,6 +680,7 @@ Global
{C996322A-61AD-49DC-997D-C8550CFDC669} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
{5A1D2C50-BDC3-4322-B6E2-E1169C4B20A9} = {DF33E0FB-9790-4654-B60F-8AB22E0CC3D1}
{8A70E596-7382-4094-B048-EBA6D9EF2CFF} = {96A0AEB7-ACFA-491C-8FA5-2A1BE4E8B718}
{ECC586BA-211A-4D60-B83B-AF8EA3943ADC} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {439897C2-CCBD-44FE-B2DC-A3E4670ADA59}
Expand Down
198 changes: 98 additions & 100 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,102 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>

<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.2.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.2.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.2.1" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.CodeFixes" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.Refactorings" Version="4.12.10" />
<GlobalPackageReference Include="Spectre.Console.Analyzer" Version="1.0.0" />
<GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
<GlobalPackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
<GlobalPackageReference Include="xunit.analyzers" Version="1.18.0" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageVersion Include="JetBrains.dotCover.CommandLineTools" Version="2024.3.3" />
<PackageVersion Include="JetBrains.ExternalAnnotations" Version="10.2.154" />
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2024.3.3" />
<PackageVersion Include="Aspire.Hosting" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Polyfill" Version="7.9.1" />
<PackageVersion Include="GitVersion.Tool" Version="6.1.0" />
<PackageVersion Include="docfx.console" Version="2.59.4" />
<PackageVersion Include="Nuke.Common" Version="9.0.3" />
<PackageVersion Include="ReportGenerator" Version="5.4.3" />
<PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="13.0.0-beta.34" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.7" />
<PackageVersion Include="Autofac" Version="9.0.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="BenchMarkDotNet" Version="0.14.0" />
<PackageVersion Include="bunit.web" Version="1.37.7" />
<PackageVersion Include="DryIoc.dll" Version="6.0.0-preview-09" />
<PackageVersion Include="DryIoc.Microsoft.DependencyInjection" Version="8.0.0-preview-04" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.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" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
<PackageVersion Include="Terminal.Gui" Version="1.17.1" />
<PackageVersion Include="Bogus" Version="35.6.1" />
<PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.49.0" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="9.0.3" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="9.0.3" />
<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.AngleSharp" Version="4.5.0" />
<PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
<PackageVersion Include="Verify.Xunit" Version="28.7.0" />
<PackageVersion Include="Verify.Playwright" Version="3.0.0" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
</ItemGroup>
<Import
Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
</Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.2.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.2.1" />
<GlobalPackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.2.1" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.CodeFixes" Version="4.12.10" />
<GlobalPackageReference Include="Roslynator.Refactorings" Version="4.12.10" />
<GlobalPackageReference Include="Spectre.Console.Analyzer" Version="1.0.0" />
<GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
<GlobalPackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" />
<GlobalPackageReference Include="xunit.analyzers" Version="1.18.0" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageVersion Include="JetBrains.dotCover.CommandLineTools" Version="2024.3.3" />
<PackageVersion Include="JetBrains.ExternalAnnotations" Version="10.2.154" />
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2024.3.3" />
<PackageVersion Include="Aspire.Hosting" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Polyfill" Version="7.9.1" />
<PackageVersion Include="GitVersion.Tool" Version="6.1.0" />
<PackageVersion Include="docfx.console" Version="2.59.4" />
<PackageVersion Include="Nuke.Common" Version="9.0.3" />
<PackageVersion Include="ReportGenerator" Version="5.4.3" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.7" />
<PackageVersion Include="Autofac" Version="9.0.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="BenchMarkDotNet" Version="0.14.0" />
<PackageVersion Include="bunit.web" Version="1.37.7" />
<PackageVersion Include="DryIoc.dll" Version="6.0.0-preview-09" />
<PackageVersion Include="DryIoc.Microsoft.DependencyInjection" Version="8.0.0-preview-04" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" 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" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
<PackageVersion Include="Terminal.Gui" Version="1.17.1" />
<PackageVersion Include="Bogus" Version="35.6.1" />
<PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.49.0" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="9.0.3" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="9.0.3" />
<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.AngleSharp" Version="4.5.0" />
<PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
<PackageVersion Include="Verify.Xunit" Version="28.7.0" />
<PackageVersion Include="Verify.Playwright" Version="3.0.0" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
</Project>
Loading

0 comments on commit 3fb601a

Please sign in to comment.