Skip to content
Permalink
Browse files

[Build] Publish was not properly copying native libs and compiled ass…

…ets (fixes #331 and #334) -- thanks to jazzay for the initial implementation
  • Loading branch information
xen2 committed Jan 21, 2019
1 parent e4fd4f0 commit 05e746a920cf41b8fc699426cc1e8550ae28c03a
@@ -105,6 +105,19 @@
</Content>
</ItemGroup>
</Target>

<!-- Publish: always deploy files as content -->
<Target Name="_XenkoDeployAssetsPublish" DependsOnTargets="XenkoCompileAsset" AfterTargets="ComputeFilesToPublish">
<ItemGroup>
<!-- Define the Assets to deploy -->
<AssetsToPublish Include="$(XenkoCompileAssetOutputPath)\**\*.*"/>

<!-- Define the Assets to deploy -->
<ResolvedFileToPublish Include="@(AssetsToPublish)">
<RelativePath>data\%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
</ResolvedFileToPublish>
</ItemGroup>
</Target>

<!-- Android -->
<Target Name="_XenkoDeployAssetsAndroid" BeforeTargets="XenkoCompileAsset" Condition="'$(XenkoPlatform)' == 'Android'">
@@ -193,6 +193,14 @@
</None>
</ItemGroup>
</Target>
<!-- When publishing, copy native libraries (only needed if CopyLocalLockFileAssemblies is set to false since _XenkoSetupNativeLibrariesWindows won't run) -->
<Target Name="_XenkoSetupNativeLibrariesDotNetPublish" DependsOnTargets="_XenkoBuildDependencies" AfterTargets="ComputeFilesToPublish" Condition="'$(UsingMicrosoftNETSdk)' == 'true' And '$(CopyLocalLockFileAssemblies)' == 'false'">
<ItemGroup>
<ResolvedFileToPublish Include="@(_XenkoDependencyNativeLib)">
<RelativePath>%(_XenkoDependencyNativeLib.Link)</RelativePath>
</ResolvedFileToPublish>
</ItemGroup>
</Target>
<Target Name="_XenkoSetupNativeLibrariesUWP" DependsOnTargets="_XenkoBuildDependencies" AfterTargets="ResolveAssemblyReferences" Condition="'$(XenkoPlatform)' == 'UWP'">
<PropertyGroup>
<XenkoCPU Condition="'$(Platform)' == 'x86'">x86</XenkoCPU>
@@ -221,5 +229,4 @@
<MtouchExtraArgs>$(MtouchExtraArgs) --compiler=clang -cxx -gcc_flags '-lstdc++ $(MtouchExtraArgsLibs)'</MtouchExtraArgs>
</PropertyGroup>
</Target>

</Project>

0 comments on commit 05e746a

Please sign in to comment.
You can’t perform that action at this time.