- Change minimum to be 32 for BlockSize

- Update Nuget Packages - Update copyright notice(s) - Update installer to include system dll's #74
Smurf-IV · Apr 4, 2021 · e6adc37 · e6adc37
1 parent d6644f1
commit e6adc37
Show file tree

Hide file tree

Showing 49 changed files with 1,146 additions and 1,107 deletions.
diff --git a/Elucidate/Elucidate Windows Installer/Elucidate.wxs b/Elucidate/Elucidate Windows Installer/Elucidate.wxs
@@ -74,17 +74,12 @@
             </Component>
 
             <Component>
-                <File Source="$(var.MgtSource)\Krypton Docking.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.Docking" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\Krypton Navigator.dll" KeyPath="yes" >
+                <File Source="$(var.MgtSource)\Krypton.Navigator.dll" KeyPath="yes" >
                     <netfx:NativeImage Id="ngen.Navigator" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
             <Component>
-                <File Source="$(var.MgtSource)\Krypton Toolkit.dll" KeyPath="yes" >
+                <File Source="$(var.MgtSource)\Krypton.Toolkit.dll" KeyPath="yes" >
                     <netfx:NativeImage Id="ngen.Toolkit" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
@@ -93,6 +88,41 @@
                     <netfx:NativeImage Id="ngen.NLog" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Buffers.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Buffers" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Collections.Immutable.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Collections.Immutable" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Memory.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Memory" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Numerics.Vectors.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Numerics.Vectors" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Reflection.Metadata.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Reflection.Metadata" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Runtime.CompilerServices.Unsafe.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Runtime.CompilerServices.Unsafe" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
+            <Component>
+                <File Source="$(var.MgtSource)\System.Threading.Tasks.Extensions.dll" KeyPath="yes" >
+                    <netfx:NativeImage Id="ngen.System.Threading.Tasks.Extensions" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
+                </File>
+            </Component>
 
 
             <!-- Text and help files-->

diff --git a/Elucidate/Elucidate Windows Installer/KryptonLicense.txt b/Elucidate/Elucidate Windows Installer/KryptonLicense.txt
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018 - 2019, Peter Wagner & Simon Coghlan
+Copyright (c) 2018 - 2021, Peter Wagner & Simon Coghlan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Elucidate/Elucidate/CmdLine/DupVerb.cs b/Elucidate/Elucidate/CmdLine/DupVerb.cs
@@ -31,7 +31,7 @@
 namespace Elucidate.CmdLine
 {
     [Verb("dup", HelpText = "Lists all the duplicate files. Two files are assumed equal if their hashes are matching. ")]
-    internal class DupVerb : StdOptions    
+    internal class DupVerb : StdOptions
     {
     }
 }
diff --git a/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs b/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -48,7 +47,7 @@ protected override void Paint(System.Drawing.Graphics g, System.Drawing.Rectangl
         {
             try
             {
-                string s = ((string) value);
+                string s = ((string)value);
                 if (string.IsNullOrWhiteSpace(s))
                 {
                     return;

diff --git a/Elucidate/Elucidate/Controls/ListBoxLog.cs b/Elucidate/Elucidate/Controls/ListBoxLog.cs
@@ -125,7 +125,7 @@ private void MeasureItem(object sender, MeasureItemEventArgs e)
                 }
 
                 Size sizeF = TextRenderer.MeasureText(e.Graphics, logEvent.Message, listBoxInt.Font);
-                
+
                 e.ItemHeight = sizeF.Height + 2;
                 if (listBoxInt.HorizontalExtent < sizeF.Width)
                 {
@@ -233,30 +233,30 @@ private void timer1_Tick(object sender, EventArgs e)
                 // Now lock in case the timer is overlapping !
                 alreadyDequing = true;
 
-                listBoxInt.BeginInvoke((MethodInvoker) delegate
-                {
+                listBoxInt.BeginInvoke((MethodInvoker)delegate
+               {
                     //some stuffs for best performance
                     listBoxInt.BeginUpdate();
 
                     // find the style to use
                     while (pendingLogMessages.TryDequeue(out LogString log))
-                    {
-                        listBoxInt.Items.Add(log);
-                    }
-
-                    if (listBoxInt.Items.Count > maxEntriesInListBox)
-                    {
-                        listBoxInt.Items.RemoveAt(0);
-                    }
-
-                    if (!Paused)
-                    {
-                        listBoxInt.TopIndex = listBoxInt.Items.Count - 1;
-                    }
-
-                    listBoxInt.EndUpdate();
-                    alreadyDequing = false;
-                }
+                   {
+                       listBoxInt.Items.Add(log);
+                   }
+
+                   if (listBoxInt.Items.Count > maxEntriesInListBox)
+                   {
+                       listBoxInt.Items.RemoveAt(0);
+                   }
+
+                   if (!Paused)
+                   {
+                       listBoxInt.TopIndex = listBoxInt.Items.Count - 1;
+                   }
+
+                   listBoxInt.EndUpdate();
+                   alreadyDequing = false;
+               }
                 );
             }
             catch (Exception ex)

diff --git a/Elucidate/Elucidate/Controls/LogsViewerControl.cs b/Elucidate/Elucidate/Controls/LogsViewerControl.cs
@@ -2,7 +2,7 @@
 // ---------------------------------------------------------------------------------------------------------------
 //  <copyright file="LogsViewerControl.cs" company="Smurf-IV">
 // 
-//  Copyright (C) 2018-2020  Simon Coghlan (Aka Smurf-IV) & BlueBlock 2018
+//  Copyright (C) 2018-2021  Simon Coghlan (Aka Smurf-IV) & BlueBlock 2018
 // 
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by

diff --git a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs
diff --git a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs
@@ -1,7 +1,7 @@
 #region Copyright (C)
 //  <copyright file="ProtectedDrivesDisplay.cs" company="Smurf-IV">
 //
-//  Copyright (C) 2019-2020 Smurf-IV
+//  Copyright (C) 2019-2021 Smurf-IV
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -62,15 +62,15 @@ private void IncrementWaitCursor()
         {
             if (Interlocked.Increment(ref useWaitCursor) == 1)
             {
-                BeginInvoke((MethodInvoker) (() => UseWaitCursor = true));
+                BeginInvoke((MethodInvoker)(() => UseWaitCursor = true));
             }
         }
 
         private void DecrementWaitCursor()
         {
             if (Interlocked.Decrement(ref useWaitCursor) <= 0)
             {
-                BeginInvoke((MethodInvoker) (() => UseWaitCursor = false));
+                BeginInvoke((MethodInvoker)(() => UseWaitCursor = false));
             }
         }
 
@@ -118,7 +118,7 @@ private void driveGrid_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e
         {
             if (!cancelTokenSrc.IsCancellationRequested)
             {
-                for (int index = e.RowIndex; index < e.RowIndex+ e.RowCount; index++)
+                for (int index = e.RowIndex; index < e.RowIndex + e.RowCount; index++)
                 {
                     // Get data to perform drive usage display
                     DataGridViewRow row = driveGrid.Rows[index];
@@ -158,20 +158,20 @@ private void ProcessProtectedSpace(DataGridViewRow row, DriveInfo driveInfo,
             ulong protectedUse = DirSize(dirInfo, token);
             if (!token.IsCancellationRequested)
             {
-                BeginInvoke((MethodInvoker) delegate
-                {
-                    try
-                    {
-                        row.Cells[2].Value = $@"{protectedUse}:{totalUsed}:{driveInfo.TotalSize}";
-                        row.Cells[3].Value =
-                            $@"{new ByteSize(protectedUse)} : {new ByteSize(totalUsed)} : {new ByteSize(driveInfo.TotalSize)}";
-                    }
-                    catch
-                    {
+                BeginInvoke((MethodInvoker)delegate
+               {
+                   try
+                   {
+                       row.Cells[2].Value = $@"{protectedUse}:{totalUsed}:{driveInfo.TotalSize}";
+                       row.Cells[3].Value =
+                           $@"{new ByteSize(protectedUse)} : {new ByteSize(totalUsed)} : {new ByteSize(driveInfo.TotalSize)}";
+                   }
+                   catch
+                   {
                         // Do nothing
                         // Might be caused by fast closure
                     }
-                });
+               });
             }
 
             DecrementWaitCursor();
@@ -192,7 +192,7 @@ private static ulong DirSize(DirectoryInfo dir, CancellationToken token)
                     return 0UL;
                 }
 
-                return dir.EnumerateFiles().AsParallel().Sum(fi => (ulong)fi.Length) 
+                return dir.EnumerateFiles().AsParallel().Sum(fi => (ulong)fi.Length)
                        + dir.EnumerateDirectories()
                            .Where(d => (d.Attributes & System.IO.FileAttributes.System) == 0 && (d.Attributes & System.IO.FileAttributes.Hidden) == 0)
                            .AsParallel()