Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!--Import this file in projects needing to reference Microsoft.Build.*.dll -->
<PropertyGroup>
<MSBuildPackageReferenceVersion>16.10.0</MSBuildPackageReferenceVersion>
<LibZipSharpVersion>2.0.0-alpha7</LibZipSharpVersion>
<LibZipSharpVersion>2.0.0-alpha8</LibZipSharpVersion>
<MonoUnixVersion>7.0.0-alpha8.21302.6</MonoUnixVersion>
</PropertyGroup>

Expand All @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageReferenceVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageReferenceVersion)" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
<PackageReference Include="Xamarin.Build.AsyncTask" Version="0.3.4" GeneratePathProperty="true" />
<PackageReference Include="Xamarin.Build.AsyncTask" Version="0.4.0" GeneratePathProperty="true" />
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />
<PackageReference Include="Mono.Unix" Version="$(MonoUnixVersion)" GeneratePathProperty="true" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
<Import Project="..\tools\BuildTasks.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to do this to work around

error CS1705: Assembly 'Microsoft.Android.Build.BaseTasks' with identity 'Microsoft.Android.Build.BaseTasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065' uses 'libZipSharp, Version=1.0.7866.25205, Culture=neutral, PublicKeyToken=276db85bc4e20efc' which has a higher version than referenced assembly 'libZipSharp' with identity 'libZipSharp, Version=1.0.7866.25201, Culture=neutral, PublicKeyToken=276db85bc4e20efc'

Which is odd. But 🤷

<RootNamespace>Microsoft.Android.Build.Tasks</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateResxSource>true</GenerateResxSource>
<UpdateXlfOnBuild Condition=" '$(RunningOnCI)' != 'true' ">true</UpdateXlfOnBuild>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down