Mac: Ensure output .app path has a trailing slash

Fixes picoe#2106
cwensley · Apr 24, 2022 · ae43fae · ae43fae
1 parent 136faa5
commit ae43fae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Eto.Mac/build/Mac.props b/src/Eto.Mac/build/Mac.props
@@ -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>

diff --git a/src/Eto.Mac/build/Mac.targets b/src/Eto.Mac/build/Mac.targets
@@ -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) == ''">
@@ -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>
@@ -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>