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 b71e7b5d3e8..dd520651934 100644
--- a/Tools/packages.csproj
+++ b/Tools/packages.csproj
@@ -11,7 +11,6 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.2" />
     <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..6985723bd35 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -48,6 +48,9 @@
 	</target>
 
 	<target name="common.tools-restore" depends="common.init">
+		<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 b5b76109aa9..8ea8ec5e4f9 100644
--- a/default.build
+++ b/default.build
@@ -64,15 +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" />
-	</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>