workaround for "bundling resource into ns2.0 with xamarin.ios10 doesn…

…'t work"
xamarin · Dec 3, 2018 · 050fdf9 · 050fdf9
1 parent d765273
commit 050fdf9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/Bindings/Forms/UrhoSharp.Forms.csproj b/Bindings/Forms/UrhoSharp.Forms.csproj
@@ -51,10 +51,6 @@
 
   <!-- iOS -->
   <ItemGroup Condition="$(TargetFramework) == 'xamarin.ios10'">
-    <BundleResource Update="..\..\Urho3D\CoreData.pak">
-      <Link>CoreData.pak</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </BundleResource>
     <None Include="..\..\Bin\iOS\Urho.framework.zip">
       <Link>Urho.framework.zip</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/Bindings/NetStandard/UrhoSharp.csproj b/Bindings/NetStandard/UrhoSharp.csproj
@@ -57,9 +57,6 @@
     <Compile Include="..\iOS\UrhoSurface.cs" />
     <Compile Include="..\iOS\Urho.framework.linkwith.cs" />
     <ObjcBindingNativeFramework Include="..\..\Bin\iOS\Urho.framework" />
-    <BundleResource Update="..\..\Urho3D\CoreData.pak">
-      <Link>Resources\CoreData.pak</Link>
-    </BundleResource>
   </ItemGroup>
 
   <!-- UWP -->

diff --git a/Nuget/Urho.Forms.nuspec b/Nuget/Urho.Forms.nuspec
@@ -45,6 +45,7 @@
      <file src="../Bin/Android/armeabi/libmono-urho.so" target="native/Android/armeabi/libmono-urho.so" />
 
      <!--iOS-->
+     <file src="../Nuget/iOS/UrhoSharp.Forms.targets" target="build/xamarin.ios10" />
      <file src="../Bin/UrhoSharp.Forms/UrhoSharp.Forms.dll" target="lib/Xamarin.iOS10/UrhoSharp.Forms.dll" />
      <file src="../docs/Urho.XML" target="lib/Xamarin.iOS10/UrhoSharp.Forms.XML" />
 

diff --git a/Nuget/Urho.nuspec b/Nuget/Urho.nuspec
@@ -40,6 +40,7 @@
      <file src="../Bin/Android/armeabi/libmono-urho.so" target="native/Android/armeabi/libmono-urho.so" />
 
      <!--iOS-->
+     <file src="../Nuget/iOS/UrhoSharp.targets" target="build/xamarin.ios10" />
      <file src="../Bin/UrhoSharp/UrhoSharp.dll" target="lib/Xamarin.iOS10/UrhoSharp.dll" />
      <file src="../docs/Urho.XML" target="lib/Xamarin.iOS10/UrhoSharp.XML" />
 

diff --git a/Nuget/iOS/UrhoSharp.Forms.targets b/Nuget/iOS/UrhoSharp.Forms.targets
@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<BundleResource Include="$(MSBuildThisFileDirectory)\..\..\native\CoreData.pak">
+			<Link>Resources\CoreData.pak</Link>
+		</BundleResource>
+	</ItemGroup>
+</Project>
diff --git a/Nuget/iOS/UrhoSharp.targets b/Nuget/iOS/UrhoSharp.targets
@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<BundleResource Include="$(MSBuildThisFileDirectory)\..\..\native\CoreData.pak">
+			<Link>Resources\CoreData.pak</Link>
+		</BundleResource>
+	</ItemGroup>
+</Project>