xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[msbuild] Share the _CollectGeneratedSources target between Xamarin.iOS and Xamarin.Mac. (#9516)

This commit is contained in:
Rolf Bjarne Kvinge 2020-08-27 08:08:03 +02:00 коммит произвёл GitHub
Родитель 30b1a8acbd
Коммит 3a0580750d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 22 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.CSharp.targets
Просмотреть файл

@ -52,26 +52,6 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.targets" />
<Target Name="_CollectGeneratedSources" DependsOnTargets="_CompressNativeFrameworkResources;_GenerateBindings"
Condition="'$(DesignTimeBuild)' != 'true'">
<ReadLinesFromFile File="$(_GeneratedSourcesFileList)" >
<Output TaskParameter="Lines" ItemName="GeneratedSources" />
</ReadLinesFromFile>
<CreateItem Include="@(ObjcBindingCoreSource)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(GeneratedSources)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(ObjcBindingNativeLibrary)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
</Project>

22
msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
Просмотреть файл

@ -46,6 +46,28 @@ Copyright (C) 2020 Microsoft. All rights reserved.
<RemoveDir Directories="$(GeneratedSourcesDir)" Condition="Exists ('$(GeneratedSourcesDir)')" />
</Target>
<Target Name="_CollectGeneratedSources"
DependsOnTargets="_GenerateBindings;_CompressNativeFrameworkResources"
Condition="'$(DesignTimeBuild)' != 'true'"
>
<ReadLinesFromFile File="$(_GeneratedSourcesFileList)" >
<Output TaskParameter="Lines" ItemName="GeneratedSources" />
</ReadLinesFromFile>
<CreateItem Include="@(ObjcBindingCoreSource)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(GeneratedSources)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(ObjcBindingNativeLibrary)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>
<!--
We can't just use @(_NativeFramework) as the input to the

20
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.CSharp.targets
Просмотреть файл

@ -29,26 +29,6 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
<DefineConstants>$(XamarinDefineConstants);$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Target Name="_CollectGeneratedSources" DependsOnTargets="_GenerateBindings;_CompressNativeFrameworkResources"
Condition="'$(DesignTimeBuild)' != 'true'">
<ReadLinesFromFile File="$(_GeneratedSourcesFileList)" >
<Output TaskParameter="Lines" ItemName="GeneratedSources" />
</ReadLinesFromFile>
<CreateItem Include="@(ObjcBindingCoreSource)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(GeneratedSources)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<CreateItem Include="@(ObjcBindingNativeLibrary)">
<Output TaskParameter="Include" ItemName="ManifestResourceWithNoCulture" />
</CreateItem>
</Target>
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
</Project>