Skip to content

Fix path to dotnet.sh in AndroidSampleApp project#112590

Merged
elinor-fung merged 2 commits into
dotnet:mainfrom
elinor-fung:androidSample-scriptPath
Feb 19, 2025
Merged

Fix path to dotnet.sh in AndroidSampleApp project#112590
elinor-fung merged 2 commits into
dotnet:mainfrom
elinor-fung:androidSample-scriptPath

Conversation

@elinor-fung

@elinor-fung elinor-fung commented Feb 14, 2025

Copy link
Copy Markdown
Member

Non-Windows path was missing a ... This switches to using DotNetTool, which is set by the Arcade SDK (RepoLayout.props).

Copilot AI review requested due to automatic review settings February 14, 2025 23:00

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

Files not reviewed (1)
  • src/mono/sample/Android/AndroidSampleApp.csproj: Language not supported

Comment on lines +19 to +20
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' == 'Windows_NT'">$(RepoRoot)dotnet.cmd</RepoDotnet>
<RepoDotnet Condition="'$(RepoDotnet)' == '' and '$(OS)' != 'Windows_NT'">$(RepoRoot)dotnet.sh</RepoDotnet>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need RepoDotnet property at all. We can instead just use $(DotNetTool) at line 34: https://github.com/dotnet/runtime/pull/112590/files#diff-1e632e29d3bd8c79a2aa62b91516646c9bc2bf0d2fa55089c3d4f25669e85eb0R34
and remove RepoDotnet.

DotNetTool gets properly resolved in: https://github.com/dotnet/arcade/blob/ae3c938af5df4a2db45ded37dd05608ce59d8e5e/src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props#L20-L31
for Windows and non-Windows hosts.

@ivanpovazan ivanpovazan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@elinor-fung
elinor-fung merged commit 457e3eb into dotnet:main Feb 19, 2025
@elinor-fung
elinor-fung deleted the androidSample-scriptPath branch February 19, 2025 23:06
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants