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.

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

Mac: Ensure output .app path has a trailing slash #2195

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Eto.Mac/build/Mac.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<!-- for .NET Core publishing -->
<PropertyGroup Condition="$(MacIsBuildingBundle) == 'True' AND $(MacOutputPath) != '' AND $(MacBundlingProject) == $(MSBuildProjectFullPath)">
<BaseOutputAppPath>$(MacOutputPath)</BaseOutputAppPath>
<BaseOutputAppPath>$([MSBuild]::EnsureTrailingSlash('$(MacOutputPath)'))</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(MacAppendRuntimeIdentifierToOutputPath) == 'True'">$(BaseOutputAppPath)$(RuntimeIdentifier)\</BaseOutputAppPath>
<OutputPath>$(MacTempBuildPath)bin\</OutputPath>
<PublishDir>$(MacTempBuildPath)publish\$(RuntimeIdentifier)\</PublishDir>
Expand Down
4 changes: 3 additions & 1 deletion src/Eto.Mac/build/Mac.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<!-- Compute where the .app bundle should be created, if not specified -->
<BaseOutputAppPath Condition="$(BaseOutputAppPath) == '' AND $(OutputPath) != ''">$(OutputPath)</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(BaseOutputAppPath) == '' AND $(TargetDir) != ''">$(TargetDir)</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(BaseOutputAppPath) != ''">$([MSBuild]::EnsureTrailingSlash('$(BaseOutputAppPath)'))</BaseOutputAppPath>
</PropertyGroup>

<PropertyGroup Condition="$(BaseOutputAppPath) == ''">
Expand All @@ -14,6 +15,7 @@
<BaseOutputAppPath>$(BaseOutputAppPath)$(Configuration)\</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(AppendTargetFrameworkToOutputPath) != 'False' AND $(TargetFramework) != ''">$(BaseOutputAppPath)$(TargetFramework)\</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(AppendRuntimeIdentifierToOutputPath) == 'True' AND $(RuntimeIdentifer) != ''">$(BaseOutputAppPath)$(RuntimeIdentifer)\</BaseOutputAppPath>
<BaseOutputAppPath Condition="$(BaseOutputAppPath) != ''">$([MSBuild]::EnsureTrailingSlash('$(BaseOutputAppPath)'))</BaseOutputAppPath>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -38,7 +40,7 @@

<!-- Specifies the full output .app path. When building for more than one runtime identifier, this is ignored. -->
<OutputAppPath Condition="$(OutputAppPath) == '' AND $(BaseOutputAppPath) != ''">$(BaseOutputAppPath)$(MacBundleName).app\</OutputAppPath>
<OutputAppPath Condition="$(OutputAppPath.EndsWith('/')) == 'False' AND $(OutputAppPath.EndsWith('\')) == 'False'">$(OutputAppPath)\</OutputAppPath>
<OutputAppPath>$([MSBuild]::EnsureTrailingSlash('$(OutputAppPath)'))</OutputAppPath>

</PropertyGroup>

Expand Down