diff --git a/build-tools/libzip-windows/libzip-windows.mdproj b/build-tools/libzip-windows/libzip-windows.mdproj index 1797df2e16f..f8899bd5245 100644 --- a/build-tools/libzip-windows/libzip-windows.mdproj +++ b/build-tools/libzip-windows/libzip-windows.mdproj @@ -15,23 +15,7 @@ $(XAInstallPrefix)xbuild\Xamarin\Android\ - - - ResolveReferences; - _BuildUnlessCached - - - - - - {8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} - android-toolchain - False - - - - diff --git a/build-tools/libzip-windows/libzip-windows.projitems b/build-tools/libzip-windows/libzip-windows.projitems index f77d1cab3f1..5ee731d2053 100644 --- a/build-tools/libzip-windows/libzip-windows.projitems +++ b/build-tools/libzip-windows/libzip-windows.projitems @@ -1,28 +1,17 @@ - <_LibZipTarget Include="host-mxe-Win64" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))"> - $(AndroidMxeFullPath)\bin\x86_64-w64-mingw32.static-cmake - - x64/libzip.dll - lib/libzip.dll - - <_LibZipTarget Include="host-mxe-Win32" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:'))"> - $(AndroidMxeFullPath)\bin\i686-w64-mingw32.static-cmake - - libzip.dll - lib/libzip.dll - - <_NuGetBinary Include="..\..\external\LibZipSharp\bin\$(OS)\$(Configuration)\libzip.dll"> + + <_NuGetBinary Include="..\..\packages\libzip.redist.1.1.2.7\build\native\bin\Win32\v140\Release\zip.dll"> libzip.dll - <_NuGetBinary Include="..\..\external\LibZipSharp\bin\$(OS)\$(Configuration)\zlib.dll"> + <_NuGetBinary Include="..\..\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\bin\v140\Win32\Release\dynamic\cdecl\zlib.dll"> zlib.dll - <_NuGetBinary Include="..\..\external\LibZipSharp\bin\$(OS)\$(Configuration)\x64\libzip.dll"> + <_NuGetBinary Include="..\..\packages\libzip.redist.1.1.2.7\build\native\bin\x64\v140\Release\zip.dll"> x64\libzip.dll - <_NuGetBinary Include="..\..\external\LibZipSharp\bin\$(OS)\$(Configuration)\x64\zlib.dll"> + <_NuGetBinary Include="..\..\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\bin\v140\x64\Release\dynamic\cdecl\zlib.dll"> x64\zlib.dll diff --git a/build-tools/libzip-windows/libzip-windows.targets b/build-tools/libzip-windows/libzip-windows.targets index b16375e180d..82616d6d2c2 100644 --- a/build-tools/libzip-windows/libzip-windows.targets +++ b/build-tools/libzip-windows/libzip-windows.targets @@ -1,7 +1,6 @@ + + + + \ No newline at end of file