diff --git a/.editorconfig b/.editorconfig
index da812d88d1..f0af598780 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -37,17 +37,10 @@ indent_style = tab
 indent_style = space
 indent_size = 2
 
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.csproj]
-indent_style = space
-indent_size = 2
-
-[*.vbproj]
+[{*.xml,*.csproj,*.vbproj}]
 indent_style = space
 indent_size = 2
+ij_xml_space_inside_empty_tag = true
 
 [*.g]
 indent_style = tab
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 7440dc9429..3fb89402ad 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../build-common/NHibernate.props" />
 
   <PropertyGroup>
@@ -14,7 +14,7 @@
     <PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>
     <PackageReadmeFile>NHibernate.readme.md</PackageReadmeFile>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <None Remove="**\*.g" />
     <None Remove="**\*.xsd" />
@@ -92,4 +92,13 @@
     </Content>
     <None Include="../../logo/NHibernate-NuGet.png" Pack="true" PackagePath="/" />
   </ItemGroup>
+
+  <!-- Workaround to enable Rider to see the Antlr3 generated files at design time -->
+  <Target Name="_AntrlDesignTimeGrammarCompilationWorkaround" BeforeTargets="CoreCompile" Condition="'$(BuildingByReSharper)' == 'true'">
+    <CallTarget
+      Targets="AntlrCompile"
+      ContinueOnError="true"
+      Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'"
+    />
+  </Target>
 </Project>