ReSharper cleanup

sorensenmatias · Mar 3, 2024 · 5aaca93 · 5aaca93
1 parent 5a5486d
commit 5aaca93
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 74 deletions.
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,39 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <AssemblyName>ServiceProviderValidationExtensions.Tests</AssemblyName>
-    <RootNamespace>ServiceProviderValidationExtensions.Tests</RootNamespace>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-    <LangVersion>11.0</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <PropertyGroup>
+        <AssemblyName>ServiceProviderValidationExtensions.Tests</AssemblyName>
+        <RootNamespace>ServiceProviderValidationExtensions.Tests</RootNamespace>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <LangVersion>11.0</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
 
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"
+                          Condition="'$(TargetFramework)' == 'net8.0'" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"
+                          Condition="'$(TargetFramework)' == 'net8.0'" />
     </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\src\ServiceProviderValidationExtensions.Hosting\ServiceProviderValidationExtensions.Hosting.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference
+            Include="..\src\ServiceProviderValidationExtensions.Hosting\ServiceProviderValidationExtensions.Hosting.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/...ceProviderValidationExtensions.Hosting/ServiceProviderValidationExtensions.Hosting.csproj b/...ceProviderValidationExtensions.Hosting/ServiceProviderValidationExtensions.Hosting.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ServiceProviderValidationExtensions\ServiceProviderValidationExtensions.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\ServiceProviderValidationExtensions\ServiceProviderValidationExtensions.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/ServiceProviderValidationExtensions/Internal/Persistence.cs b/src/ServiceProviderValidationExtensions/Internal/Persistence.cs
@@ -42,7 +42,7 @@ private static ValidationRegistrations CreateAndPersistInstance(IServiceCollecti
         return services[0].ImplementationInstance as ValidationRegistrations;
     }
 
-    
+
     private static (ValidationRegistrations validationRegistrations, ServiceDescriptor serviceDescriptor)? SearchForValidationRegistrations(IServiceCollection services)
     {
         var serviceDescriptor = services.FirstOrDefault(sd => sd.ImplementationInstance is ValidationRegistrations);

diff --git a/src/ServiceProviderValidationExtensions/Internal/TypeExtensions.cs b/src/ServiceProviderValidationExtensions/Internal/TypeExtensions.cs
@@ -8,10 +8,12 @@ public static bool IsDerivedFromGenericParent(this Type? type, Type parentType)
         {
             throw new ArgumentException("type must be generic", nameof(parentType));
         }
+
         if (type == null || type == typeof(object))
         {
             return false;
         }
+
         if (type.IsGenericType && type.GetGenericTypeDefinition() == parentType)
         {
             return true;

diff --git a/src/ServiceProviderValidationExtensions/ReportConfigurer.cs b/src/ServiceProviderValidationExtensions/ReportConfigurer.cs
@@ -5,9 +5,14 @@ namespace ServiceProviderValidationExtensions;
 
 public sealed class ReportConfigurer : IReportConfigurer
 {
-    private Action<DuplicateServiceContent>? _duplicateServiceAction;
     private readonly IList<Type> _duplicateServiceExclusions = new List<Type>();
-
+    private Action<DuplicateServiceContent>? _duplicateServiceAction;
+
+    public void Report(IServiceCollection serviceCollection)
+    {
+        ReportDuplicateServices(serviceCollection);
+    }
+
     public ReportConfigurer OnDuplicateService(Action<DuplicateServiceContent> action,
         Action<ReportingDuplicateServiceConfiguration>? configuration = null)
     {
@@ -16,35 +21,8 @@ public ReportConfigurer OnDuplicateService(Action<DuplicateServiceContent> actio
         {
             configuration(new ReportingDuplicateServiceConfiguration(this));
         }
-
-        return this;
-    }
-
-    public sealed class ReportingDuplicateServiceConfiguration
-    {
-        private readonly ReportConfigurer _reportConfigurer;
-
-        internal ReportingDuplicateServiceConfiguration(ReportConfigurer reportConfigurer)
-        {
-            _reportConfigurer = reportConfigurer;
-        }
-
-        public ReportingDuplicateServiceConfiguration Except<T>()
-        {
-            _reportConfigurer._duplicateServiceExclusions.Add(typeof(T));
-            return this;
-        }
-
-        public ReportingDuplicateServiceConfiguration Except(Type type)
-        {
-            _reportConfigurer._duplicateServiceExclusions.Add(type);
-            return this;
-        }
-    }
 
-    public void Report(IServiceCollection serviceCollection)
-    {
-        ReportDuplicateServices(serviceCollection);
+        return this;
     }
 
     private void ReportDuplicateServices(IServiceCollection serviceCollection)
@@ -91,6 +69,28 @@ private void ReportDuplicateServices(IServiceCollection serviceCollection)
         }
     }
 
+    public sealed class ReportingDuplicateServiceConfiguration
+    {
+        private readonly ReportConfigurer _reportConfigurer;
+
+        internal ReportingDuplicateServiceConfiguration(ReportConfigurer reportConfigurer)
+        {
+            _reportConfigurer = reportConfigurer;
+        }
+
+        public ReportingDuplicateServiceConfiguration Except<T>()
+        {
+            _reportConfigurer._duplicateServiceExclusions.Add(typeof(T));
+            return this;
+        }
+
+        public ReportingDuplicateServiceConfiguration Except(Type type)
+        {
+            _reportConfigurer._duplicateServiceExclusions.Add(type);
+            return this;
+        }
+    }
+
     public sealed class DuplicateServiceContent
     {
         public DuplicateServiceContent(TypeInfo serviceType, IReadOnlyCollection<TypeInfo> implementationTypes)

diff --git a/src/ServiceProviderValidationExtensions/ServiceCollectionValidationExtensions.cs b/src/ServiceProviderValidationExtensions/ServiceCollectionValidationExtensions.cs
@@ -171,7 +171,7 @@ public static void Validate(this IServiceProvider serviceProvider)
     }
 
     /// <summary>
-    ///     Marks the <see cref="TService"/> as exclusive (only one registration can exist in the ServiceProvider).
+    ///     Marks the <see cref="TService" /> as exclusive (only one registration can exist in the ServiceProvider).
     /// </summary>
     public static IServiceCollection SetExclusiveService<TService>(this IServiceCollection services)
         where TService : class
@@ -197,7 +197,8 @@ private static void RegisterExclusiveService<TService>(this IServiceCollection s
     }
 
     /// <summary>
-    ///     Marks the (<see cref="TService"/>,<see cref="TImplementation"/>) combination as exclusive (only one registration can exist in the ServiceProvider). 
+    ///     Marks the (<see cref="TService" />,<see cref="TImplementation" />) combination as exclusive (only one registration
+    ///     can exist in the ServiceProvider).
     /// </summary>
     public static void SetExclusiveImplementation<TService, TImplementation>(this IServiceCollection services)
         where TImplementation : class

diff --git a/src/ServiceProviderValidationExtensions/ServiceProviderValidationExtensions.csproj b/src/ServiceProviderValidationExtensions/ServiceProviderValidationExtensions.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-  </ItemGroup>
-
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    </ItemGroup>
+
 </Project>
-Original file line number
+Diff line change
@@ Expand Up @@
             return services[0].ImplementationInstance as ValidationRegistrations;
         }
         private static (ValidationRegistrations validationRegistrations, ServiceDescriptor serviceDescriptor)? SearchForValidationRegistrations(IServiceCollection services)
         {
             var serviceDescriptor = services.FirstOrDefault(sd => sd.ImplementationInstance is ValidationRegistrations);
@@ Expand Down @@