Add packages.csproj for AsyncGenerator to avoid using nuget

Author: maca88

ShowBuildMenu.sh

@@ -10,6 +10,7 @@ LIB_FILES2=""
 CURRENT_CONFIGURATION="./current-test-configuration"
 OPTION=0
 async_generator_path=""
+async_generator_version=""
 
 if [ ! -f $BUILD_TOOL_PATH ]
 then
@@ -177,7 +178,7 @@ generateAsync(){
 
 	getAsyncGeneratorPath
 	cd src
-	dotnet ../"$async_generator_path"
+	dotnet "$async_generator_path"
 	cd ..
 
 	mainMenu
@@ -191,19 +192,15 @@ getAsyncGeneratorPath(){
 
 	cd Tools
 
-	if [ ! -f nuget.exe ]
-	then
-		wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-	fi
-
-	async_generator_path="CSharpAsyncGenerator.CommandLine.$(cat packages.config | grep id=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)/tools"
+	async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
+	async_generator_path="$HOME/.nuget/packages/csharpasyncgenerator.commandline/$async_generator_version/tools"
 
 	if [ ! -d $async_generator_path ]
 	then
-		mono nuget.exe install
+		dotnet restore "./packages.csproj"
 	fi
 
-	async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
+	async_generator_path="$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
 	cd ..
 }
 

Tools/.gitignore

@@ -4,3 +4,4 @@ vswhere.*
 CSharpAsyncGenerator.CommandLine.*
 gitreleasemanager.*
 SQLitePCLRaw.core.*
+obj/

Tools/packages.config

@@ -7,7 +7,6 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.6" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.16.2" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="GitReleaseManager" version="0.7.0" targetFramework="net461" />
 </packages>

Tools/packages.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="**\*" />
+    <EmbeddedResource Remove="**\*" />
+    <None Remove="**\*" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.16.2" />
+  </ItemGroup>
+  
+</Project>

build-common/common.xml

@@ -45,4 +45,10 @@
 		</exec>
 	</target>
 
+	<target name="common.tools-restore" depends="common.init">
+		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
+			<arg line="restore ./packages.csproj" />
+		</exec> 
+	</target>
+
 </project>

default.build

@@ -54,6 +54,14 @@
 		</exec> 
 	</target>
 
+	<target name="get-tool-path" depends="common.tools-restore">
+		<xmlpeek 
+			file="${tools.dir}/packages.csproj" 
+			xpath="/Project/ItemGroup/PackageReference[@Include = '${tool-id}']/@Version"
+			property="tool-version" />
+		<property name="tool-path" value="${environment::get-folder-path('UserProfile')}/.nuget/packages/${tool-id}/${tool-version}/" />
+	</target>
+
 	<target name="get-nuget-package-path" depends="common.nuget-restore">
 		<xmlpeek 
 			file="${tools.dir}/packages.config" 
@@ -63,14 +71,14 @@
 	</target>
 
 	<target name="find-async-generator-console">
-		<property name="nuget-package-id" value="CSharpAsyncGenerator.CommandLine" />
-		<call target="get-nuget-package-path" />
-		<property name="async-generator-console"  value="${nuget-package-path}/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
+		<property name="tool-id" value="CSharpAsyncGenerator.CommandLine" />
+		<call target="get-tool-path" />
+		<property name="async-generator-console"  value="${tool-path}/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
 	</target>
 
-	<target name="generate-async" depends="common.nuget-restore solution-restore find-async-generator-console">
+	<target name="generate-async" depends="solution-restore find-async-generator-console">
 		<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
-			<arg line=".${async-generator-console}" />
+			<arg line="${async-generator-console}" />
 		</exec> 
 	</target>