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

[msbuild] Update to latest ILRepack. (#7594) 

The latest ILRepack has fixes for netstandard we'll need.

Also use package references.
This commit is contained in:
Rolf Bjarne Kvinge 2019-12-16 19:06:25 +01:00 коммит произвёл GitHub
Родитель 3f84883ebf
Коммит d5135cce25
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 2 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
Просмотреть файл

@ -69,6 +69,7 @@
<Project>{7B095849-6FDB-4BD2-9B59-569D81A1A809}</Project> <Project>{7B095849-6FDB-4BD2-9B59-569D81A1A809}</Project>
<Name>Xamarin.MacDev.Tasks.Core</Name> <Name>Xamarin.MacDev.Tasks.Core</Name>
</ProjectReference> </ProjectReference>
<PackageReference Include="ILRepack" Version="2.0.18" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Xamarin.Mac.Common.ImplicitFacade.msbuild.targets"> <None Include="Xamarin.Mac.Common.ImplicitFacade.msbuild.targets">
@ -116,10 +117,8 @@
<None Include="../Xamarin.Shared/Xamarin.Shared.targets"> <None Include="../Xamarin.Shared/Xamarin.Shared.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\ILRepack.2.0.13\build\ILRepack.props" Condition="Exists('..\..\packages\ILRepack.2.0.13\build\ILRepack.props')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

4
msbuild/Xamarin.Mac.Tasks/packages.config
Просмотреть файл

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILRepack" version="2.0.13" targetFramework="net45" />
</packages>

5
msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
Просмотреть файл

@ -96,17 +96,14 @@
<Project>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</Project> <Project>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</Project>
<Name>Xamarin.MacDev</Name> <Name>Xamarin.MacDev</Name>
</ProjectReference> </ProjectReference>
<PackageReference Include="ILRepack" Version="2.0.18" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" /> <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
<Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" /> <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
<Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" /> <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\ILRepack.2.0.13\build\ILRepack.props" Condition="Exists('..\..\packages\ILRepack.2.0.13\build\ILRepack.props')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

4
msbuild/Xamarin.iOS.Tasks/packages.config
Просмотреть файл

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILRepack" version="2.0.13" targetFramework="net45" />
</packages>