Refactor

Onova.Updater/Onova.Updater.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net35</TargetFramework>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
 

Onova.Updater/Program.cs

@@ -1,4 +1,4 @@
-using Onova.Updater.Internal;
+using Onova.Updater.Utils;
 
 namespace Onova.Updater;
 // This executable applies the update by copying over new files.

Onova.Updater/Updater.cs

@@ -3,7 +3,7 @@
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using Onova.Updater.Internal;
+using Onova.Updater.Utils;
 
 namespace Onova.Updater;
 

Onova.Updater/Internal/DirectoryEx.cs → Onova.Updater/Utils/DirectoryEx.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Onova.Updater.Internal;
+namespace Onova.Updater.Utils;
 
 internal static class DirectoryEx
 {
@@ -9,7 +9,7 @@ public static void Copy(string sourceDirPath, string destDirPath, bool overwrite
         Directory.CreateDirectory(destDirPath);
 
         // Get all files in source directory
-        var sourceFilePaths = Directory.EnumerateFiles(sourceDirPath);
+        var sourceFilePaths = Directory.GetFiles(sourceDirPath);
 
         // Copy them
         foreach (var sourceFilePath in sourceFilePaths)
@@ -21,7 +21,7 @@ public static void Copy(string sourceDirPath, string destDirPath, bool overwrite
         }
 
         // Get all subdirectories in source directory
-        var sourceSubDirPaths = Directory.EnumerateDirectories(sourceDirPath);
+        var sourceSubDirPaths = Directory.GetDirectories(sourceDirPath);
 
         // Recursively copy them
         foreach (var sourceSubDirPath in sourceSubDirPaths)

Onova.Updater/Internal/Extensions.cs → Onova.Updater/Utils/Extensions.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace Onova.Updater.Internal;
+namespace Onova.Updater.Utils;
 
 internal static class Extensions
 {

Onova.Updater/Internal/FileEx.cs → Onova.Updater/Utils/FileEx.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Onova.Updater.Internal;
+namespace Onova.Updater.Utils;
 
 internal static class FileEx
 {

Onova/Exceptions/LockFileNotAcquiredException.cs

@@ -8,7 +8,7 @@ namespace Onova.Exceptions;
 public class LockFileNotAcquiredException : Exception
 {
     /// <summary>
-    /// Initializes an instance of <see cref="LockFileNotAcquiredException"/>.
+    /// Initializes an instance of <see cref="LockFileNotAcquiredException" />.
     /// </summary>
     public LockFileNotAcquiredException()
         : base("Could not acquire a lock file. Most likely, another instance of this application currently owns the lock file.")

Onova/Exceptions/PackageNotFoundException.cs

@@ -13,7 +13,7 @@ public class PackageNotFoundException : Exception
     public Version Version { get; }
 
     /// <summary>
-    /// Initializes an instance of <see cref="PackageNotFoundException"/>.
+    /// Initializes an instance of <see cref="PackageNotFoundException" />.
     /// </summary>
     public PackageNotFoundException(Version version)
         : base($"Package version '{version}' was not found by the configured package resolver.")

Onova/Exceptions/UpdateNotPreparedException.cs

@@ -13,7 +13,7 @@ public class UpdateNotPreparedException : Exception
     public Version Version { get; }
 
     /// <summary>
-    /// Initializes an instance of <see cref="UpdateNotPreparedException"/>.
+    /// Initializes an instance of <see cref="UpdateNotPreparedException" />.
     /// </summary>
     public UpdateNotPreparedException(Version version)
         : base($"Update to version '{version}' is not prepared. Please prepare an update before applying it.")

Onova/Exceptions/UpdaterAlreadyLaunchedException.cs

@@ -8,7 +8,7 @@ namespace Onova.Exceptions;
 public class UpdaterAlreadyLaunchedException : Exception
 {
     /// <summary>
-    /// Initializes an instance of <see cref="UpdaterAlreadyLaunchedException"/>.
+    /// Initializes an instance of <see cref="UpdaterAlreadyLaunchedException" />.
     /// </summary>
     public UpdaterAlreadyLaunchedException()
         : base("Updater has already been launched, either by this or another instance of this application.")

Onova/Extensions.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Onova.Internal;
+using Onova.Utils;
 
 namespace Onova;
 
 /// <summary>
-/// Extensions for <see cref="Onova"/>.
+/// Extensions for <see cref="Onova" />.
 /// </summary>
 public static class Extensions
 {

Onova/IUpdateManager.cs

@@ -7,7 +7,7 @@
 namespace Onova;
 
 /// <summary>
-/// Interface for <see cref="UpdateManager"/>.
+/// Interface for <see cref="UpdateManager" />.
 /// </summary>
 public interface IUpdateManager : IDisposable
 {

Onova/Models/AssemblyMetadata.cs

@@ -24,7 +24,7 @@ public partial class AssemblyMetadata
     public string FilePath { get; }
 
     /// <summary>
-    /// Initializes a new instance of <see cref="AssemblyMetadata"/>.
+    /// Initializes a new instance of <see cref="AssemblyMetadata" />.
     /// </summary>
     public AssemblyMetadata(string name, Version version, string filePath)
     {
@@ -40,26 +40,23 @@ public partial class AssemblyMetadata
     /// Extracts assembly metadata from given assembly.
     /// The specified path is used to override the executable file path in case the assembly is not meant to run directly.
     /// </summary>
-    public static AssemblyMetadata FromAssembly(Assembly assembly, string assemblyFilePath)
-    {
-        var name = assembly.GetName().Name!;
-        var version = assembly.GetName().Version!;
-        var filePath = assemblyFilePath;
-
-        return new AssemblyMetadata(name, version, filePath);
-    }
+    public static AssemblyMetadata FromAssembly(Assembly assembly, string assemblyFilePath) => new(
+        assembly.GetName().Name!,
+        assembly.GetName().Version!,
+        assemblyFilePath
+    );
 
     /// <summary>
     /// Extracts assembly metadata from given assembly.
     /// </summary>
-    public static AssemblyMetadata FromAssembly(Assembly assembly) => FromAssembly(assembly, assembly.Location);
+    public static AssemblyMetadata FromAssembly(Assembly assembly) =>
+        FromAssembly(assembly, assembly.Location);
 
     /// <summary>
     /// Extracts assembly metadata from entry assembly.
     /// </summary>
-    public static AssemblyMetadata FromEntryAssembly()
-    {
-        var assembly = Assembly.GetEntryAssembly() ?? throw new InvalidOperationException("Can't get entry assembly.");
-        return FromAssembly(assembly);
-    }
+    public static AssemblyMetadata FromEntryAssembly() => FromAssembly(
+        Assembly.GetEntryAssembly() ??
+        throw new InvalidOperationException("Can't get entry assembly.")
+    );
 }

Onova/Models/CheckForUpdatesResult.cs

@@ -25,7 +25,7 @@ public class CheckForUpdatesResult
     public bool CanUpdate { get; }
 
     /// <summary>
-    /// Initializes a new instance of <see cref="CheckForUpdatesResult"/>.
+    /// Initializes a new instance of <see cref="CheckForUpdatesResult" />.
     /// </summary>
     public CheckForUpdatesResult(IReadOnlyList<Version> versions, Version? lastVersion, bool canUpdate)
     {

Onova/Onova.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="../Onova.Updater/bin/$(Configuration)/net46/Onova.Updater.exe">
+    <EmbeddedResource Include="../Onova.Updater/bin/$(Configuration)/net35/Onova.Updater.exe">
       <Link>Updater.exe</Link>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       <Visible>false</Visible>

Onova/Services/AggregatePackageResolver.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Onova.Exceptions;
-using Onova.Internal.Extensions;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -16,15 +16,15 @@ public class AggregatePackageResolver : IPackageResolver
     private readonly IReadOnlyList<IPackageResolver> _resolvers;
 
     /// <summary>
-    /// Initializes an instance of <see cref="AggregatePackageResolver"/>.
+    /// Initializes an instance of <see cref="AggregatePackageResolver" />.
     /// </summary>
     public AggregatePackageResolver(IReadOnlyList<IPackageResolver> resolvers)
     {
         _resolvers = resolvers;
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="AggregatePackageResolver"/>.
+    /// Initializes an instance of <see cref="AggregatePackageResolver" />.
     /// </summary>
     public AggregatePackageResolver(params IPackageResolver[] resolvers)
         : this((IReadOnlyList<IPackageResolver>) resolvers)

Onova/Services/GithubPackageResolver.cs

@@ -10,8 +10,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Onova.Exceptions;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -31,7 +31,7 @@ public class GithubPackageResolver : IPackageResolver
     private IReadOnlyDictionary<Version, string>? _cachedPackageVersionUrlMap;
 
     /// <summary>
-    /// Initializes an instance of <see cref="GithubPackageResolver"/>.
+    /// Initializes an instance of <see cref="GithubPackageResolver" />.
     /// </summary>
     public GithubPackageResolver(
         HttpClient httpClient,
@@ -48,7 +48,7 @@ public class GithubPackageResolver : IPackageResolver
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="GithubPackageResolver"/>.
+    /// Initializes an instance of <see cref="GithubPackageResolver" />.
     /// </summary>
     public GithubPackageResolver(
         HttpClient httpClient,
@@ -60,7 +60,7 @@ public class GithubPackageResolver : IPackageResolver
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="GithubPackageResolver"/>.
+    /// Initializes an instance of <see cref="GithubPackageResolver" />.
     /// </summary>
     public GithubPackageResolver(
         string apiBaseAddress,
@@ -72,7 +72,7 @@ public class GithubPackageResolver : IPackageResolver
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="GithubPackageResolver"/>.
+    /// Initializes an instance of <see cref="GithubPackageResolver" />.
     /// </summary>
     public GithubPackageResolver(
         string repositoryOwner,

Onova/Services/LocalPackageResolver.cs

@@ -6,8 +6,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Onova.Exceptions;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -21,7 +21,7 @@ public class LocalPackageResolver : IPackageResolver
     private readonly string _fileNamePattern;
 
     /// <summary>
-    /// Initializes an instance of <see cref="LocalPackageResolver"/>.
+    /// Initializes an instance of <see cref="LocalPackageResolver" />.
     /// </summary>
     public LocalPackageResolver(string repositoryDirPath, string fileNamePattern = "*")
     {

Onova/Services/NugetPackageExtractor.cs

@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -17,7 +17,7 @@ public class NugetPackageExtractor : IPackageExtractor
     private readonly string _rootDirPath;
 
     /// <summary>
-    /// Initializes an instance of <see cref="NugetPackageExtractor"/>.
+    /// Initializes an instance of <see cref="NugetPackageExtractor" />.
     /// </summary>
     public NugetPackageExtractor(string rootDirPath)
     {

Onova/Services/NugetPackageResolver.cs

@@ -7,8 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Onova.Exceptions;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -24,7 +24,7 @@ public class NugetPackageResolver : IPackageResolver
     private string PackageIdNormalized => _packageId.ToLowerInvariant();
 
     /// <summary>
-    /// Initializes an instance of <see cref="NugetPackageResolver"/>.
+    /// Initializes an instance of <see cref="NugetPackageResolver" />.
     /// </summary>
     public NugetPackageResolver(HttpClient httpClient, string serviceIndexUrl, string packageId)
     {
@@ -34,7 +34,7 @@ public NugetPackageResolver(HttpClient httpClient, string serviceIndexUrl, strin
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="NugetPackageResolver"/>.
+    /// Initializes an instance of <see cref="NugetPackageResolver" />.
     /// </summary>
     public NugetPackageResolver(string serviceIndexUrl, string packageId)
         : this(Http.Client, serviceIndexUrl, packageId)

Onova/Services/WebPackageResolver.cs

@@ -6,8 +6,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Onova.Exceptions;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;
 
@@ -21,7 +21,7 @@ public class WebPackageResolver : IPackageResolver
     private readonly string _manifestUrl;
 
     /// <summary>
-    /// Initializes an instance of <see cref="WebPackageResolver"/>.
+    /// Initializes an instance of <see cref="WebPackageResolver" />.
     /// </summary>
     public WebPackageResolver(HttpClient httpClient, string manifestUrl)
     {
@@ -30,7 +30,7 @@ public WebPackageResolver(HttpClient httpClient, string manifestUrl)
     }
 
     /// <summary>
-    /// Initializes an instance of <see cref="WebPackageResolver"/>.
+    /// Initializes an instance of <see cref="WebPackageResolver" />.
     /// </summary>
     public WebPackageResolver(string manifestUrl)
         : this(Http.Client, manifestUrl)

Onova/Services/ZipPackageExtractor.cs

@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Onova.Internal;
-using Onova.Internal.Extensions;
+using Onova.Utils;
+using Onova.Utils.Extensions;
 
 namespace Onova.Services;