[msbuild] Re-use existing logic to compress frameworks for the ObjCBindingNativeFramework items. (#9504)
This commit is contained in:
Родитель
87395b4ef1
Коммит
020f8e2fab
|
@ -75,6 +75,10 @@ Copyright (C) 2020 Microsoft. All rights reserved.
|
|||
<FrameworkPath>%(_NativeFramework.Identity)</FrameworkPath>
|
||||
<ZipFile>$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)</ZipFile>
|
||||
</_NativeFrameworkResource>
|
||||
<_NativeFrameworkResource Include="%(ObjCBindingNativeFramework.Identity)\**\*.*" Condition="'%(ObjCBindingNativeFramework.Identity)' != ''">
|
||||
<FrameworkPath>%(ObjCBindingNativeFramework.Identity)</FrameworkPath>
|
||||
<ZipFile>$(IntermediateOutputPath)%(ObjCBindingNativeFramework.Filename)%(ObjCBindingNativeFramework.Extension)</ZipFile>
|
||||
</_NativeFrameworkResource>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
|
@ -29,35 +29,7 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
|
|||
<DefineConstants>$(XamarinDefineConstants);$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- OBSOLETE -->
|
||||
<Target Name="_CollectObjCBindingNativeFrameworkResources" Returns="@(_ObjCBindingNativeFrameworkResource)">
|
||||
<CreateItem Include="@(ObjCBindingNativeFramework -> '%(Identity)\**\*.*')">
|
||||
<Output ItemName="_ObjCBindingNativeFrameworkResource" TaskParameter="Include" />
|
||||
</CreateItem>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CompressObjCBindingNativeFrameworkResources" Inputs="@(_ObjCBindingNativeFrameworkResource)" Outputs="$(IntermediateOutputPath)%(ObjCBindingNativeFramework.Filename)%(ObjCBindingNativeFramework.Extension)" DependsOnTargets="_CollectObjCBindingNativeFrameworkResources">
|
||||
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(IntermediateOutputPath)%(ObjCBindingNativeFramework.Filename)%(ObjCBindingNativeFramework.Extension)" />
|
||||
|
||||
<Zip
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
ToolExe="$(ZipExe)"
|
||||
ToolPath="$(ZipPath)"
|
||||
Recursive="true"
|
||||
Symlinks="true"
|
||||
Sources="%(ObjCBindingNativeFramework.Identity)"
|
||||
OutputFile="$(IntermediateOutputPath)%(ObjCBindingNativeFramework.Filename)%(ObjCBindingNativeFramework.Extension)"
|
||||
WorkingDirectory="%(ObjCBindingNativeFramework.Identity)" >
|
||||
</Zip>
|
||||
|
||||
<CreateItem Include="$(IntermediateOutputPath)%(ObjCBindingNativeFramework.Filename)%(ObjCBindingNativeFramework.Extension)">
|
||||
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
|
||||
</CreateItem>
|
||||
</Target>
|
||||
<!-- /OBSOLETE -->
|
||||
|
||||
<Target Name="_CollectGeneratedSources" DependsOnTargets="_GenerateBindings;_CompressNativeFrameworkResources;_CompressObjCBindingNativeFrameworkResources"
|
||||
<Target Name="_CollectGeneratedSources" DependsOnTargets="_GenerateBindings;_CompressNativeFrameworkResources"
|
||||
Condition="'$(DesignTimeBuild)' != 'true'">
|
||||
|
||||
<ReadLinesFromFile File="$(_GeneratedSourcesFileList)" >
|
||||
|
|
Загрузка…
Ссылка в новой задаче