Use dotnet to push packages to nuget (#2377)

Author: hazzik

Tools/.gitignore

@@ -1,4 +1,3 @@
-nuget.exe
 nunit.*
 vswhere/
 csharpasyncgenerator.commandline/

build-common/common.xml

@@ -47,14 +47,6 @@
 		<property name="tools.dir" value="${root.dir}/Tools"/>
 	</target>
 
-	<target name="common.download-nuget" depends="common.init">
-		<get 
-			src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" 
-			dest="${tools.dir}/nuget.exe" 
-			usetimestamp="true"
-		/>
-	</target>
-
 	<target name="common.tools-restore" depends="common.init">
 		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
 			<arg line="restore ./packages.csproj --packages ." />

default.build

@@ -21,8 +21,7 @@
 	</target>
 
 	<target name="nuget.set-properties">
-		<property name="nuget.nupackages.relative-dir" value="nuget_gallery" />
-		<property name="nuget.nupackages.dir" value="${build.dir}/${nuget.nupackages.relative-dir}" />
+		<property name="nuget.nupackages.dir" value="${build.dir}/nuget_gallery" />
 		<property name="nuget.nupackages.pushbatfile" value="${nuget.nupackages.dir}/NuGetPush.bat" />
 	</target>
 
@@ -313,11 +312,9 @@
 
 	</target>
 
-	<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties"
+	<target name="nugetpushbat" depends="init binaries nuget.set-properties"
 					description="Creates files for the release on nuget gallery.">
 
-		<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
-
 		<echo message="rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey' ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="false"/>
 		<foreach item="File" property="filename">
 			<in>
@@ -326,12 +323,12 @@
 				</items>
 			</in>
 			<do>
-				<echo message="nuget push -source https://api.nuget.org/v3/index.json ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
+				<echo message="dotnet nuget push -s https://api.nuget.org/v3/index.json ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
 			</do>
 		</foreach>
 	</target>
 
-	<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties"
+	<target name="nugetpush" depends="init binaries nuget.set-properties"
 					description="Push packages on nuget gallery.">
 		<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
 		<foreach item="File" property="filename">
@@ -341,7 +338,8 @@
 				</items>
 			</in>
 			<do>
-				<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="NuGet.exe">
+				<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="dotnet">
+					<arg value="nuget" />
 					<arg value="push" />
 					<arg value="${filename}" />
 				</exec>