Skip to content
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.

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

[libzip-windows] use libzip.dll and zlib.dll from NuGet #877

Closed
wants to merge 1 commit into from

Conversation

jonathanpeppers
Copy link
Member

When bumping libzip in #874 or #863 libzip is no longer building under
mxe. We can switch to using the NuGet packages instead.

When bumping libzip in dotnet#874 or dotnet#863 libzip is no longer building under
mxe. We can switch to using the NuGet packages instead.
@jonathanpeppers
Copy link
Member Author

@jonpryor the only thing odd here is this introduces zlib.dll and I don't think we had that file before. Does this now need to be added to an installer/vsix somewhere?

If I look in my current system install on Windows in C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Xamarin\Android I only have libzip.dll and x64\libzip.dll.

Was the mxe build somehow getting around not having zlib.dll?

@jonathanpeppers
Copy link
Member Author

libzip.dll from my VS install:
image

libzip.dll from NuGet:
image

@grendello
Copy link
Contributor

@jonathanpeppers it's possible that your build linked in the static version of zlib. Nuget package appears to use a dynamic version of it. Not sure what we did before when building libzip but I think we did ship zlib.dll, @dellis1972 would know for sure

@dellis1972
Copy link
Contributor

@jonathanpeppers @grendello looking at the install dir on windows we have a zlib1.dll not a zlib.dll so that will be the one we ship. probably to stop clashes with any system version.

@dellis1972
Copy link
Contributor

But that might be from something else or a hang over from when we used Ionic.

@jonathanpeppers jonathanpeppers added the do-not-merge PR should not be merged. label Sep 20, 2017
@jonathanpeppers
Copy link
Member Author

I think we are going to wait on this PR for now.

//TODO: vsix built with xbuild has wrong path, something like Xamarin/Android/x64\zlib.dll

@dotnet dotnet deleted a comment from dnfclas Dec 12, 2017
@jonathanpeppers
Copy link
Member Author

I don’t think we need this anymore.

jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Sep 22, 2021
Context: dotnet/java-interop#884

Does It Build™?

Changes: jonpryor/java.interop@8f7ddcd...77d598d

  * jonpryor/java.interop@77d598d6: [build] Update more NuGet package versions
  * jonpryor/java.interop@b37a6478: [build] Bump various NuGets to match related repositories (dotnet#877)
  * jonpryor/java.interop@1e8f5137: [generator] Remove androidx.annotation from Annotation names (dotnet#882)
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Sep 23, 2021
Context: dotnet/java-interop#884

Does It Build™?

Changes: jonpryor/java.interop@8f7ddcd...27a4bf1

  * jonpryor/java.interop@77d598d6: [build] Update more NuGet package versions
  * jonpryor/java.interop@b37a6478: [build] Bump various NuGets to match related repositories (dotnet#877)
  * jonpryor/java.interop@1e8f5137: [generator] Remove androidx.annotation from Annotation names (dotnet#882)
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Sep 23, 2021
Context: dotnet/java-interop#884

Does It Build™?

Changes: jonpryor/java.interop@8f7ddcd...659ac71

  * jonpryor/java.interop@659ac71c: [build] Update more NuGet package versions
  * jonpryor/java.interop@3f12cd25: Revert "[generator] Remove androidx.annotation from Annotation names (dotnet#882)"
  * jonpryor/java.interop@b37a6478: [build] Bump various NuGets to match related repositories (dotnet#877)
  * jonpryor/java.interop@1e8f5137: [generator] Remove androidx.annotation from Annotation names (dotnet#882)
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Sep 24, 2021
Changes: dotnet/java-interop@8f7ddcd...c936d09

  * dotnet/java-interop@c936d09a: [build] Update more NuGet package versions (dotnet#884)
  * dotnet/java-interop@3f12cd25: Revert "[generator] Remove androidx.annotation from Annotation names (dotnet#882)"
  * dotnet/java-interop@b37a6478: [build] Bump various NuGets to match related repositories (dotnet#877)
  * dotnet/java-interop@1e8f5137: [generator] Remove androidx.annotation from Annotation names (dotnet#882)
jonpryor added a commit that referenced this pull request Sep 24, 2021
Changes: dotnet/java-interop@8f7ddcd...c936d09

  * dotnet/java-interop@c936d09a: [build] Update more NuGet package versions (#884)
  * dotnet/java-interop@3f12cd25: Revert "[generator] Remove androidx.annotation from Annotation names (#882)"
  * dotnet/java-interop@b37a6478: [build] Bump various NuGets to match related repositories (#877)
  * dotnet/java-interop@1e8f5137: [generator] Remove androidx.annotation from Annotation names (#882)
@jonathanpeppers jonathanpeppers deleted the libzip-nuget branch April 26, 2023 15:31
@github-actions github-actions bot locked and limited conversation to collaborators Feb 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
do-not-merge PR should not be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants