[msbuild] Share targets related to Collada assets. (#10050)
This commit is contained in:
Родитель
8aa53ba943
Коммит
6fcf25ffd4
|
@ -68,15 +68,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
||||||
</BuildDependsOn>
|
</BuildDependsOn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<CompileColladaAssetsDependsOn>
|
|
||||||
_CollectColladaAssets;
|
|
||||||
_CoreCompileColladaAssets
|
|
||||||
</CompileColladaAssetsDependsOn>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Target Name="_CompileColladaAssets" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="$(CompileColladaAssetsDependsOn)" />
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CreateAppBundleDependsOn Condition="'$(_UsingXamarinSdk)' != 'true'">
|
<CreateAppBundleDependsOn Condition="'$(_UsingXamarinSdk)' != 'true'">
|
||||||
_DetectSigningIdentity;
|
_DetectSigningIdentity;
|
||||||
|
@ -283,42 +274,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
||||||
</Mmp>
|
</Mmp>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_CollectColladaAssets">
|
|
||||||
<CollectBundleResources
|
|
||||||
Condition="'$(IsMacEnabled)' == 'true'"
|
|
||||||
SessionId="$(BuildSessionId)"
|
|
||||||
BundleResources="@(Collada)"
|
|
||||||
ProjectDir="$(MSBuildProjectDirectory)"
|
|
||||||
ResourcePrefix="$(_ResourcePrefix)">
|
|
||||||
<Output TaskParameter="BundleResourcesWithLogicalNames" ItemName="_ColladaAssetWithLogicalName" />
|
|
||||||
</CollectBundleResources>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_CoreCompileColladaAssets"
|
|
||||||
DependsOnTargets="_CollectColladaAssets;_DetectSdkLocations;_ComputeTargetFrameworkMoniker"
|
|
||||||
Inputs="@(_ColladaAssetWithLogicalName)"
|
|
||||||
Outputs="$(IntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)"
|
|
||||||
>
|
|
||||||
|
|
||||||
<ScnTool
|
|
||||||
Condition="'$(IsMacEnabled)' == 'true'"
|
|
||||||
SessionId="$(BuildSessionId)"
|
|
||||||
ToolExe="$(ScnToolExe)"
|
|
||||||
ToolPath="$(ScnToolPath)"
|
|
||||||
SdkRoot="$(_SdkRoot)"
|
|
||||||
SdkDevPath="$(_SdkDevPath)"
|
|
||||||
SdkVersion="$(_SdkVersion)"
|
|
||||||
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
|
|
||||||
IntermediateOutputPath="$(IntermediateOutputPath)"
|
|
||||||
InputScene="%(_ColladaAssetWithLogicalName.Identity)"
|
|
||||||
OutputScene="$(IntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)">
|
|
||||||
</ScnTool>
|
|
||||||
|
|
||||||
<CreateItem Include="$(IntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)" AdditionalMetadata="LogicalName=%(_ColladaAssetWithLogicalName.LogicalName)">
|
|
||||||
<Output TaskParameter="Include" ItemName="_BundleResourceWithLogicalName" />
|
|
||||||
</CreateItem>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_CompileImageAssets" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_BeforeCoreCompileImageAssets;_ReadCompileImageAssets;_CoreCompileImageAssets" />
|
<Target Name="_CompileImageAssets" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_BeforeCoreCompileImageAssets;_ReadCompileImageAssets;_CoreCompileImageAssets" />
|
||||||
|
|
||||||
<Target Name="_BeforeCoreCompileImageAssets"
|
<Target Name="_BeforeCoreCompileImageAssets"
|
||||||
|
|
|
@ -398,6 +398,53 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<!-- Collada assets -->
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<CompileColladaAssetsDependsOn>
|
||||||
|
_CollectColladaAssets;
|
||||||
|
_CoreCompileColladaAssets
|
||||||
|
</CompileColladaAssetsDependsOn>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_CompileColladaAssets" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="$(CompileColladaAssetsDependsOn)" />
|
||||||
|
|
||||||
|
<Target Name="_CollectColladaAssets">
|
||||||
|
<CollectBundleResources
|
||||||
|
SessionId="$(BuildSessionId)"
|
||||||
|
Condition="'$(IsMacEnabled)' == 'true'"
|
||||||
|
BundleResources="@(Collada)"
|
||||||
|
ProjectDir="$(MSBuildProjectDirectory)"
|
||||||
|
ResourcePrefix="$(_ResourcePrefix)">
|
||||||
|
<Output TaskParameter="BundleResourcesWithLogicalNames" ItemName="_ColladaAssetWithLogicalName" />
|
||||||
|
</CollectBundleResources>
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="_CoreCompileColladaAssets"
|
||||||
|
DependsOnTargets="_CollectColladaAssets;_DetectSdkLocations;_ComputeTargetFrameworkMoniker"
|
||||||
|
Inputs="@(_ColladaAssetWithLogicalName)"
|
||||||
|
Outputs="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)"
|
||||||
|
>
|
||||||
|
|
||||||
|
<ScnTool
|
||||||
|
SessionId="$(BuildSessionId)"
|
||||||
|
Condition="'$(IsMacEnabled)' == 'true'"
|
||||||
|
ToolExe="$(ScnToolExe)"
|
||||||
|
ToolPath="$(ScnToolPath)"
|
||||||
|
SdkRoot="$(_SdkRoot)"
|
||||||
|
SdkDevPath="$(_SdkDevPath)"
|
||||||
|
SdkVersion="$(_SdkVersion)"
|
||||||
|
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
|
||||||
|
IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)"
|
||||||
|
InputScene="%(_ColladaAssetWithLogicalName.Identity)"
|
||||||
|
OutputScene="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)">
|
||||||
|
</ScnTool>
|
||||||
|
|
||||||
|
<CreateItem Include="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)" AdditionalMetadata="LogicalName=%(_ColladaAssetWithLogicalName.LogicalName);Optimize='False'">
|
||||||
|
<Output TaskParameter="Include" ItemName="_BundleResourceWithLogicalName" />
|
||||||
|
</CreateItem>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<Target Name="_ComputeTargetArchitectures" DependsOnTargets="_ComputeTargetFrameworkMoniker">
|
<Target Name="_ComputeTargetArchitectures" DependsOnTargets="_ComputeTargetFrameworkMoniker">
|
||||||
<!--
|
<!--
|
||||||
For now, this target is mostly for Xamarin.iOS, but in order to
|
For now, this target is mostly for Xamarin.iOS, but in order to
|
||||||
|
|
|
@ -91,20 +91,11 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
||||||
</CleanDependsOn>
|
</CleanDependsOn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<CompileColladaAssetsDependsOn>
|
|
||||||
_CollectColladaAssets;
|
|
||||||
_CoreCompileColladaAssets
|
|
||||||
</CompileColladaAssetsDependsOn>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_IsContainerApp>false</_IsContainerApp>
|
<_IsContainerApp>false</_IsContainerApp>
|
||||||
<_IsContainerApp Condition="$(IsAppExtension) == 'false' And '$(IsWatchApp)' == 'false'">true</_IsContainerApp>
|
<_IsContainerApp Condition="$(IsAppExtension) == 'false' And '$(IsWatchApp)' == 'false'">true</_IsContainerApp>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target Name="_CompileColladaAssets" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="$(CompileColladaAssetsDependsOn)" />
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OptimizePngImagesDependsOn>
|
<OptimizePngImagesDependsOn>
|
||||||
_CollectPngImages;
|
_CollectPngImages;
|
||||||
|
@ -785,42 +776,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
||||||
</CreateItem>
|
</CreateItem>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_CollectColladaAssets">
|
|
||||||
<CollectBundleResources
|
|
||||||
SessionId="$(BuildSessionId)"
|
|
||||||
Condition="'$(IsMacEnabled)' == 'true'"
|
|
||||||
BundleResources="@(Collada)"
|
|
||||||
ProjectDir="$(MSBuildProjectDirectory)"
|
|
||||||
ResourcePrefix="$(_ResourcePrefix)">
|
|
||||||
<Output TaskParameter="BundleResourcesWithLogicalNames" ItemName="_ColladaAssetWithLogicalName" />
|
|
||||||
</CollectBundleResources>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_CoreCompileColladaAssets"
|
|
||||||
DependsOnTargets="_CollectColladaAssets;_DetectSdkLocations;_ComputeTargetFrameworkMoniker"
|
|
||||||
Inputs="@(_ColladaAssetWithLogicalName)"
|
|
||||||
Outputs="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)"
|
|
||||||
>
|
|
||||||
|
|
||||||
<ScnTool
|
|
||||||
SessionId="$(BuildSessionId)"
|
|
||||||
Condition="'$(IsMacEnabled)' == 'true'"
|
|
||||||
ToolExe="$(ScnToolExe)"
|
|
||||||
ToolPath="$(ScnToolPath)"
|
|
||||||
SdkRoot="$(_SdkRoot)"
|
|
||||||
SdkDevPath="$(_SdkDevPath)"
|
|
||||||
SdkVersion="$(_SdkVersion)"
|
|
||||||
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
|
|
||||||
IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)"
|
|
||||||
InputScene="%(_ColladaAssetWithLogicalName.Identity)"
|
|
||||||
OutputScene="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)">
|
|
||||||
</ScnTool>
|
|
||||||
|
|
||||||
<CreateItem Include="$(DeviceSpecificIntermediateOutputPath)%(_ColladaAssetWithLogicalName.LogicalName)" AdditionalMetadata="LogicalName=%(_ColladaAssetWithLogicalName.LogicalName);Optimize='False'">
|
|
||||||
<Output TaskParameter="Include" ItemName="_BundleResourceWithLogicalName" />
|
|
||||||
</CreateItem>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_CompileImageAssets" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_ComputeTargetArchitectures;_BeforeCoreCompileImageAssets;_ReadCompileImageAssets;_CoreCompileImageAssets" />
|
<Target Name="_CompileImageAssets" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_ComputeTargetArchitectures;_BeforeCoreCompileImageAssets;_ReadCompileImageAssets;_CoreCompileImageAssets" />
|
||||||
|
|
||||||
<Target Name="_BeforeCoreCompileImageAssets"
|
<Target Name="_BeforeCoreCompileImageAssets"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче