[Xamarin.Android.Build.Tasks] Something leaves classes.jar files open…

… until MSBuild exits (#5457) * [Xamarin.Android.Build.Tasks] Something leaves classes.jar files open until MSBuild exits Fixes #5424 There is a bug in BuildApk where the Stream being passed to LibZipSharp is NOT being disposed of. This is probably the cause of the classes.jar file being left open. * Add Release notes
dotnet · Jan 5, 2021 · 2e92452 · 2e92452
1 parent ffbba9d
commit 2e92452
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Documentation/release-notes/5457.md b/Documentation/release-notes/5457.md
@@ -0,0 +1,4 @@
+#### Application and library build and deployment
+
+* [GitHub Issue 5424](https://github.com/xamarin/xamarin-android/issues/5424):
+  Fixed a file lock on `classes.jar` when building on Windows.
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
@@ -229,7 +229,8 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
 
 				count = 0;
 				foreach (var jarFile in jarFilePaths) {
-					using (var jar = ZipArchive.Open (File.OpenRead (jarFile))) {
+					using (var stream = File.OpenRead (jarFile))
+					using (var jar = ZipArchive.Open (stream)) {
 						foreach (var jarItem in jar) {
 							if (jarItem.IsDirectory)
 								continue;