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.

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

Jump to bottom

Maybe fix the unable to open file as zip archive error #7759

Merged
merged 8 commits into from
Feb 28, 2023
Merged

Maybe fix the unable to open file as zip archive error #7759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39e3519
Maybe fix the `unable to open file as zip archive` error
grendello Feb 1, 2023
f11a5ca
Merge branch 'main' into maybe-fix-zip
grendello Feb 10, 2023
02b022b
Merge branch 'main' into maybe-fix-zip
grendello Feb 22, 2023
1073a92
Merge branch 'main' into maybe-fix-zip
grendello Feb 24, 2023
d081e3e
Merge branch 'main' into maybe-fix-zip
grendello Feb 24, 2023
84ae410
Merge branch 'main' into maybe-fix-zip
grendello Feb 27, 2023
8214a43
Bump monodroid and LibZipSharp
grendello Feb 27, 2023
9478565
Bump xamarin-android-tools
grendello Feb 27, 2023
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@50faac94c6a0c27864564829ac83f3988c82f8ef
xamarin/monodroid:main@602aca98245744882a129206b79b5a5e093dae44
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<!-- Common <PackageReference/> versions -->
<PropertyGroup>
<LibZipSharpVersion>2.0.7</LibZipSharpVersion>
<LibZipSharpVersion>2.1.0</LibZipSharpVersion>
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated from 099fd9 to dbe42b
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
string apkName = dex.GetMetadata ("ApkName");
string dexPath = string.IsNullOrWhiteSpace (apkName) ? Path.GetFileName (dex.ItemSpec) : apkName;
AddFileToArchiveIfNewer (apk, dex.ItemSpec, DalvikPath + dexPath, compressionMethod: dexCompressionMethod);
apk.Flush ();
}

if (EmbedAssemblies && !BundleAssemblies) {
Expand Down