Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[msbuild] Share the _CompressNativeFrameworkResources/_CompressFrameworks target between Xamarin.iOS and Xamarin.Mac. #9461

Merged
merged 1 commit into from
Aug 25, 2020
Merged

[msbuild] Share the _CompressNativeFrameworkResources/_CompressFrameworks target between Xamarin.iOS and Xamarin.Mac. #9461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.

<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.targets" />

<Target Name="_CompressFrameworks" Inputs="@(_NativeFrameworkResource)" Outputs="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" DependsOnTargets="_CollectNativeFrameworkResources">
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" />

<Zip
Condition="'$(IsMacEnabled)' == 'true'"
SessionId="$(BuildSessionId)"
ToolExe="$(ZipExe)"
ToolPath="$(ZipPath)"
Recursive="true"
Symlinks="true"
Sources="%(_NativeFramework.Identity)"
OutputFile="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)"
WorkingDirectory="%(_NativeFramework.FullPath)" >
</Zip>

<CreateItem Include="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>

<Target Name="_CollectGeneratedSources" DependsOnTargets="_CompressFrameworks;_GenerateBindings"
<Target Name="_CollectGeneratedSources" DependsOnTargets="_CompressNativeFrameworkResources;_GenerateBindings"
Condition="'$(DesignTimeBuild)' != 'true'">

<ReadLinesFromFile File="$(_GeneratedSourcesFileList)" >
Expand Down
20 changes: 20 additions & 0 deletions msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,26 @@ Copyright (C) 2020 Microsoft. All rights reserved.
</CreateEmbeddedResources>
</Target>

<Target Name="_CompressNativeFrameworkResources" Inputs="@(_NativeFrameworkResource)" Outputs="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" DependsOnTargets="_CollectNativeFrameworkResources">
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" />

<Zip
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
ToolExe="$(ZipExe)"
ToolPath="$(ZipPath)"
Recursive="true"
Symlinks="true"
Sources="%(_NativeFramework.Identity)"
OutputFile="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)"
WorkingDirectory="%(_NativeFramework.Identity)" >
</Zip>

<CreateItem Include="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>

<Target Name="_PrepareNativeReferences" Condition="'$(DesignTimeBuild)' != 'true'">
<PrepareNativeReferences
Condition="'$(IsMacEnabled)' == 'true'"
Expand Down
20 changes: 0 additions & 20 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.CSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,6 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
<DefineConstants>$(XamarinDefineConstants);$(DefineConstants)</DefineConstants>
</PropertyGroup>

<Target Name="_CompressNativeFrameworkResources" Inputs="@(_NativeFrameworkResource)" Outputs="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" DependsOnTargets="_CollectNativeFrameworkResources">
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)" />

<Zip
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
ToolExe="$(ZipExe)"
ToolPath="$(ZipPath)"
Recursive="true"
Symlinks="true"
Sources="%(_NativeFramework.Identity)"
OutputFile="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)"
WorkingDirectory="%(_NativeFramework.Identity)" >
</Zip>

<CreateItem Include="$(IntermediateOutputPath)%(_NativeFramework.Filename)%(_NativeFramework.Extension)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>

<!-- OBSOLETE -->
<Target Name="_CollectObjCBindingNativeFrameworkResources" Returns="@(_ObjCBindingNativeFrameworkResource)">
<CreateItem Include="@(ObjCBindingNativeFramework -> '%(Identity)\**\*.*')">
Expand Down