Convert all files to file-scoped name space

src/Velopack.Packaging.Unix/AppImageTool.cs

@@ -7,10 +7,10 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging.Unix
+namespace Velopack.Packaging.Unix;
+
+public class AppImageTool
 {
-    public class AppImageTool
-    {
     [SupportedOSPlatform("linux")]
     public static void CreateLinuxAppImage(string appDir, string outputFile, RuntimeCpu machine, ILogger logger)
     {
@@ -33,5 +33,4 @@ namespace Velopack.Packaging.Unix
         Exe.InvokeAndThrowIfNonZero(tool, new[] { appDir, outputFile }, null, envVar);
         Chmod.ChmodFileAsExecutable(outputFile);
     }
-    }
 }

src/Velopack.Packaging.Unix/Commands/LinuxPackCommandRunner.cs

@@ -8,11 +8,11 @@ using ELFSharp.ELF;
 using Microsoft.Extensions.Logging;
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Packaging.Unix.Commands
+namespace Velopack.Packaging.Unix.Commands;
+
+[SupportedOSPlatform("linux")]
+public class LinuxPackCommandRunner : PackageBuilder<LinuxPackOptions>
 {
-    [SupportedOSPlatform("linux")]
-    public class LinuxPackCommandRunner : PackageBuilder<LinuxPackOptions>
-    {
     protected string PortablePackagePath { get; set; }
 
     public LinuxPackCommandRunner(ILogger logger, IFancyConsole console)
@@ -107,5 +107,4 @@ Categories=Development;
         progress(-1); // there is only one "file", so progress will not work
         return base.CreateDeltaPackage(progress, releasePkg, prevReleasePkg, outputPkg, mode);
     }
-    }
 }

src/Velopack.Packaging.Unix/Commands/LinuxPackOptions.cs

@@ -5,10 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Packaging.Unix.Commands
+namespace Velopack.Packaging.Unix.Commands;
+
+public class LinuxPackOptions : IPackOptions
 {
-    public class LinuxPackOptions : IPackOptions
-    {
     public DirectoryInfo ReleaseDir { get; set; }
 
     public string PackId { get; set; }
@@ -34,5 +34,4 @@ namespace Velopack.Packaging.Unix.Commands
     public string Channel { get; set; }
 
     public bool PackIsAppDir { get; set; }
-    }
 }

src/Velopack.Packaging.Windows/AuthenticodeTools.cs

@@ -2,12 +2,12 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
-namespace Velopack.Packaging.Windows
+namespace Velopack.Packaging.Windows;
+
+[SupportedOSPlatform("windows")]
+[ExcludeFromCodeCoverage]
+public static class AuthenticodeTools
 {
-    [SupportedOSPlatform("windows")]
-    [ExcludeFromCodeCoverage]
-    public static class AuthenticodeTools
-    {
     [DllImport("Wintrust.dll", PreserveSig = true, SetLastError = false)]
     static extern uint WinVerifyTrust(IntPtr hWnd, IntPtr pgActionID, IntPtr pWinTrustData);
 
@@ -35,11 +35,11 @@ namespace Velopack.Packaging.Windows
     {
         return winVerifyTrust(fileName) == 0;
     }
-    }
+}
 
-    [ExcludeFromCodeCoverage]
-    internal struct WINTRUST_FILE_INFO : IDisposable
-    {
+[ExcludeFromCodeCoverage]
+internal struct WINTRUST_FILE_INFO : IDisposable
+{
     public WINTRUST_FILE_INFO(string fileName, Guid subject)
     {
 
@@ -77,44 +77,44 @@ namespace Velopack.Packaging.Windows
             Marshal.FreeHGlobal(this.pgKnownSubject);
         }
     }
-    }
+}
 
-    enum AllocMethod
-    {
+enum AllocMethod
+{
     HGlobal, CoTaskMem
-    };
+};
 
-    enum UnionChoice
-    {
+enum UnionChoice
+{
     File = 1,
     Catalog,
     Blob,
     Signer,
     Cert
-    };
+};
 
-    enum UiChoice
-    {
+enum UiChoice
+{
     All = 1,
     NoUI,
     NoBad,
     NoGood
-    };
-    enum RevocationCheckFlags
-    {
+};
+enum RevocationCheckFlags
+{
     None = 0,
     WholeChain
-    };
-    enum StateAction
-    {
+};
+enum StateAction
+{
     Ignore = 0,
     Verify,
     Close,
     AutoCache,
     AutoCacheFlush
-    };
-    enum TrustProviderFlags
-    {
+};
+enum TrustProviderFlags
+{
     UseIE4Trust = 1,
     NoIE4Chain = 2,
     NoPolicyUsage = 4,
@@ -126,18 +126,18 @@ namespace Velopack.Packaging.Windows
     HashOnly = 512,
     UseDefaultOSVerCheck = 1024,
     LifetimeSigning = 2048
-    };
-    enum UIContext
-    {
+};
+enum UIContext
+{
     Execute = 0,
     Install
-    };
+};
 
-    [StructLayout(LayoutKind.Sequential)]
+[StructLayout(LayoutKind.Sequential)]
 
-    [ExcludeFromCodeCoverage]
-    internal struct WINTRUST_DATA : IDisposable
-    {
+[ExcludeFromCodeCoverage]
+internal struct WINTRUST_DATA : IDisposable
+{
     public WINTRUST_DATA(WINTRUST_FILE_INFO fileInfo)
     {
         this.cbStruct = (uint) Marshal.SizeOf(typeof(WINTRUST_DATA));
@@ -192,11 +192,11 @@ namespace Velopack.Packaging.Windows
 
         Marshal.FreeHGlobal(pInfoStruct);
     }
-    }
+}
 
-    [ExcludeFromCodeCoverage]
-    internal sealed class UnmanagedPointer : IDisposable
-    {
+[ExcludeFromCodeCoverage]
+internal sealed class UnmanagedPointer : IDisposable
+{
     IntPtr m_ptr;
     AllocMethod m_meth;
 
@@ -237,6 +237,5 @@ namespace Velopack.Packaging.Windows
     {
         return ptr.m_ptr;
     }
-    }
 }
 

src/Velopack.Packaging.Windows/CodeSign.cs

@@ -4,11 +4,11 @@ using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging.Windows
+namespace Velopack.Packaging.Windows;
+
+[SupportedOSPlatform("windows")]
+public class CodeSign
 {
-    [SupportedOSPlatform("windows")]
-    public class CodeSign
-    {
     public ILogger Log { get; }
 
     public CodeSign(ILogger logger)
@@ -236,5 +236,4 @@ namespace Velopack.Packaging.Windows
 
     //    return new ProcessResult(pi.ExitCode, textResult.Trim());
     //}
-    }
 }

src/Velopack.Packaging.Windows/DotnetUtil.cs

@@ -8,10 +8,10 @@ using Microsoft.Extensions.Logging;
 using NuGet.Versioning;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging.Windows
+namespace Velopack.Packaging.Windows;
+
+public class DotnetUtil
 {
-    public class DotnetUtil
-    {
     public static NuGetVersion VerifyVelopackApp(string exeFile, ILogger log)
     {
         try {
@@ -148,5 +148,4 @@ namespace Velopack.Packaging.Windows
             return null;
         }
     }
-    }
 }

src/Velopack.Packaging.Windows/Rcedit.cs

@@ -6,11 +6,11 @@ using System.Text;
 using System.Threading.Tasks;
 using Velopack.NuGet;
 
-namespace Velopack.Packaging.Windows
+namespace Velopack.Packaging.Windows;
+
+[SupportedOSPlatform("windows")]
+public class Rcedit
 {
-    [SupportedOSPlatform("windows")]
-    public class Rcedit
-    {
     public static void SetExeIcon(string exePath, string iconPath)
     {
         var args = new[] { Path.GetFullPath(exePath), "--set-icon", iconPath };
@@ -39,5 +39,4 @@ namespace Velopack.Packaging.Windows
 
         Utility.Retry(() => Exe.InvokeAndThrowIfNonZero(HelperFile.RceditPath, args, null));
     }
-    }
 }

src/Velopack.Packaging/Abstractions/ICommand.cs

@@ -1,9 +1,8 @@
 using Microsoft.Extensions.Logging;
 
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface ICommand<TOpt> where TOpt : class
 {
-    public interface ICommand<TOpt> where TOpt : class
-    {
     Task Run(TOpt options);
-    }
 }

src/Velopack.Packaging/Abstractions/IFancyConsole.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Logging;
 
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface IFancyConsole
 {
-    public interface IFancyConsole
-    {
     Task ExecuteProgressAsync(Func<IFancyConsoleProgress, Task> action);
 
     void WriteTable(string tableName, IEnumerable<IEnumerable<string>> rows, bool hasHeaderRow = true);
@@ -11,5 +11,4 @@ namespace Velopack.Packaging.Abstractions
     Task<bool> PromptYesNo(string prompt, bool? defaultValue = null, TimeSpan? timeout = null);
 
     void WriteLine(string text = "");
-    }
 }

src/Velopack.Packaging/Abstractions/IFancyConsoleProgress.cs

@@ -1,7 +1,6 @@
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface IFancyConsoleProgress
 {
-    public interface IFancyConsoleProgress
-    {
     Task RunTask(string name, Func<Action<int>, Task> fn);
-    }
 }

src/Velopack.Packaging/Abstractions/IOutputOptions.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface IOutputOptions
 {
-    public interface IOutputOptions
-    {
     DirectoryInfo ReleaseDir { get; }
-    }
 }

src/Velopack.Packaging/Abstractions/IPackOptions.cs

@@ -1,9 +1,8 @@
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface IPackOptions : INugetPackCommand, IPlatformOptions
 {
-    public interface IPackOptions : INugetPackCommand, IPlatformOptions
-    {
     string Channel { get; }
     DeltaMode DeltaMode { get; }
     string EntryExecutableName { get; }
-    }
 }

src/Velopack.Packaging/Abstractions/IPlatformOptions.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Packaging.Abstractions
+namespace Velopack.Packaging.Abstractions;
+
+public interface IPlatformOptions : IOutputOptions
 {
-    public interface IPlatformOptions : IOutputOptions
-    {
     RID TargetRuntime { get; }
-    }
 }

src/Velopack.Packaging/BuildAssets.cs

@@ -1,10 +1,10 @@
 using Velopack.Json;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging
+namespace Velopack.Packaging;
+
+public class BuildAssets
 {
-    public class BuildAssets
-    {
     public List<string> Files { get; set; } = new List<string>();
 
     public List<VelopackAsset> GetReleaseEntries()
@@ -33,5 +33,4 @@ namespace Velopack.Packaging
         }
         return SimpleJson.DeserializeObject<BuildAssets>(File.ReadAllText(path));
     }
-    }
 }

src/Velopack.Packaging/Commands/DeltaGenCommandRunner.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Logging;
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Packaging.Commands
+namespace Velopack.Packaging.Commands;
+
+public class DeltaGenCommandRunner : ICommand<DeltaGenOptions>
 {
-    public class DeltaGenCommandRunner : ICommand<DeltaGenOptions>
-    {
     private readonly ILogger _logger;
     private readonly IFancyConsole _console;
 
@@ -27,5 +27,4 @@ namespace Velopack.Packaging.Commands
             });
         });
     }
-    }
 }

src/Velopack.Packaging/Commands/DeltaGenOptions.cs

@@ -1,7 +1,7 @@
-namespace Velopack.Packaging.Commands
+namespace Velopack.Packaging.Commands;
+
+public class DeltaGenOptions
 {
-    public class DeltaGenOptions
-    {
     public DeltaMode DeltaMode { get; set; }
 
     public string BasePackage { get; set; }
@@ -9,5 +9,4 @@
     public string NewPackage { get; set; }
 
     public string OutputFile { get; set; }
-    }
 }

src/Velopack.Packaging/Commands/DeltaPatchCommandRunner.cs

@@ -3,10 +3,10 @@ using Velopack.Compression;
 using Velopack.Packaging.Exceptions;
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Packaging.Commands
+namespace Velopack.Packaging.Commands;
+
+public class DeltaPatchCommandRunner : ICommand<DeltaPatchOptions>
 {
-    public class DeltaPatchCommandRunner : ICommand<DeltaPatchOptions>
-    {
     private readonly ILogger _logger;
     private readonly IFancyConsole _console;
 
@@ -48,5 +48,4 @@ namespace Velopack.Packaging.Commands
             });
         });
     }
-    }
 }

src/Velopack.Packaging/Commands/DeltaPatchOptions.cs

@@ -1,11 +1,10 @@
-namespace Velopack.Packaging.Commands
+namespace Velopack.Packaging.Commands;
+
+public class DeltaPatchOptions
 {
-    public class DeltaPatchOptions
-    {
     public string BasePackage { get; set; }
 
     public FileInfo[] PatchFiles { get; set; }
 
     public string OutputFile { get; set; }
-    }
 }

src/Velopack.Packaging/DeltaEmbedded.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Logging;
 using Velopack.Compression;
 
-namespace Velopack.Packaging
+namespace Velopack.Packaging;
+
+public class DeltaEmbedded
 {
-    public class DeltaEmbedded
-    {
     private readonly DeltaImpl _delta;
 
     public DeltaEmbedded(string zstdPath, ILogger logger, string baseTmpDir)
@@ -31,5 +31,4 @@ namespace Velopack.Packaging
             _zstd.ApplyPatch(baseFile, patchFile, outputFile);
         }
     }
-    }
 }

src/Velopack.Packaging/Exceptions/UserInfoException.cs

@@ -6,14 +6,14 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Packaging.Exceptions
+namespace Velopack.Packaging.Exceptions;
+
+/// <summary>
+/// Denotes that an error has occurred for which a stack trace should not be printed.
+/// </summary>
+[ExcludeFromCodeCoverage]
+public class UserInfoException : Exception
 {
-    /// <summary>
-    /// Denotes that an error has occurred for which a stack trace should not be printed.
-    /// </summary>
-    [ExcludeFromCodeCoverage]
-    public class UserInfoException : Exception
-    {
     public UserInfoException()
     {
     }
@@ -29,5 +29,4 @@ namespace Velopack.Packaging.Exceptions
     protected UserInfoException(SerializationInfo info, StreamingContext context) : base(info, context)
     {
     }
-    }
 }

src/Velopack.Packaging/Exceptions/VelopackAppVerificationException.cs

@@ -5,11 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Packaging.Exceptions
+namespace Velopack.Packaging.Exceptions;
+
+[ExcludeFromCodeCoverage]
+public class VelopackAppVerificationException : UserInfoException
 {
-    [ExcludeFromCodeCoverage]
-    public class VelopackAppVerificationException : UserInfoException
-    {
     public VelopackAppVerificationException(string message)
         : base(
               $"Failed to verify VelopackApp ({message}). " +
@@ -17,5 +17,4 @@ namespace Velopack.Packaging.Exceptions
               $"and then re-compile/re-publish your application.")
     {
     }
-    }
 }

src/Velopack.Packaging/Exe.cs

@@ -6,10 +6,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging
+namespace Velopack.Packaging;
+
+public static class Exe
 {
-    public static class Exe
-    {
     public static void AssertSystemBinaryExists(string binaryName)
     {
         try {
@@ -80,5 +80,4 @@ namespace Velopack.Packaging
         psi.WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory;
         return psi;
     }
-    }
 }

src/Velopack.Packaging/PackageBuilder.cs

@@ -9,11 +9,11 @@ using Velopack.NuGet;
 using Velopack.Packaging.Abstractions;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging
-{
-    public abstract class PackageBuilder<T> : ICommand<T>
+namespace Velopack.Packaging;
+
+public abstract class PackageBuilder<T> : ICommand<T>
     where T : class, IPackOptions
-    {
+{
     protected RuntimeOs SupportedTargetOs { get; }
 
     protected ILogger Log { get; }
@@ -334,5 +334,4 @@ namespace Velopack.Packaging
 """;
         File.WriteAllText(Path.Combine(relsDir, ".rels"), rels);
     }
-    }
 }

src/Velopack.Packaging/ReleaseEntryHelper.cs

@@ -4,10 +4,10 @@ using Velopack.Json;
 using Velopack.NuGet;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging
+namespace Velopack.Packaging;
+
+public class ReleaseEntryHelper
 {
-    public class ReleaseEntryHelper
-    {
     private readonly string _outputDir;
     private readonly ILogger _logger;
     private readonly string _channel;
@@ -251,5 +251,4 @@ namespace Velopack.Packaging
     //}
 
 
-    }
 }

src/Velopack.Vpk/Commands/DeltaGenCommand.cs

@@ -1,9 +1,9 @@
 using Velopack.Packaging;
 
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public class DeltaGenCommand : BaseCommand
 {
-    public class DeltaGenCommand : BaseCommand
-    {
     public DeltaMode DeltaMode { get; set; }
 
     public string BasePackage { get; set; }
@@ -39,5 +39,4 @@ namespace Velopack.Vpk.Commands
             .SetArgumentHelpName("PATH")
             .SetRequired();
     }
-    }
 }

src/Velopack.Vpk/Commands/DeltaPatchCommand.cs

@@ -1,7 +1,7 @@
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public class DeltaPatchCommand : BaseCommand
 {
-    public class DeltaPatchCommand : BaseCommand
-    {
     public string BasePackage { get; set; }
 
     public FileInfo[] PatchFiles { get; set; }
@@ -29,5 +29,4 @@
             .SetArgumentHelpName("PATH")
             .SetRequired();
     }
-    }
 }

src/Velopack.Vpk/Commands/LinuxPackCommand.cs

@@ -7,10 +7,10 @@ using Microsoft.NET.HostModel.Bundle;
 using Octokit;
 using Velopack.Packaging;
 
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public class LinuxPackCommand : PlatformCommand
 {
-    public class LinuxPackCommand : PlatformCommand
-    {
     public string PackId { get; private set; }
 
     public string PackVersion { get; private set; }
@@ -98,5 +98,4 @@ namespace Velopack.Vpk.Commands
         this.AreMutuallyExclusive(icon, appDir);
         this.AtLeastOneRequired(icon, appDir);
     }
-    }
 }

src/Velopack.Vpk/Commands/LongHelpCommand.cs

@@ -7,10 +7,10 @@ using Spectre.Console.Rendering;
 using Velopack.Vpk.Logging;
 using static System.CommandLine.Help.HelpBuilder;
 
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public class LongHelpCommand : CliOption<bool>
 {
-    public class LongHelpCommand : CliOption<bool>
-    {
     private CliAction _action;
 
     public LongHelpCommand() : this("--help", ["-h", "-H", "--vhelp"])
@@ -276,10 +276,10 @@ namespace Velopack.Vpk.Commands
                 argument.Arity.MinimumNumberOfValues == 0;
         }
     }
-    }
+}
 
-    public static class HelpExtensions
-    {
+public static class HelpExtensions
+{
     public static bool HasArguments(this CliCommand command) => command.Arguments?.Count > 0;
     public static bool HasSubcommands(this CliCommand command) => command.Subcommands?.Count > 0;
     public static bool HasOptions(this CliCommand command) => command.Options?.Count > 0;
@@ -295,5 +295,4 @@ namespace Velopack.Vpk.Commands
             source = next(source);
         }
     }
-    }
 }

src/Velopack.Vpk/Commands/_OutputCommand.cs

@@ -1,9 +1,9 @@
 using Velopack.Packaging;
 
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public abstract class OutputCommand : BaseCommand
 {
-    public abstract class OutputCommand : BaseCommand
-    {
     public string ReleaseDir { get; private set; }
 
     public string Channel { get; private set; }
@@ -33,5 +33,4 @@ namespace Velopack.Vpk.Commands
         if (!di.Exists) di.Create();
         return di;
     }
-    }
 }

src/Velopack.Vpk/Commands/_PlatformCommand.cs

@@ -1,7 +1,7 @@
-namespace Velopack.Vpk.Commands
+namespace Velopack.Vpk.Commands;
+
+public abstract class PlatformCommand : OutputCommand
 {
-    public abstract class PlatformCommand : OutputCommand
-    {
     public string TargetRuntime { get; set; }
 
     protected CliOption<string> TargetRuntimeOption { get; private set; }
@@ -18,5 +18,4 @@
     public RID GetRid() => RID.Parse(TargetRuntime ?? VelopackRuntimeInfo.SystemOs.GetOsShortName());
 
     public RuntimeOs GetRuntimeOs() => GetRid().BaseRID;
-    }
 }

src/Velopack.Vpk/Logging/BasicConsole.cs

@@ -1,9 +1,9 @@
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Vpk.Logging
+namespace Velopack.Vpk.Logging;
+
+public class BasicConsole : IFancyConsole
 {
-    public class BasicConsole : IFancyConsole
-    {
     private readonly ILogger logger;
     private readonly DefaultPromptValueFactory defaultFactory;
 
@@ -54,5 +54,4 @@ namespace Velopack.Vpk.Logging
             _logger.Info("Complete: " + name);
         }
     }
-    }
 }

src/Velopack.Vpk/Logging/DefaultPromptValueFactory.cs

@@ -4,9 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Vpk.Logging
+namespace Velopack.Vpk.Logging;
+
+public record DefaultPromptValueFactory(bool DefaultPromptValue)
 {
-    public record DefaultPromptValueFactory(bool DefaultPromptValue)
-    {
-    }
 }

src/Velopack.Vpk/Logging/SpectreConsole.cs

@@ -8,10 +8,10 @@ using System.Threading.Tasks;
 using Spectre.Console;
 using Velopack.Packaging.Abstractions;
 
-namespace Velopack.Vpk.Logging
+namespace Velopack.Vpk.Logging;
+
+public class SpectreConsole : IFancyConsole
 {
-    public class SpectreConsole : IFancyConsole
-    {
     private readonly ILogger logger;
     private readonly DefaultPromptValueFactory defaultFactory;
 
@@ -140,5 +140,4 @@ namespace Velopack.Vpk.Logging
             _logger.Log(LogLevel.Debug, $"[bold]Complete: {name}[/]");
         }
     }
-    }
 }

test/LegacyTestApp/Program.cs

@@ -10,10 +10,10 @@ using Squirrel;
 
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
 
-namespace LegacyTestApp
+namespace LegacyTestApp;
+
+internal class Program
 {
-    internal class Program
-    {
     static int Main(string[] args)
     {
 #if CLOWD
@@ -120,5 +120,4 @@ namespace LegacyTestApp
         var path = Path.Combine(AppContext.BaseDirectory, "..", name);
         File.AppendAllText(path, message + Environment.NewLine);
     }
-    }
 }

test/LegacyTestApp/SquirrelLogger.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace LegacyTestApp
-{
+namespace LegacyTestApp;
+
 #if VELOPACK
-    using Microsoft.Extensions.Logging;
-    class SquirrelLogger : ILogger
-    {
+using Microsoft.Extensions.Logging;
+class SquirrelLogger : ILogger
+{
     public IDisposable BeginScope<TState>(TState state) where TState : notnull
     {
         return null;
@@ -20,10 +20,10 @@ namespace LegacyTestApp
     {
         Console.WriteLine(formatter(state, exception));
     }
-    }
+}
 #else
-    class SquirrelLogger : Squirrel.SimpleSplat.ILogger
-    {
+class SquirrelLogger : Squirrel.SimpleSplat.ILogger
+{
     protected SquirrelLogger()
     {
     }
@@ -39,6 +39,5 @@ namespace LegacyTestApp
     {
         Console.WriteLine(message);
     }
-    }
-#endif
 }
+#endif

test/Velopack.Packaging.Tests/DotnetUtilTests.cs

@@ -7,10 +7,10 @@ using Velopack.Packaging.Exceptions;
 using Velopack.Packaging.Windows;
 using Velopack.Packaging.Windows.Commands;
 
-namespace Velopack.Packaging.Tests
+namespace Velopack.Packaging.Tests;
+
+public class DotnetUtilTests
 {
-    public class DotnetUtilTests
-    {
     private readonly ITestOutputHelper _output;
 
     public DotnetUtilTests(ITestOutputHelper output)
@@ -104,5 +104,4 @@ namespace Velopack.Packaging.Tests
         var path = Path.Combine(dir, "TestApp.exe");
         Assert.Throws<UserInfoException>(() => DotnetUtil.VerifyVelopackApp(path, logger));
     }
-    }
 }

test/Velopack.Packaging.Tests/GithubDeploymentTests.cs

@@ -6,10 +6,10 @@ using Velopack.Sources;
 using Octokit;
 using Velopack.Packaging.Exceptions;
 
-namespace Velopack.Packaging.Tests
+namespace Velopack.Packaging.Tests;
+
+public class GithubDeploymentTests
 {
-    public class GithubDeploymentTests
-    {
     public readonly static string GITHUB_TOKEN = Environment.GetEnvironmentVariable("VELOPACK_GITHUB_TEST_TOKEN");
     public readonly static string GITHUB_REPOURL = "https://github.com/caesay/VelopackGithubUpdateTest";
 
@@ -233,5 +233,4 @@ This is just a _test_!
     }
 
 
-    }
 }

test/Velopack.Packaging.Tests/Init.cs

@@ -2,15 +2,14 @@
 
 [assembly: TestFramework("Velopack.Packaging.Tests.TestsInit", "Velopack.Packaging.Tests")]
 
-namespace Velopack.Packaging.Tests
+namespace Velopack.Packaging.Tests;
+
+public class TestsInit : XunitTestFramework
 {
-    public class TestsInit : XunitTestFramework
-    {
     public TestsInit(IMessageSink messageSink)
       : base(messageSink)
     {
         HelperFile.AddSearchPath(PathHelper.GetRustBuildOutputDir());
         HelperFile.AddSearchPath(PathHelper.GetVendorLibDir());
     }
-    }
 }

test/Velopack.Packaging.Tests/S3DeploymentTests.cs

@@ -8,10 +8,10 @@ using Velopack.Deployment;
 using Velopack.Packaging.Exceptions;
 using Velopack.Sources;
 
-namespace Velopack.Packaging.Tests
+namespace Velopack.Packaging.Tests;
+
+public class S3DeploymentTests
 {
-    public class S3DeploymentTests
-    {
     public readonly static string B2_KEYID = "0035016844a4188000000000a";
     public readonly static string B2_SECRET = Environment.GetEnvironmentVariable("VELOPACK_B2_TEST_TOKEN");
     public readonly static string B2_BUCKET = "velopack-testing";
@@ -83,5 +83,4 @@ namespace Velopack.Packaging.Tests
         Assert.Equal(newVer, latest.Version);
         Assert.True(feed.Assets.Count(x => x.Type == VelopackAssetType.Full) <= options.KeepMaxReleases, "Too many releases were kept.");
     }
-    }
 }

test/Velopack.Packaging.Tests/TestApp.cs

@@ -8,10 +8,10 @@ using Velopack.Packaging.Unix.Commands;
 using Velopack.Packaging.Windows.Commands;
 using Velopack.Vpk.Logging;
 
-namespace Velopack.Packaging.Tests
+namespace Velopack.Packaging.Tests;
+
+public static class TestApp
 {
-    public static class TestApp
-    {
     public static void PackTestApp(string id, string version, string testString, string releaseDir, ILogger logger,
         string releaseNotes = null, string channel = null)
     {
@@ -86,5 +86,4 @@ namespace Velopack.Packaging.Tests
             File.WriteAllText(testStringFile, oldText);
         }
     }
-    }
 }

test/Velopack.Tests/OldSquirrel/ReleaseEntry.cs

@@ -2,11 +2,11 @@
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 
-namespace Velopack.Tests.OldSquirrel
+namespace Velopack.Tests.OldSquirrel;
+
+[DataContract]
+public class ReleaseEntry
 {
-    [DataContract]
-    public class ReleaseEntry
-    {
     [DataMember] public string SHA1 { get; protected set; }
     [DataMember] public string BaseUrl { get; protected set; }
     [DataMember] public string Filename { get; protected set; }
@@ -275,5 +275,4 @@ namespace Velopack.Tests.OldSquirrel
     //        .Select(x => new ReleasePackage(Path.Combine(targetDir, x.Filename), true))
     //        .FirstOrDefault();
     //}
-    }
 }

test/Velopack.Tests/OldSquirrel/ReleaseExtensions.cs

@@ -1,9 +1,9 @@
 using System.Text.RegularExpressions;
 
-namespace Velopack.Tests.OldSquirrel
+namespace Velopack.Tests.OldSquirrel;
+
+public static class VersionExtensions
 {
-    public static class VersionExtensions
-    {
     static readonly Regex _suffixRegex = new Regex(@"(-full|-delta)?\.nupkg$", RegexOptions.Compiled);
     static readonly Regex _versionRegex = new Regex(@"\d+(\.\d+){0,3}(-[A-Za-z][0-9A-Za-z-]*)?$", RegexOptions.Compiled);
 
@@ -18,5 +18,4 @@ namespace Velopack.Tests.OldSquirrel
         var version = _versionRegex.Match(name).Value;
         return new SemanticVersion(version);
     }
-    }
 }

test/Velopack.Tests/OldSquirrel/SemanticVersion.cs

@@ -1,15 +1,15 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace Velopack.Tests.OldSquirrel
+namespace Velopack.Tests.OldSquirrel;
+
+/// <summary>
+/// A hybrid implementation of SemVer that supports semantic versioning as described at http://semver.org while not strictly enforcing it to 
+/// allow older 4-digit versioning schemes to continue working.
+/// </summary>
+[Serializable]
+public sealed class SemanticVersion : IComparable, IComparable<SemanticVersion>, IEquatable<SemanticVersion>
 {
-    /// <summary>
-    /// A hybrid implementation of SemVer that supports semantic versioning as described at http://semver.org while not strictly enforcing it to 
-    /// allow older 4-digit versioning schemes to continue working.
-    /// </summary>
-    [Serializable]
-    public sealed class SemanticVersion : IComparable, IComparable<SemanticVersion>, IEquatable<SemanticVersion>
-    {
     private const RegexOptions _flags = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;
     private static readonly Regex _semanticVersionRegex = new Regex(@"^(?<Version>\d+(\s*\.\s*\d+){0,3})(?<Release>-[a-z][0-9a-z-]*)?$", _flags);
     private static readonly Regex _strictSemanticVersionRegex = new Regex(@"^(?<Version>\d+(\.\d+){2})(?<Release>-[a-z][0-9a-z-]*)?$", _flags);
@@ -298,5 +298,4 @@ namespace Velopack.Tests.OldSquirrel
 
         return hashCode;
     }
-    }
 }

test/Velopack.Tests/OldSquirrel/Utility.cs

@@ -1,7 +1,7 @@
-namespace Velopack.Tests.OldSquirrel
+namespace Velopack.Tests.OldSquirrel;
+
+internal static class Utility
 {
-    internal static class Utility
-    {
     public static bool IsHttpUrl(string urlOrPath)
     {
         var uri = default(Uri);
@@ -11,5 +11,4 @@
 
         return uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps;
     }
-    }
 }

test/Velopack.Tests/ReleaseEntryTests.cs

@@ -4,10 +4,10 @@ using NuGet.Versioning;
 using OldReleaseEntry = Velopack.Tests.OldSquirrel.ReleaseEntry;
 using OldSemanticVersion = Velopack.Tests.OldSquirrel.SemanticVersion;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class ReleaseEntryTests
 {
-    public class ReleaseEntryTests
-    {
     [Theory]
     [InlineData(@"MyCoolApp-1.0-full.nupkg", "MyCoolApp", "1.0", "")]
     [InlineData(@"MyCoolApp-1.0.0-full.nupkg", "MyCoolApp", "1.0.0", "")]
@@ -505,5 +505,4 @@ namespace Velopack.Tests
             return String.Format("94689fede03fed7ab59c24337673a27837f0c3ec  {0}  1004502", name);
         }
     }
-    }
 }

test/Velopack.Tests/RuntimeInfoTests.cs

@@ -6,10 +6,10 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class RuntimeInfoTests
 {
-    public class RuntimeInfoTests
-    {
     [Fact]
     public void NugetVersionAgreesWithNbgv()
     {
@@ -41,5 +41,4 @@ namespace Velopack.Tests
         }
 #endif
     }
-    }
 }

test/Velopack.Tests/RuntimeTests.cs

@@ -2,10 +2,10 @@
 using System.Net.Http;
 using Velopack.Windows;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class RuntimeTests
 {
-    public class RuntimeTests
-    {
     [Theory]
     [InlineData("net6", "net6-x64-desktop")]
     [InlineData("net6.0", "net6-x64-desktop")]
@@ -104,5 +104,4 @@ namespace Velopack.Tests
         var result = await hc.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
         result.EnsureSuccessStatusCode();
     }
-    }
 }

test/Velopack.Tests/ShortcutTests.cs

@@ -8,11 +8,11 @@ using System.Threading.Tasks;
 using Velopack.Locators;
 using Velopack.Windows;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+[SupportedOSPlatform("windows")]
+public class ShortcutTests
 {
-    [SupportedOSPlatform("windows")]
-    public class ShortcutTests
-    {
     private readonly ITestOutputHelper _output;
 
     public ShortcutTests(ITestOutputHelper output)
@@ -59,5 +59,4 @@ namespace Velopack.Tests
         var after = sh.FindShortcuts(exeName, flag);
         Assert.Equal(0, after.Keys.Count);
     }
-    }
 }

test/Velopack.Tests/SimpleJsonTests.cs

@@ -16,10 +16,10 @@ using SimpleJsonNameAttribute = System.Text.Json.Serialization.JsonPropertyNameA
 using SimpleJsonNameAttribute = Velopack.Json.JsonPropertyNameAttribute;
 #endif
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class SimpleJsonTests
 {
-    public class SimpleJsonTests
-    {
     public static readonly JsonSerializerOptions Options = new JsonSerializerOptions {
         AllowTrailingCommas = true,
         ReadCommentHandling = JsonCommentHandling.Skip,
@@ -147,5 +147,4 @@ namespace Velopack.Tests
 
         public List<string> greetings { get; set; }
     }
-    }
 }

test/Velopack.Tests/TestHelpers/AssertExtensions.cs

@@ -1,10 +1,10 @@
 using System.Collections;
 using System.Globalization;
 
-namespace Velopack.Tests.TestHelpers
+namespace Velopack.Tests.TestHelpers;
+
+public static class AssertExtensions
 {
-    public static class AssertExtensions
-    {
     public static void ShouldBeAboutEqualTo(this DateTimeOffset expected, DateTimeOffset current)
     {
         Assert.Equal(expected.Date, current.Date);
@@ -137,11 +137,10 @@ namespace Velopack.Tests.TestHelpers
         }
         return c.ToString(CultureInfo.InvariantCulture);
     }
-    }
+}
 
-    public enum DiffStyle
-    {
+public enum DiffStyle
+{
     Full,
     Minimal
-    }
 }

test/Velopack.Tests/TestHelpers/ExposedClass.cs

@@ -6,10 +6,10 @@ using System.Reflection;
 
 // Lovingly stolen from http://exposedobject.codeplex.com/
 
-namespace Velopack.Tests.TestHelpers
+namespace Velopack.Tests.TestHelpers;
+
+public class ExposedClass : DynamicObject
 {
-    public class ExposedClass : DynamicObject
-    {
     private Type m_type;
     private Dictionary<string, Dictionary<int, List<MethodInfo>>> m_staticMethods;
     private Dictionary<string, Dictionary<int, List<MethodInfo>>> m_genStaticMethods;
@@ -134,5 +134,4 @@ namespace Velopack.Tests.TestHelpers
     {
         return new ExposedClass(type);
     }
-    }
 }

test/Velopack.Tests/TestHelpers/ExposedObject.cs

@@ -7,10 +7,10 @@ using System.Reflection;
 
 // Lovingly stolen from http://exposedobject.codeplex.com/
 
-namespace Velopack.Tests.TestHelpers
+namespace Velopack.Tests.TestHelpers;
+
+public class ExposedObject : DynamicObject
 {
-    public class ExposedObject : DynamicObject
-    {
     private object m_object;
     private Type m_type;
     private Dictionary<string, Dictionary<int, List<MethodInfo>>> m_instanceMethods;
@@ -165,6 +165,4 @@ namespace Velopack.Tests.TestHelpers
         result = m_object;
         return true;
     }
-    }
-
 }

test/Velopack.Tests/TestHelpers/ExposedObjectHelper.cs

@@ -6,10 +6,10 @@ using System.Dynamic;
 
 // Lovingly stolen from http://exposedobject.codeplex.com/
 
-namespace Velopack.Tests.TestHelpers
+namespace Velopack.Tests.TestHelpers;
+
+internal class ExposedObjectHelper
 {
-    internal class ExposedObjectHelper
-    {
     private static Type s_csharpInvokePropertyType =
         typeof(Microsoft.CSharp.RuntimeBinder.RuntimeBinderException)
             .Assembly
@@ -90,5 +90,4 @@ namespace Velopack.Tests.TestHelpers
         return null;
     }
 
-    }
 }

test/Velopack.Tests/TestHelpers/FakeDownloader.cs

@@ -1,9 +1,9 @@
 using System.Text;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class FakeDownloader : Sources.IFileDownloader
 {
-    public class FakeDownloader : Sources.IFileDownloader
-    {
     public string LastUrl { get; private set; }
     public string LastLocalFile { get; private set; }
     public string LastAuthHeader { get; private set; }
@@ -35,5 +35,4 @@ namespace Velopack.Tests
     {
         return Encoding.UTF8.GetString(await DownloadBytes(url, auth, acc));
     }
-    }
 }

test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs

@@ -4,10 +4,10 @@ using System.Text;
 using System.Text.Json;
 using Velopack.Sources;
 
-namespace Velopack.Tests.TestHelpers
+namespace Velopack.Tests.TestHelpers;
+
+internal class FakeFixtureRepository : Sources.IFileDownloader
 {
-    internal class FakeFixtureRepository : Sources.IFileDownloader
-    {
     private readonly string _pkgId;
     private readonly IEnumerable<ReleaseEntry> _releases;
     private readonly VelopackAssetFeed _releasesNew;
@@ -110,5 +110,4 @@ namespace Velopack.Tests.TestHelpers
 
         throw new NotSupportedException("FakeFixtureRepository doesn't have: " + url);
     }
-    }
 }

test/Velopack.Tests/TestHelpers/StaticHttpServer.cs

@@ -1,10 +1,10 @@
 using System.Net;
 using System.Text;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public sealed class StaticHttpServer : IDisposable
 {
-    public sealed class StaticHttpServer : IDisposable
-    {
     public int Port { get; private set; }
     public string RootPath { get; private set; }
 
@@ -88,5 +88,4 @@ namespace Velopack.Tests
             toDispose.Dispose();
         }
     }
-    }
 }

test/Velopack.Tests/UpdateManagerTests.cs

@@ -7,10 +7,10 @@ using Velopack.Locators;
 using Velopack.Sources;
 using Velopack.Tests.TestHelpers;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class UpdateManagerTests
 {
-    public class UpdateManagerTests
-    {
     private readonly ITestOutputHelper _output;
 
     public UpdateManagerTests(ITestOutputHelper output)
@@ -380,5 +380,4 @@ namespace Velopack.Tests
         var target = Path.Combine(packagesDir, $"{id}-{toVersion}-full.nupkg");
         Assert.True(File.Exists(target));
     }
-    }
 }

test/Velopack.Tests/UtilityTests.cs

@@ -4,10 +4,10 @@ using System.Security.Cryptography;
 using System.Text;
 using Velopack.Windows;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class UtilityTests
 {
-    public class UtilityTests
-    {
     private readonly ITestOutputHelper _output;
 
     public UtilityTests(ITestOutputHelper output)
@@ -234,5 +234,4 @@ namespace Velopack.Tests
         return rv;
     }
 
-    }
 }

test/Velopack.Tests/ZipPackageTests.cs

@@ -4,10 +4,10 @@ using Velopack.NuGet;
 using Velopack.Tests.TestHelpers;
 using ZipPackage = Velopack.NuGet.ZipPackage;
 
-namespace Velopack.Tests
+namespace Velopack.Tests;
+
+public class ZipPackageTests
 {
-    public class ZipPackageTests
-    {
     [Fact]
     public void HasSameFilesAndDependenciesAsPackaging()
     {
@@ -84,5 +84,4 @@ namespace Velopack.Tests
     {
         return Path.GetExtension(p).Equals(NugetUtil.ManifestExtension, StringComparison.OrdinalIgnoreCase);
     }
-    }
 }