Skip to content

Commit

Permalink
Fix path to dotnet in AndroidSampleApp project (#112590)
Browse files Browse the repository at this point in the history
Non-Windows path was missing a `..`. This switches to using `DotNetTool`, which is set by the Arcade SDK (RepoLayout.props).
  • Loading branch information
elinor-fung authored Feb 19, 2025
1 parent 440a283 commit 457e3eb
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/mono/sample/Android/AndroidSampleApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<EnableDefaultAssembliesToBundle>true</EnableDefaultAssembliesToBundle>
<!-- 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. -->
<_UseAotDataFile Condition="'$(RunAOTCompilation)' == 'true'">false</_UseAotDataFile>
<RepoDotnet Condition="'$(DOTNET_ROOT)' != ''">$(DOTNET_ROOT)/dotnet</RepoDotnet>
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' == 'Windows_NT'">..\..\..\..\dotnet.cmd</RepoDotnet>
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' != 'Windows_NT'">../../../dotnet.sh</RepoDotnet>
</PropertyGroup>

<ItemGroup>
Expand All @@ -34,7 +31,7 @@
Condition="'$(ArchiveTests)' != 'true' and '$(DeployAndRun)' == 'true'"
AfterTargets="_AfterAndroidBuild"
DependsOnTargets="$(AndroidBuildDependsOn)" >
<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" />
<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" />
</Target>

<Target Name="CopySampleAppToHelixTestDir"
Expand Down

0 comments on commit 457e3eb

Please sign in to comment.