From ffb552310e827a44de63fe0d3312cf27352667df Mon Sep 17 00:00:00 2001
From: maca88 <bostjan.markezic@siol.net>
Date: Mon, 13 Apr 2020 01:15:41 +0200
Subject: [PATCH 1/3] Upgrade AsyncGenerator to 0.19.1

---
 Tools/packages.csproj   |  2 +-
 build-common/common.xml | 19 ++++++++++++++++++-
 default.build           |  8 +++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Tools/packages.csproj b/Tools/packages.csproj
index b71e7b5d3e8..5a52d1d1aa9 100644
--- a/Tools/packages.csproj
+++ b/Tools/packages.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.2" />
+    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.19.1" />
     <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
     <PackageReference Include="GitReleaseManager" Version="0.11.0" />
diff --git a/build-common/common.xml b/build-common/common.xml
index f8a9b13057b..a636142c16a 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -47,10 +47,27 @@
 		<property name="tools.dir" value="${root.dir}/Tools"/>
 	</target>
 
-	<target name="common.tools-restore" depends="common.init">
+	<target name="common.tools-restore" depends="common.init common.get-dotnet-version">
 		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
 			<arg line="restore ./packages.csproj --packages ." />
 		</exec> 
 	</target>
 
+	<target name="common.get-dotnet-version">
+		<property name="dotnet.version.file" value="${root.dir}/Tools/dotnet.version" />
+		<exec workingdir="${root.dir}/Tools" program="dotnet" output="${dotnet.version.file}">
+			<arg line="--version" />
+		</exec>
+		<loadfile file="${dotnet.version.file}" property="dotnet.version.content" />
+		<delete file="${dotnet.version.file}" />
+		<echo message="dotnet version: ${string::trim(dotnet.version.content)}" />
+		<if test="${string::index-of(dotnet.version.content, '-') == -1}">
+			<property name="dotnet.version" value="${version::parse(string::trim(dotnet.version.content))}" />
+		</if>
+		<!-- For preview versions we have to substring until - character. Example: 5.0.100-preview.2.20176.6  -->
+		<if test="${string::index-of(dotnet.version.content, '-') != -1}">
+			<property name="dotnet.version" value="${version::parse(string::trim(string::substring(dotnet.version.content, 0, string::index-of(dotnet.version.content, '-'))))}" />
+		</if>
+	</target>
+
 </project>
diff --git a/default.build b/default.build
index b5b76109aa9..41e4469ea17 100644
--- a/default.build
+++ b/default.build
@@ -67,7 +67,13 @@
 	<target name="find-async-generator-console">
 		<property name="tool.id" value="CSharpAsyncGenerator.CommandLine" />
 		<call target="get-tool-info" />
-		<property name="async-generator-console"  value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
+		<property name="async-generator-console" value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
+		<if test="${version::get-major(version::parse(dotnet.version)) == 3}">
+			<property name="async-generator-console" value="${tool.path}tools/netcoreapp3.1/AsyncGenerator.CommandLine.dll" />
+		</if>
+		<if test="${version::get-major(version::parse(dotnet.version)) >= 5}">
+			<property name="async-generator-console" value="${tool.path}tools/net5.0/AsyncGenerator.CommandLine.dll" />
+		</if>
 	</target>
 
 	<target name="generate-async" depends="solution-restore find-async-generator-console">

From fca2660ff0a383a4fde12265db9a32867dc0ef18 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Tue, 17 Nov 2020 13:41:32 +1300
Subject: [PATCH 2/3] Use as tool

---
 .config/dotnet-tools.json | 12 ++++++++++++
 ShowBuildMenu.sh          | 27 +++------------------------
 Tools/packages.csproj     |  1 -
 build-common/common.xml   |  3 +++
 default.build             | 16 ++--------------
 5 files changed, 20 insertions(+), 39 deletions(-)
 create mode 100644 .config/dotnet-tools.json

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000000..529caf149f7
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpasyncgenerator.tool": {
+      "version": "0.19.1",
+      "commands": [
+        "async-generator"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/ShowBuildMenu.sh b/ShowBuildMenu.sh
index 9d98d5473c8..066cfae5ac4 100755
--- a/ShowBuildMenu.sh
+++ b/ShowBuildMenu.sh
@@ -178,36 +178,15 @@ testRun(){
 }
 
 generateAsync(){
-	dotnet restore ./src/NHibernate.sln
-
-	getAsyncGeneratorPath
 	cd src
-	dotnet ../"$async_generator_path"
+	dotnet tool restore
+	dotnet restore ./NHibernate.sln
+	dotnet async-generator
 	cd ..
 
 	mainMenu
 }
 
-getAsyncGeneratorPath(){
-	if [ "$async_generator_path" ]
-	then
-		return
-	fi
-
-	cd Tools
-
-	async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
-	async_generator_path="csharpasyncgenerator.commandline/$async_generator_version/tools"
-
-	if [ ! -d $async_generator_path ]
-	then
-		dotnet restore "./packages.csproj" --packages .
-	fi
-
-	async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
-	cd ..
-}
-
 mainMenu() {
 	echo  "========================= NHIBERNATE BUILD MENU =========================="
 	echo  "--- TESTING ---"
diff --git a/Tools/packages.csproj b/Tools/packages.csproj
index 5a52d1d1aa9..dd520651934 100644
--- a/Tools/packages.csproj
+++ b/Tools/packages.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.19.1" />
     <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
     <PackageReference Include="GitReleaseManager" Version="0.11.0" />
diff --git a/build-common/common.xml b/build-common/common.xml
index a636142c16a..d283e923e81 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -48,6 +48,9 @@
 	</target>
 
 	<target name="common.tools-restore" depends="common.init common.get-dotnet-version">
+		<exec workingdir="${root.dir}" program="dotnet" verbose="true">
+			<arg line="tool restore" />
+		</exec> 
 		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
 			<arg line="restore ./packages.csproj --packages ." />
 		</exec> 
diff --git a/default.build b/default.build
index 41e4469ea17..8ea8ec5e4f9 100644
--- a/default.build
+++ b/default.build
@@ -64,21 +64,9 @@
 		<property name="tool.path" value="${tools.dir}/${tool.id}/${tool.version}/" />
 	</target>
 
-	<target name="find-async-generator-console">
-		<property name="tool.id" value="CSharpAsyncGenerator.CommandLine" />
-		<call target="get-tool-info" />
-		<property name="async-generator-console" value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
-		<if test="${version::get-major(version::parse(dotnet.version)) == 3}">
-			<property name="async-generator-console" value="${tool.path}tools/netcoreapp3.1/AsyncGenerator.CommandLine.dll" />
-		</if>
-		<if test="${version::get-major(version::parse(dotnet.version)) >= 5}">
-			<property name="async-generator-console" value="${tool.path}tools/net5.0/AsyncGenerator.CommandLine.dll" />
-		</if>
-	</target>
-
-	<target name="generate-async" depends="solution-restore find-async-generator-console">
+	<target name="generate-async" depends="solution-restore">
 		<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
-			<arg line=".${async-generator-console}" />
+			<arg line="async-generator" />
 		</exec> 
 	</target>
 

From 60b9df3f84a3bfc2aadd401a3db62482bf01e18e Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <hazzik@gmail.com>
Date: Tue, 17 Nov 2020 13:44:57 +1300
Subject: [PATCH 3/3] Remove unused code

---
 build-common/common.xml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index d283e923e81..6985723bd35 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -47,7 +47,7 @@
 		<property name="tools.dir" value="${root.dir}/Tools"/>
 	</target>
 
-	<target name="common.tools-restore" depends="common.init common.get-dotnet-version">
+	<target name="common.tools-restore" depends="common.init">
 		<exec workingdir="${root.dir}" program="dotnet" verbose="true">
 			<arg line="tool restore" />
 		</exec> 
@@ -56,21 +56,4 @@
 		</exec> 
 	</target>
 
-	<target name="common.get-dotnet-version">
-		<property name="dotnet.version.file" value="${root.dir}/Tools/dotnet.version" />
-		<exec workingdir="${root.dir}/Tools" program="dotnet" output="${dotnet.version.file}">
-			<arg line="--version" />
-		</exec>
-		<loadfile file="${dotnet.version.file}" property="dotnet.version.content" />
-		<delete file="${dotnet.version.file}" />
-		<echo message="dotnet version: ${string::trim(dotnet.version.content)}" />
-		<if test="${string::index-of(dotnet.version.content, '-') == -1}">
-			<property name="dotnet.version" value="${version::parse(string::trim(dotnet.version.content))}" />
-		</if>
-		<!-- For preview versions we have to substring until - character. Example: 5.0.100-preview.2.20176.6  -->
-		<if test="${string::index-of(dotnet.version.content, '-') != -1}">
-			<property name="dotnet.version" value="${version::parse(string::trim(string::substring(dotnet.version.content, 0, string::index-of(dotnet.version.content, '-'))))}" />
-		</if>
-	</target>
-
 </project>