Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename list name to match intent

Browse Source
This commit is contained in:
Shaun Walker 2022-09-14 22:28:31 -04:00
parent 45df729711
commit a5f1bc3895
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Client/Program.cs
View File

@ -63,7 +63,7 @@ namespace Oqtane.Client
{ {
var dlls = new Dictionary<string, byte[]>(); var dlls = new Dictionary<string, byte[]>();
var pdbs = new Dictionary<string, byte[]>(); var pdbs = new Dictionary<string, byte[]>();
var filter = new List<string>(); var list = new List<string>();
var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>(); var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
var interop = new Interop(jsRuntime); var interop = new Interop(jsRuntime);
@ -81,14 +81,14 @@ namespace Oqtane.Client
var file = files.FirstOrDefault(item => item.Contains(assembly)); var file = files.FirstOrDefault(item => item.Contains(assembly));
if (file == null) if (file == null)
{ {
filter.Add(assembly); list.Add(assembly);
} }
else else
{ {
// check if newer version available // check if newer version available
if (GetFileDate(assembly) > GetFileDate(file)) if (GetFileDate(assembly) > GetFileDate(file))
{ {
filter.Add(assembly); list.Add(assembly);
} }
} }
} }
@ -96,7 +96,7 @@ namespace Oqtane.Client
// get assemblies already downloaded // get assemblies already downloaded
foreach (var file in files) foreach (var file in files)
{ {
if (assemblies.Contains(file) && !filter.Contains(file)) if (assemblies.Contains(file) && !list.Contains(file))
{ {
try try
{ {
@ -128,13 +128,13 @@ namespace Oqtane.Client
} }
else else
{ {
filter.Add("*"); list.Add("*");
} }
if (filter.Count != 0) if (list.Count != 0)
{ {
// get assemblies from server and load into client app domain // 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 // asemblies and debug symbols are packaged in a zip file
using (ZipArchive archive = new ZipArchive(new MemoryStream(zip))) using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))

14
Oqtane.Maui/MauiProgram.cs
View File

@ -72,7 +72,7 @@ public static class MauiProgram
var dlls = new Dictionary<string, byte[]>(); var dlls = new Dictionary<string, byte[]>();
var pdbs = new Dictionary<string, byte[]>(); var pdbs = new Dictionary<string, byte[]>();
var filter = new List<string>(); var list = new List<string>();
var files = new List<string>(); var files = new List<string>();
foreach (var file in Directory.EnumerateFiles(folder, "*.dll", SearchOption.AllDirectories)) 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)); var file = files.FirstOrDefault(item => item.Contains(assembly));
if (file == null) if (file == null)
{ {
filter.Add(assembly); list.Add(assembly);
} }
else else
{ {
// check if newer version available // check if newer version available
if (GetFileDate(assembly) > GetFileDate(file)) if (GetFileDate(assembly) > GetFileDate(file))
{ {
filter.Add(assembly); list.Add(assembly);
} }
} }
} }
@ -107,7 +107,7 @@ public static class MauiProgram
// get assemblies already downloaded // get assemblies already downloaded
foreach (var file in files) foreach (var file in files)
{ {
if (assemblies.Contains(file) && !filter.Contains(file)) if (assemblies.Contains(file) && !list.Contains(file))
{ {
try try
{ {
@ -141,13 +141,13 @@ public static class MauiProgram
} }
else else
{ {
filter.Add("*"); list.Add("*");
} }
if (filter.Count != 0) if (list.Count != 0)
{ {
// get assemblies from server // 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 // asemblies and debug symbols are packaged in a zip file
using (ZipArchive archive = new ZipArchive(new MemoryStream(zip))) using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))