Skip to content

Commit 457e3eb

Browse files
authored
Fix path to dotnet in AndroidSampleApp project (#112590)
Non-Windows path was missing a `..`. This switches to using `DotNetTool`, which is set by the Arcade SDK (RepoLayout.props).
1 parent 440a283 commit 457e3eb

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/mono/sample/Android/AndroidSampleApp.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<EnableDefaultAssembliesToBundle>true</EnableDefaultAssembliesToBundle>
1616
<!-- With Mono AOT on Android we default to not using AOT data file optimization as it can degrade runtime performance for small binary size improvements. -->
1717
<_UseAotDataFile Condition="'$(RunAOTCompilation)' == 'true'">false</_UseAotDataFile>
18-
<RepoDotnet Condition="'$(DOTNET_ROOT)' != ''">$(DOTNET_ROOT)/dotnet</RepoDotnet>
19-
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' == 'Windows_NT'">..\..\..\..\dotnet.cmd</RepoDotnet>
20-
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' != 'Windows_NT'">../../../dotnet.sh</RepoDotnet>
2118
</PropertyGroup>
2219

2320
<ItemGroup>
@@ -34,7 +31,7 @@
3431
Condition="'$(ArchiveTests)' != 'true' and '$(DeployAndRun)' == 'true'"
3532
AfterTargets="_AfterAndroidBuild"
3633
DependsOnTargets="$(AndroidBuildDependsOn)" >
37-
<Exec Command="$(RepoDotnet) xharness android test --package-name=net.dot.HelloAndroid --instrumentation=net.dot.MonoRunner --app=$(AndroidBundleDir)/bin/HelloAndroid.apk --expected-exit-code=42 --output-directory=$(AndroidBundleDir)/log" />
34+
<Exec Command="$(DotNetTool) xharness android test --package-name=net.dot.HelloAndroid --instrumentation=net.dot.MonoRunner --app=$(AndroidBundleDir)/bin/HelloAndroid.apk --expected-exit-code=42 --output-directory=$(AndroidBundleDir)/log" />
3835
</Target>
3936

4037
<Target Name="CopySampleAppToHelixTestDir"

0 commit comments

Comments
 (0)