Merge branch 'master' of github.com:RocketSurgeonsGuild/Extensions

RocketSurgeonsGuild · Dec 25, 2024 · 644b7a2 · 644b7a2
2 parents 5e94d43 + 032cc8e
commit 644b7a2
Show file tree

Hide file tree

Showing 445 changed files with 11,837 additions and 629 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -23,7 +23,7 @@
             "rollForward": false
         },
         "jetbrains.resharper.globaltools": {
-            "version": "2024.3.2",
+            "version": "2024.3.3",
             "commands": ["jb"],
             "rollForward": false
         },
@@ -33,7 +33,7 @@
             "rollForward": false
         },
         "jetbrains.dottrace.globaltools": {
-            "version": "2024.3.2",
+            "version": "2024.3.3",
             "commands": ["dottrace"],
             "rollForward": false
         },

diff --git a/.editorconfig b/.editorconfig
@@ -2218,7 +2218,7 @@ dotnet_diagnostic.IDE0057.severity = warning
 # Options: csharp_style_prefer_range_operator
 
 # IDE0058: Remove unnecessary expression value
-dotnet_diagnostic.IDE0058.severity = none
+dotnet_diagnostic.IDE0058.severity = suggestion
 # Options: csharp_style_unused_value_expression_statement_preference, visual_basic_style_unused_value_expression_statement_preference
 
 # IDE0059: Remove unnecessary value assignment
@@ -2451,7 +2451,7 @@ roslynator_unity_code_analysis.enabled = false
 roslynator_use_anonymous_function_or_method_group = method_group
 # Applicable to: rcs1207
 
-roslynator_use_block_body_when_declaration_spans_over_multiple_lines = true
+roslynator_use_block_body_when_declaration_spans_over_multiple_lines = false
 # Applicable to: rcs1016
 
 roslynator_use_block_body_when_expression_spans_over_multiple_lines = false
@@ -4285,7 +4285,7 @@ resharper_csharp_empty_block_style = together_same_line
 resharper_csharp_insert_final_newline = true
 resharper_csharp_int_align_comments = true
 resharper_csharp_keep_nontrivial_alias = false
-resharper_csharp_max_line_length = 160
+resharper_csharp_max_line_length = 200
 resharper_csharp_naming_rule.enum_member = AaBb
 resharper_csharp_naming_rule.method_property_event = AaBb
 resharper_csharp_naming_rule.other = AaBb
@@ -4338,7 +4338,7 @@ resharper_format_leading_spaces_decl = false
 resharper_free_block_braces = next_line
 resharper_fsharp_empty_block_style = together_same_line
 resharper_fsharp_insert_final_newline = true
-resharper_fsharp_max_line_length = 160
+resharper_fsharp_max_line_length = 200
 resharper_fsharp_place_comments_at_first_column = false
 resharper_fsharp_type_declaration_braces = pico
 resharper_fsharp_wrap_lines = true
@@ -4350,7 +4350,7 @@ resharper_html_attribute_style = do_not_touch
 resharper_html_insert_final_newline = true
 resharper_html_linebreak_before_elements = body,div,p,form,h1,h2,h3
 resharper_html_max_blank_lines_between_tags = 2
-resharper_html_max_line_length = 160
+resharper_html_max_line_length = 200
 resharper_html_pi_attribute_style = on_single_line
 resharper_html_space_after_last_pi_attribute = false
 resharper_html_space_before_self_closing = false
@@ -4672,7 +4672,7 @@ resharper_static_members_qualify_with = declared_type
 resharper_stick_comment = true
 resharper_support_vs_event_naming_pattern = true
 resharper_T4_insert_final_newline = true
-resharper_T4_max_line_length = 160
+resharper_T4_max_line_length = 200
 resharper_T4_wrap_lines = true
 resharper_toplevel_function_declaration_return_type_style = do_not_change
 resharper_toplevel_function_definition_return_type_style = do_not_change
@@ -4735,7 +4735,7 @@ resharper_xmldoc_attribute_style = on_single_line
 resharper_xmldoc_insert_final_newline = true
 resharper_xmldoc_linebreak_before_elements = summary,remarks,example,returns,param,typeparam,value,para
 resharper_xmldoc_max_blank_lines_between_tags = 0
-resharper_xmldoc_max_line_length = 160
+resharper_xmldoc_max_line_length = 200
 resharper_xmldoc_pi_attribute_style = on_single_line
 resharper_xmldoc_space_after_last_pi_attribute = true
 resharper_xmldoc_space_before_self_closing = true
@@ -4747,7 +4747,7 @@ resharper_xml_attribute_style = do_not_touch
 resharper_xml_insert_final_newline = true
 resharper_xml_linebreak_before_elements =
 resharper_xml_max_blank_lines_between_tags = 2
-resharper_xml_max_line_length = 160
+resharper_xml_max_line_length = 200
 resharper_xml_pi_attribute_style = do_not_touch
 resharper_xml_space_after_last_pi_attribute = false
 resharper_xml_space_before_self_closing = true

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,12 @@
 {
     "coverage-gutters.customizable.status-bar-toggler-watchCoverageAndVisibleEditors-enabled": true,
-    "coverage-gutters.coverageFileNames": ["coverage/coverage.info"],
+    "coverage-gutters.coverageFileNames": [
+        "coverage/coverage.info"
+    ],
     "coverage-gutters.showGutterCoverage": true,
     "coverage-gutters.showRulerCoverage": true,
-    "languageServerExample.maxNumberOfProblems": 60
-}
+    "languageServerExample.maxNumberOfProblems": 60,
+    "csharp.preview.improvedLaunchExperience": true,
+    "dotnet.automaticallySyncWithActiveItem": true,
+    "dotnet.testWindow.useTestingPlatformProtocol": true
+}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -23,7 +23,7 @@
         <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.2" />
+        <PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2024.3.3" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
         <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
@@ -54,7 +54,7 @@
         <PackageVersion Include="System.Reactive.Observable.Aliases" Version="6.0.1" />
         <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
         <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
-        <PackageVersion Include="Scrutor" Version="5.0.3" />
+        <PackageVersion Include="Scrutor" Version="5.1.0" />
         <PackageVersion Include="Bogus" Version="35.6.1" />
         <PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
         <PackageVersion Include="FakeItEasy" Version="8.3.0" />

diff --git a/Extensions.sln.DotSettings b/Extensions.sln.DotSettings
@@ -313,4 +313,6 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/UnitTesting/CaptureOutputInternal/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestRunner/LoggingInternal/@EntryValue">VERBOSE</s:String>
 </wpf:ResourceDictionary>
diff --git a/src/DependencyInjection.Analyzers/AssemblyProviders/TypeSymbolVisitor.cs b/src/DependencyInjection.Analyzers/AssemblyProviders/TypeSymbolVisitor.cs
@@ -21,13 +21,6 @@ protected override bool FoundNamedType(INamedTypeSymbol symbol)
 
 internal static class TypeSymbolVisitorExtensions
 {
-    public static ImmutableList<INamedTypeSymbol> GetTypes(this TypeSymbolVisitor visitor, Compilation compilation)
-    {
-        GetReferencedTypes(visitor, compilation);
-        GetCompilationTypes(visitor, compilation);
-        return visitor.GetTypes(compilation);
-    }
-
     public static TypeSymbolVisitor GetReferencedTypes(this TypeSymbolVisitor visitor, Compilation compilation)
     {
         foreach (var symbol in compilation.References.Select(compilation.GetAssemblyOrModuleSymbol))
@@ -51,4 +44,10 @@ public static TypeSymbolVisitor GetCompilationTypes(this TypeSymbolVisitor visit
         compilation.Assembly.Accept(visitor);
         return visitor;
     }
+
+    public static TypeSymbolVisitor GetReferencedTypes(this TypeSymbolVisitor visitor, IAssemblySymbol assemblySymbol)
+    {
+        assemblySymbol.Accept(visitor);
+        return visitor;
+    }
 }
diff --git a/src/DependencyInjection.Analyzers/CompiledServiceScanningGenerator.cs b/src/DependencyInjection.Analyzers/CompiledServiceScanningGenerator.cs
@@ -37,15 +37,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                                             var source = text.GetText()?.ToString();
                                             if (source is not { Length: > 100 })
                                             {
-                                                return ( path: Path.GetFileName(text.Path), source: new(
-                                                             [],
-                                                             [],
-                                                             [],
-                                                             [],
-                                                             [],
-                                                             [],
-                                                             []
-                                                         ) );
+                                                return ( path: Path.GetFileName(text.Path), source: new([], [], [], []) );
                                             }
 
                                             return ( path: Path.GetFileName(text.Path),
@@ -117,20 +109,25 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 reflectionRequests = reflectionRequests.AddRange(resolvedData.InternalReflectionRequests);
                 serviceDescriptorRequests = serviceDescriptorRequests.AddRange(resolvedData.InternalServiceDescriptorRequests);
 
-                var assemblySources = AssemblyCollection.ResolveSources(request.compilation, diagnostics, assemblyRequests, privateAssemblies);
+                var assemblySources = AssemblyCollection.ResolveSources(
+                    request.compilation,
+                    diagnostics,
+                    assemblyRequests,
+                    privateAssemblies
+                );
                 var reflectionSources = ReflectionCollection.ResolveSources(
                     request.compilation,
                     diagnostics,
                     reflectionRequests,
-                    privateAssemblies,
-                    (c, visitor) => visitor.GetCompilationTypes(c)
+                    request.compilation.Assembly,
+                    privateAssemblies
                 );
                 var serviceDescriptorSources = ServiceDescriptorCollection.ResolveSources(
                     request.compilation,
                     diagnostics,
                     serviceDescriptorRequests,
-                    privateAssemblies,
-                    (c, visitor) => visitor.GetCompilationTypes(c)
+                    request.compilation.Assembly,
+                    privateAssemblies
                 );
 
                 assemblySources = assemblySources.AddRange(resolvedData.AssemblySources);