Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix path to dotnet.sh in AndroidSampleApp project #112590

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Fix path to dotnet.sh in AndroidSampleApp project #112590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a3aa9
Fix path to dotnet.sh in AndroidSampleApp
elinor-fung Feb 14, 2025
926ba3d
Use DotNetTool property
elinor-fung Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/mono/sample/Android/AndroidSampleApp.csproj
View file
Open in desktop
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 @@ -31,7 +28,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
Loading