|
54 | 54 | </exec>
|
55 | 55 | </target>
|
56 | 56 |
|
57 |
| - <target name="get-tool-path" depends="common.tools-restore"> |
| 57 | + <target name="get-tool-info" depends="common.tools-restore"> |
58 | 58 | <xmlpeek
|
59 | 59 | file="${tools.dir}/packages.csproj"
|
60 |
| - xpath="/Project/ItemGroup/PackageReference[@Include = '${tool-id}']/@Version" |
61 |
| - property="tool-version" /> |
62 |
| - <property name="tool-path" value="${tools.dir}/${tool-id}/${tool-version}/" /> |
| 60 | + xpath="/Project/ItemGroup/PackageReference[@Include = '${tool.id}']/@Version" |
| 61 | + property="tool.version" /> |
| 62 | + <property name="tool.path" value="${tools.dir}/${tool.id}/${tool.version}/" /> |
63 | 63 | </target>
|
64 | 64 |
|
65 | 65 | <target name="find-async-generator-console">
|
66 |
| - <property name="tool-id" value="CSharpAsyncGenerator.CommandLine" /> |
67 |
| - <call target="get-tool-path" /> |
68 |
| - <property name="async-generator-console" value="${tool-path}/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" /> |
| 66 | + <property name="tool.id" value="CSharpAsyncGenerator.CommandLine" /> |
| 67 | + <call target="get-tool-info" /> |
| 68 | + <property name="async-generator-console" value="${tool.path}/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" /> |
69 | 69 | </target>
|
70 | 70 |
|
71 | 71 | <target name="generate-async" depends="solution-restore find-async-generator-console">
|
|
150 | 150 | </target>
|
151 | 151 |
|
152 | 152 | <target name="find-nunit">
|
153 |
| - <property name="tool-id" value="NUnit.ConsoleRunner" /> |
154 |
| - <call target="get-tool-path" /> |
155 |
| - <property name="nunit-console" value="${tool-path}/tools/nunit3-console.exe" /> |
| 153 | + <property name="tool.id" value="NUnit.Console" /> |
| 154 | + <call target="get-tool-info" /> |
| 155 | + <property name="nunit-console" value="${tools.dir}/NUnit.ConsoleRunner/${tool.version}/tools/nunit3-console.exe" /> |
156 | 156 | </target>
|
157 | 157 |
|
158 | 158 | <target name="run-tests" depends="find-nunit" description="Run NUnit tests">
|
|
0 commit comments