2 files changed, 13 insertions, 8 deletions
diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
index b3260c1..c036d74 100644
--- a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
+++ b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj
@@ -114,19 +114,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <ItemGroup>
-    <PropertyEditingResource Include="PropertyEditingResource\**\*" />
-  </ItemGroup>
   <Target Name="AfterBuild">
     <ItemGroup>
-      <PropertyEditingResourceBundlePath Include="$(SolutionDir)\Xamarin.PropertyEditing.Mac\PropertyEditingResource\**\*" />
+      <PropertyEditingResourceBundlePath Include="$(OutputPath)\PropertyEditingResource.bundle\**\*" />
     </ItemGroup>
     <Copy 
       SourceFiles="@(PropertyEditingResourceBundlePath)" 
       DestinationFiles="@(PropertyEditingResourceBundlePath->'$(OutputPath)\$(AssemblyName).app\Contents\MonoBundle\PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension)')"
-      SkipUnchangedFiles="true" 
-      OverwriteReadOnlyFiles="true" 
-      Retries="3" 
-      RetryDelayMilliseconds="300" />
+      SkipUnchangedFiles="true" />
   </Target>
 </Project>
 \ No newline at end of file
diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
index 5573e89..ec68293 100644
--- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
+++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
@@ -176,5 +176,16 @@
       <LastGenOutput>LocalizationResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
+  <Target Name="IncludeIconsInBundle" BeforeTargets="AssignTargetPaths">
+    <ItemGroup>
+      <PropertyEditingResourceBundlePath Include="PropertyEditingResource\**\*" />
+    </ItemGroup>
+
+    <CreateItem Include="@(PropertyEditingResourceBundlePath)" AdditionalMetadata="Link=PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension);CopyToOutputDirectory=PreserveNewest">
+      <Output TaskParameter="Include" ItemName="None" />
+    </CreateItem>
+  </Target>
+
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
 </Project>