From a5f1bc3895177056370b84618cf97d7c14fc6339 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 14 Sep 2022 22:28:31 -0400 Subject: [PATCH] rename list name to match intent --- Oqtane.Client/Program.cs | 14 +++++++------- Oqtane.Maui/MauiProgram.cs | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs index d08a5f30..31219ace 100644 --- a/Oqtane.Client/Program.cs +++ b/Oqtane.Client/Program.cs @@ -63,7 +63,7 @@ namespace Oqtane.Client { var dlls = new Dictionary(); var pdbs = new Dictionary(); - var filter = new List(); + var list = new List(); var jsRuntime = serviceProvider.GetRequiredService(); var interop = new Interop(jsRuntime); @@ -81,14 +81,14 @@ namespace Oqtane.Client var file = files.FirstOrDefault(item => item.Contains(assembly)); if (file == null) { - filter.Add(assembly); + list.Add(assembly); } else { // check if newer version available if (GetFileDate(assembly) > GetFileDate(file)) { - filter.Add(assembly); + list.Add(assembly); } } } @@ -96,7 +96,7 @@ namespace Oqtane.Client // get assemblies already downloaded foreach (var file in files) { - if (assemblies.Contains(file) && !filter.Contains(file)) + if (assemblies.Contains(file) && !list.Contains(file)) { try { @@ -128,13 +128,13 @@ namespace Oqtane.Client } else { - filter.Add("*"); + list.Add("*"); } - if (filter.Count != 0) + if (list.Count != 0) { // get assemblies from server and load into client app domain - var zip = await http.GetByteArrayAsync($"/api/Installation/load?list=" + string.Join(",", filter)); + var zip = await http.GetByteArrayAsync($"/api/Installation/load?list=" + string.Join(",", list)); // asemblies and debug symbols are packaged in a zip file using (ZipArchive archive = new ZipArchive(new MemoryStream(zip))) diff --git a/Oqtane.Maui/MauiProgram.cs b/Oqtane.Maui/MauiProgram.cs index 504f90dd..557c51c1 100644 --- a/Oqtane.Maui/MauiProgram.cs +++ b/Oqtane.Maui/MauiProgram.cs @@ -72,7 +72,7 @@ public static class MauiProgram var dlls = new Dictionary(); var pdbs = new Dictionary(); - var filter = new List(); + var list = new List(); var files = new List(); foreach (var file in Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories)) @@ -92,14 +92,14 @@ public static class MauiProgram var file = files.FirstOrDefault(item => item.Contains(assembly)); if (file == null) { - filter.Add(assembly); + list.Add(assembly); } else { // check if newer version available if (GetFileDate(assembly) > GetFileDate(file)) { - filter.Add(assembly); + list.Add(assembly); } } } @@ -107,7 +107,7 @@ public static class MauiProgram // get assemblies already downloaded foreach (var file in files) { - if (assemblies.Contains(file) && !filter.Contains(file)) + if (assemblies.Contains(file) && !list.Contains(file)) { try { @@ -141,13 +141,13 @@ public static class MauiProgram } else { - filter.Add("*"); + list.Add("*"); } - if (filter.Count != 0) + if (list.Count != 0) { // get assemblies from server - var zip = Task.Run(() => http.GetByteArrayAsync("/api/Installation/load?list=" + string.Join(",", filter))).GetAwaiter().GetResult(); + var zip = Task.Run(() => http.GetByteArrayAsync("/api/Installation/load?list=" + string.Join(",", list))).GetAwaiter().GetResult(); // asemblies and debug symbols are packaged in a zip file using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))