From 80df6f5d4582674c972bb3e5af815fb9bed61d83 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Thu, 4 Apr 2024 22:23:58 +1000
Subject: [PATCH 1/4] Add workaround to enable Rider to see the Antlr3
 generated files at design time

---
 src/NHibernate/NHibernate.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 7440dc9429e..139cd86242d 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -13,6 +13,8 @@
     <PackageDescription>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</PackageDescription>
     <PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>
     <PackageReadmeFile>NHibernate.readme.md</PackageReadmeFile>
+    <!-- Workaround to enable Rider to see the Antlr3 generated files at design time -->
+    <CoreCompileDependsOn>DesignTimeGrammarCompilation;$(CoreCompileDependsOn)</CoreCompileDependsOn>
   </PropertyGroup>
   
   <ItemGroup>

From 9e58ef28e63cdcb1584b6f3025edb7973fdc7a42 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Fri, 5 Apr 2024 17:23:56 +1000
Subject: [PATCH 2/4] Reimplement workaround to not break it on VS or fresh
 Rider build

---
 src/NHibernate/NHibernate.csproj | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 139cd86242d..2a6534af7ff 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>
@@ -13,8 +13,6 @@
     <PackageDescription>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</PackageDescription>
     <PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>
     <PackageReadmeFile>NHibernate.readme.md</PackageReadmeFile>
-    <!-- Workaround to enable Rider to see the Antlr3 generated files at design time -->
-    <CoreCompileDependsOn>DesignTimeGrammarCompilation;$(CoreCompileDependsOn)</CoreCompileDependsOn>
   </PropertyGroup>
   
   <ItemGroup>
@@ -94,4 +92,11 @@
     </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"
+      Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'" />
+  </Target>
 </Project>

From 4550807048c7fcc4862e7c118cc1e85255f484a0 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Fri, 5 Apr 2024 17:43:03 +1000
Subject: [PATCH 3/4] Add ContinueOnError and sync project style

---
 .editorconfig                    | 1 +
 src/NHibernate/NHibernate.csproj | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index da812d88d1b..913babf8ff4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -44,6 +44,7 @@ indent_size = 2
 [*.csproj]
 indent_style = space
 indent_size = 2
+ij_xml_space_inside_empty_tag = true
 
 [*.vbproj]
 indent_style = space
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 2a6534af7ff..3fb89402adf 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -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" />
@@ -97,6 +97,8 @@
   <Target Name="_AntrlDesignTimeGrammarCompilationWorkaround" BeforeTargets="CoreCompile" Condition="'$(BuildingByReSharper)' == 'true'">
     <CallTarget
       Targets="AntlrCompile"
-      Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'" />
+      ContinueOnError="true"
+      Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'"
+    />
   </Target>
 </Project>

From 20327d6fed7d19698d965eca06f0b8b4dbddcc47 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Fri, 5 Apr 2024 17:44:58 +1000
Subject: [PATCH 4/4] Update settings

---
 .editorconfig | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 913babf8ff4..f0af598780e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -37,18 +37,10 @@ indent_style = tab
 indent_style = space
 indent_size = 2
 
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.csproj]
+[{*.xml,*.csproj,*.vbproj}]
 indent_style = space
 indent_size = 2
 ij_xml_space_inside_empty_tag = true
 
-[*.vbproj]
-indent_style = space
-indent_size = 2
-
 [*.g]
 indent_style = tab