diff --git a/src/.editorconfig b/src/.editorconfig
index 985a5a0f68..93f8735873 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -374,3 +374,7 @@ dotnet_naming_style.camel_case.required_prefix =
 dotnet_naming_style.camel_case.required_suffix =
 dotnet_naming_style.camel_case.word_separator =
 dotnet_naming_style.camel_case.capitalization = camel_case
+
+# Silence Rider diagnostics that sometimes conflict with Roslyn analyzers
+resharper_arrange_redundant_parentheses_highlighting = none
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index cb3436b7a2..3291fe2654 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -31,4 +31,8 @@
     <SourceRoot Include="$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory)..\))" />
   </ItemGroup>
 
+  <ItemGroup>
+   <ProjectCapability Include="DynamicFileNestingEnabled" />
+  </ItemGroup>
+
 </Project>