Skip to content

[Build] Bump Xamarin.LibZipSharp to 1.0.7 #4147

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 21, 2020
Merged

[Build] Bump Xamarin.LibZipSharp to 1.0.7 #4147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8d1ca8
[Build] Bump Xamarin.LibZipSharp to 1.0.7
dellis1972 Jan 20, 2020
0f7c1e4
Fix Third Party Notices
dellis1972 Jan 20, 2020
217c0ee
Move the LibZipSharp version number to a central location
dellis1972 Jan 20, 2020
5f6cac6
Fix Typo
dellis1972 Jan 20, 2020
fa12081
Fix typo's
dellis1972 Jan 20, 2020
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
1 change: 1 addition & 0 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
<_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled</_TestsProfiledAotName>
<_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
<TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
<LibZipSharpVersion>1.0.7</LibZipSharpVersion>
</PropertyGroup>
<PropertyGroup>
<MingwCommandPrefix32>i686-w64-mingw32</MingwCommandPrefix32>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/MSBuildReferences.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" IncludeAssets="compile"/>
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="Xamarin.Build.AsyncTask" Version="0.3.4" />
<PackageReference Include="Xamarin.LibZipSharp" Version="1.0.6" />
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
</ItemGroup>
<ItemGroup>
<!-- Copy system Microsoft.Build*.dll and dependencies for tests to run against. We can remove this
Expand Down
12 changes: 9 additions & 3 deletions build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Linq;

namespace Xamarin.Android.Prepare
{
[TPN]
class LibZipSharp_grendello_LibZipSharp_TPN : ThirdPartyNotice
class LibZipSharp_xamarin_LibZipSharp_TPN : ThirdPartyNotice
{
static readonly Uri url = new Uri ("https://github.com/xamarin/LibZipSharp/");
internal static readonly string LibZipSharpVersion = "1.0.6";
internal static string LibZipSharpVersion ()
{
var doc = XDocument.Load (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Configuration.props"));
return doc.Descendants(XName.Get("LibZipSharpVersion", @"http://schemas.microsoft.com/developer/msbuild/2003")).First().Value;
}
static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
"packages", "xamarin.libzipsharp", LibZipSharpVersion,
"packages", "xamarin.libzipsharp", LibZipSharpVersion (),
"Licences", "LICENSE");

public override string LicenseFile => licenseFile;
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ThirdPartyNotices/libzip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class libzip_nih_at_libzip_TPN : ThirdPartyNotice
{
static readonly Uri url = new Uri ("https://github.com/nih-at/libzip/");
static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
"packages", "xamarin.libzipsharp", LibZipSharp_grendello_LibZipSharp_TPN.LibZipSharpVersion,
"packages", "xamarin.libzipsharp", LibZipSharp_xamarin_LibZipSharp_TPN.LibZipSharpVersion (),
"Licences", "libzip", "LICENSE");

public override string LicenseFile => licenseFile;
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/xaprepare.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
<Version>5.3.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.LibZipSharp">
<Version>1.0.6</Version>
<Version>$(LibZipSharpVersion)</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Xml.SgmlReader" Version="1.8.14" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="Xamarin.LibZipSharp" Version="1.0.6" />
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
</ItemGroup>
<Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
<Import Project="..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
Expand Down