Skip to content

Commit ac7420e

Browse files
committed
Fix tests
1 parent 662620a commit ac7420e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

default.build

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@
5454
</exec>
5555
</target>
5656

57-
<target name="get-tool-path" depends="common.tools-restore">
57+
<target name="get-tool-info" depends="common.tools-restore">
5858
<xmlpeek
5959
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}/" />
6363
</target>
6464

6565
<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" />
6969
</target>
7070

7171
<target name="generate-async" depends="solution-restore find-async-generator-console">
@@ -150,9 +150,9 @@
150150
</target>
151151

152152
<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" />
156156
</target>
157157

158158
<target name="run-tests" depends="find-nunit" description="Run NUnit tests">

0 commit comments

Comments
 (0)