Convert to using Properties

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

@@ -140,6 +140,12 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
 				refresh = false;
 			}
 			using (var apk = new ZipArchiveEx (apkOutputPath, File.Exists (apkOutputPath) ? FileMode.Open : FileMode.Create )) {
+				if (int.TryParse (ZipFlushFilesLimit, out int flushFilesLimit)) {
+					apk.ZipFlushFilesLimit = flushFilesLimit;
+				}
+				if (int.TryParse (ZipFlushSizeLimit, out int flushSizeLimit)) {
+					apk.ZipFlushSizeLimit = flushSizeLimit;
+				}
 				if (refresh) {
 					for (long i = 0; i < apk.Archive.EntryCount; i++) {
 						ZipEntry e = apk.Archive.ReadEntry ((ulong) i);
@@ -294,12 +300,6 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
 
 		public override bool RunTask ()
 		{
-			if (int.TryParse (ZipFlushFilesLimit, out int flushFilesLimit)) {
-				ZipArchiveEx.ZipFlushFilesLimit = flushFilesLimit;
-			}
-			if (int.TryParse (ZipFlushSizeLimit, out int flushSizeLimit)) {
-				ZipArchiveEx.ZipFlushSizeLimit = flushSizeLimit;
-			}
 			Aot.TryGetSequencePointsMode (AndroidSequencePointsMode, out sequencePointsMode);
 
 			var outputFiles = new List<string> ();

src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveEx.cs

@@ -8,8 +8,8 @@ namespace Xamarin.Android.Tasks
 	public class ZipArchiveEx : IDisposable
 	{
 
-		public static int ZipFlushSizeLimit = 100 * 1024 * 1024;
-		public static int ZipFlushFilesLimit = 512;
+		const int DEFAULT_FLUSH_SIZE_LIMIT = 100 * 1024 * 1024;
+		const int DEFAULT_FLUSH_FILES_LIMIT = 512;
 
 		ZipArchive zip;
 		string archive;
@@ -24,6 +24,9 @@ public ZipArchive Archive {
 
 		public bool CreateDirectoriesInZip { get; set; } = true;
 
+		public int ZipFlushSizeLimit { get; set; } = DEFAULT_FLUSH_SIZE_LIMIT;
+		public int ZipFlushFilesLimit { get; set; } = DEFAULT_FLUSH_FILES_LIMIT;
+
 		public ZipArchiveEx (string archive) : this (archive, FileMode.CreateNew)
 		{
 		}
@@ -65,7 +68,7 @@ void AddFileAndFlush (string filename, long fileLength, string archiveFileName,
 		{
 			filesWrittenTotalSize += fileLength;
 			zip.AddFile (filename, archiveFileName, compressionMethod: compressionMethod);
-			if ((filesWrittenTotalSize >= ZipArchiveEx.ZipFlushSizeLimit || filesWrittenTotalCount >= ZipArchiveEx.ZipFlushFilesLimit) && AutoFlush) {
+			if ((filesWrittenTotalSize >= ZipFlushSizeLimit || filesWrittenTotalCount >= ZipFlushFilesLimit) && AutoFlush) {
 				Flush ();
 			}
 		}
@@ -80,7 +83,7 @@ public void AddEntryAndFlush (byte[] data, string archiveFileName)
 		{
 			filesWrittenTotalSize += data.Length;
 			zip.AddEntry (data, archiveFileName);
-			if ((filesWrittenTotalSize >= ZipArchiveEx.ZipFlushSizeLimit || filesWrittenTotalCount >= ZipArchiveEx.ZipFlushFilesLimit) && AutoFlush) {
+			if ((filesWrittenTotalSize >= ZipFlushSizeLimit || filesWrittenTotalCount >= ZipFlushFilesLimit) && AutoFlush) {
 				Flush ();
 			}
 		}
@@ -89,7 +92,7 @@ public void AddEntryAndFlush (string archiveFileName, Stream data, CompressionMe
 		{
 			filesWrittenTotalSize += data.Length;
 			zip.AddEntry (archiveFileName, data, method);
-			if ((filesWrittenTotalSize >= ZipArchiveEx.ZipFlushSizeLimit || filesWrittenTotalCount >= ZipArchiveEx.ZipFlushFilesLimit) && AutoFlush) {
+			if ((filesWrittenTotalSize >= ZipFlushSizeLimit || filesWrittenTotalCount >= ZipFlushFilesLimit) && AutoFlush) {
 				Flush ();
 			}
 		}