From 1d20f014d69f5f3907eca885203094e0e1ade9bd Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Sun, 31 Dec 2023 11:09:44 +0000 Subject: [PATCH] Rename classes and namespaces --- src/Velopack.Deployment/GitHubRepository.cs | 4 +- src/Velopack.Deployment/S3Repository.cs | 2 +- .../SimpleWebRepository.cs | 2 +- src/Velopack.Packaging.OSX/AppInfo.cs | 2 +- .../Commands/OsxBundleCommandRunner.cs | 2 +- .../Commands/OsxBundleOptions.cs | 2 +- .../Commands/OsxReleasifyCommandRunner.cs | 4 +- .../Commands/OsxReleasifyOptions.cs | 2 +- src/Velopack.Packaging.OSX/HelperExe.cs | 6 +- src/Velopack.Packaging.OSX/PListParser.cs | 212 +++++++++--------- src/Velopack.Packaging.OSX/PlistWriter.cs | 2 +- .../StructureBuilder.cs | 2 +- .../AuthenticodeTools.cs | 2 +- .../Commands/WindowsPackCommandRunner.cs | 4 +- .../Commands/WindowsPackOptions.cs | 2 +- .../Commands/WindowsReleasifyCommandRunner.cs | 12 +- .../Commands/WindowsReleasifyOptions.cs | 2 +- .../Commands/WindowsSigningOptions.cs | 2 +- src/Velopack.Packaging.Windows/HelperExe.cs | 4 +- src/Velopack.Packaging.Windows/SetupBundle.cs | 2 +- .../Commands/DeltaGenCommandRunner.cs | 2 +- .../Commands/DeltaGenOptions.cs | 2 +- .../Commands/DeltaPatchCommandRunner.cs | 8 +- .../Commands/DeltaPatchOptions.cs | 2 +- src/Velopack.Packaging/DeltaPackageBuilder.cs | 4 +- src/Velopack.Packaging/HelperFile.cs | 6 +- src/Velopack.Packaging/ICommand.cs | 2 +- src/Velopack.Packaging/MarkdownSharp.cs | 2 +- src/Velopack.Packaging/NugetConsole.cs | 2 +- src/Velopack.Packaging/NugetLoggingWrapper.cs | 2 +- .../ProcessFailedException.cs | 2 +- .../ReleasePackageBuilder.cs | 6 +- src/Velopack.Vpk/Commands/DeltaGenCommand.cs | 4 +- .../Commands/DeltaPatchCommand.cs | 4 +- .../Commands/GitHubBaseCommand.cs | 2 +- .../Commands/GitHubDownloadCommand.cs | 2 +- .../Commands/GitHubUploadCommand.cs | 4 +- .../Commands/HttpDownloadCommand.cs | 2 +- src/Velopack.Vpk/Commands/OsxBundleCommand.cs | 2 +- .../Commands/OsxReleasifyCommand.cs | 4 +- src/Velopack.Vpk/Commands/S3BaseCommand.cs | 2 +- .../Commands/S3DownloadCommand.cs | 2 +- src/Velopack.Vpk/Commands/S3UploadCommand.cs | 2 +- .../Commands/SystemCommandLineExtensions.cs | 6 +- .../Commands/WindowsPackCommand.cs | 4 +- .../Commands/WindowsReleasifyCommand.cs | 4 +- .../Commands/WindowsSigningCommand.cs | 6 +- src/Velopack.Vpk/Commands/_BaseCommand.cs | 2 +- src/Velopack.Vpk/Commands/_OutputCommand.cs | 2 +- src/Velopack.Vpk/Commands/_PlatformCommand.cs | 6 +- src/Velopack.Vpk/Compat/EmbeddedRunner.cs | 12 +- src/Velopack.Vpk/Compat/ICommandRunner.cs | 4 +- src/Velopack.Vpk/Compat/RunnerFactory.cs | 8 +- .../Compat/SquirrelVersionLocator.cs | 2 +- src/Velopack.Vpk/Compat/V2CompatRunner.cs | 8 +- src/Velopack.Vpk/Program.cs | 14 +- src/Velopack.Vpk/Updates/NugetDownloader.cs | 2 +- src/Velopack.Vpk/Updates/NullNugetLogger.cs | 2 +- src/Velopack.Vpk/Updates/UpdateChecker.cs | 6 +- src/Velopack/Compression/BZip2Stream.cs | 2 +- .../Compression/BinaryPatchUtility.cs | 2 +- .../Compression/ChecksumFailedException.cs | 2 +- src/Velopack/Compression/DeltaPackage.cs | 6 +- src/Velopack/Compression/EasyZip.cs | 2 +- .../Compression/MsDeltaCompression.cs | 2 +- src/Velopack/Internal/Disposable.cs | 2 +- src/Velopack/Internal/EnumerableExtensions.cs | 5 +- src/Velopack/Internal/LoggerExtensions.cs | 2 +- src/Velopack/Internal/ProcessExtensions.cs | 2 +- src/Velopack/Internal/SimpleJson.cs | 8 +- src/Velopack/Internal/Utility.cs | 28 +-- ...SquirrelLocator.cs => IVelopackLocator.cs} | 6 +- ...uirrelLocator.cs => OsxVelopackLocator.cs} | 16 +- ...irrelLocator.cs => TestVelopackLocator.cs} | 16 +- ...{SquirrelLocator.cs => VelopackLocator.cs} | 50 ++--- ...elLocator.cs => WindowsVelopackLocator.cs} | 16 +- src/Velopack/NuGet/ContentType.cs | 2 +- src/Velopack/NuGet/IPackage.cs | 2 +- src/Velopack/NuGet/IPackageFile.cs | 2 +- src/Velopack/NuGet/IZipPackage.cs | 2 +- src/Velopack/NuGet/NugetUtil.cs | 2 +- src/Velopack/NuGet/NuspecManifest.cs | 2 +- src/Velopack/NuGet/PackageDependency.cs | 2 +- src/Velopack/NuGet/ZipPackage.cs | 2 +- src/Velopack/NuGet/ZipPackageFile.cs | 2 +- src/Velopack/RID.cs | 2 +- src/Velopack/ReleaseEntry.cs | 4 +- src/Velopack/ReleaseEntryName.cs | 2 +- src/Velopack/Sources/GithubSource.cs | 4 +- src/Velopack/Sources/GitlabSource.cs | 4 +- .../Sources/HttpClientFileDownloader.cs | 4 +- src/Velopack/Sources/IFileDownloader.cs | 2 +- src/Velopack/Sources/IUpdateSource.cs | 2 +- src/Velopack/Sources/SimpleFileSource.cs | 2 +- src/Velopack/Sources/SimpleWebSource.cs | 12 +- src/Velopack/Sources/SourceBase.cs | 2 +- src/Velopack/UpdateInfo.cs | 2 +- src/Velopack/UpdateManager.cs | 28 +-- .../{SquirrelApp.cs => VelopackApp.cs} | 58 ++--- ...lRuntimeInfo.cs => VelopackRuntimeInfo.cs} | 6 +- src/Velopack/Windows/RuntimeInfo.cs | 18 +- src/Velopack/Windows/Runtimes.cs | 2 +- src/Velopack/Windows/ShellLink.cs | 2 +- src/Velopack/Windows/Shortcuts.cs | 10 +- test/TestApp/Program.cs | 8 +- .../BaseCommandTests.cs | 4 +- .../Commands/GitHubCommandTests.cs | 4 +- .../Commands/HttpDownloadCommandTests.cs | 4 +- .../Commands/S3CommandTests.cs | 4 +- .../Commands/WindowsCommandTests.cs | 4 +- .../TempFileTestBase.cs | 2 +- .../WindowsOnlyFact.cs | 2 +- .../WindowsOnlyTheoryAttribute.cs | 2 +- test/Velopack.Packaging.Tests/Init.cs | 4 +- .../WindowsPackTests.cs | 22 +- test/Velopack.Tests/ContentTypeTests.cs | 8 +- .../OldSquirrel/ReleaseEntry.cs | 2 +- .../OldSquirrel/ReleaseExtensions.cs | 2 +- .../OldSquirrel/SemanticVersion.cs | 2 +- test/Velopack.Tests/OldSquirrel/Utility.cs | 2 +- test/Velopack.Tests/ReleaseEntryTests.cs | 8 +- test/Velopack.Tests/RuntimeTests.cs | 4 +- .../TestHelpers/AssertExtensions.cs | 2 +- .../TestHelpers/ExposedClass.cs | 2 +- .../TestHelpers/ExposedObject.cs | 2 +- .../TestHelpers/ExposedObjectHelper.cs | 2 +- .../TestHelpers/FakeDownloader.cs | 2 +- .../TestHelpers/FakeFixtureRepository.cs | 2 +- .../TestHelpers/StaticHttpServer.cs | 2 +- test/Velopack.Tests/UpdateManagerTests.cs | 28 +-- test/Velopack.Tests/UtilityTests.cs | 14 +- test/Velopack.Tests/ZipPackageTests.cs | 8 +- 132 files changed, 454 insertions(+), 479 deletions(-) rename src/Velopack/Locators/{ISquirrelLocator.cs => IVelopackLocator.cs} (94%) rename src/Velopack/Locators/{OsxSquirrelLocator.cs => OsxVelopackLocator.cs} (85%) rename src/Velopack/Locators/{TestSquirrelLocator.cs => TestVelopackLocator.cs} (85%) rename src/Velopack/Locators/{SquirrelLocator.cs => VelopackLocator.cs} (71%) rename src/Velopack/Locators/{WindowsSquirrelLocator.cs => WindowsVelopackLocator.cs} (91%) rename src/Velopack/{SquirrelApp.cs => VelopackApp.cs} (85%) rename src/Velopack/{SquirrelRuntimeInfo.cs => VelopackRuntimeInfo.cs} (99%) diff --git a/src/Velopack.Deployment/GitHubRepository.cs b/src/Velopack.Deployment/GitHubRepository.cs index 60a3ea42..6d6c4f58 100644 --- a/src/Velopack.Deployment/GitHubRepository.cs +++ b/src/Velopack.Deployment/GitHubRepository.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.Logging; using Octokit; -using Squirrel.Sources; +using Velopack.Sources; -namespace Squirrel.Deployment; +namespace Velopack.Deployment; public class GitHubOptions { diff --git a/src/Velopack.Deployment/S3Repository.cs b/src/Velopack.Deployment/S3Repository.cs index c5e3d49b..c1c82677 100644 --- a/src/Velopack.Deployment/S3Repository.cs +++ b/src/Velopack.Deployment/S3Repository.cs @@ -6,7 +6,7 @@ using Amazon.S3; using Amazon.S3.Model; using Microsoft.Extensions.Logging; -namespace Squirrel.Deployment; +namespace Velopack.Deployment; public class S3Options { diff --git a/src/Velopack.Deployment/SimpleWebRepository.cs b/src/Velopack.Deployment/SimpleWebRepository.cs index ec67fcc6..5d93e5b2 100644 --- a/src/Velopack.Deployment/SimpleWebRepository.cs +++ b/src/Velopack.Deployment/SimpleWebRepository.cs @@ -1,7 +1,7 @@ using System.Reflection; using Microsoft.Extensions.Logging; -namespace Squirrel.Deployment; +namespace Velopack.Deployment; public class HttpDownloadOptions { diff --git a/src/Velopack.Packaging.OSX/AppInfo.cs b/src/Velopack.Packaging.OSX/AppInfo.cs index 73eef9dd..dcb67ad3 100644 --- a/src/Velopack.Packaging.OSX/AppInfo.cs +++ b/src/Velopack.Packaging.OSX/AppInfo.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.OSX; +namespace Velopack.Packaging.OSX; internal class AppInfo { diff --git a/src/Velopack.Packaging.OSX/Commands/OsxBundleCommandRunner.cs b/src/Velopack.Packaging.OSX/Commands/OsxBundleCommandRunner.cs index c819bbf4..dcefc363 100644 --- a/src/Velopack.Packaging.OSX/Commands/OsxBundleCommandRunner.cs +++ b/src/Velopack.Packaging.OSX/Commands/OsxBundleCommandRunner.cs @@ -3,7 +3,7 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using NuGet.Versioning; -namespace Squirrel.Packaging.OSX.Commands; +namespace Velopack.Packaging.OSX.Commands; public class OsxBundleCommandRunner { diff --git a/src/Velopack.Packaging.OSX/Commands/OsxBundleOptions.cs b/src/Velopack.Packaging.OSX/Commands/OsxBundleOptions.cs index f7e70160..01f750a0 100644 --- a/src/Velopack.Packaging.OSX/Commands/OsxBundleOptions.cs +++ b/src/Velopack.Packaging.OSX/Commands/OsxBundleOptions.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.OSX.Commands; +namespace Velopack.Packaging.OSX.Commands; public class OsxBundleOptions { diff --git a/src/Velopack.Packaging.OSX/Commands/OsxReleasifyCommandRunner.cs b/src/Velopack.Packaging.OSX/Commands/OsxReleasifyCommandRunner.cs index 905922e3..f3971ee2 100644 --- a/src/Velopack.Packaging.OSX/Commands/OsxReleasifyCommandRunner.cs +++ b/src/Velopack.Packaging.OSX/Commands/OsxReleasifyCommandRunner.cs @@ -3,7 +3,7 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using NuGet.Versioning; -namespace Squirrel.Packaging.OSX.Commands; +namespace Velopack.Packaging.OSX.Commands; public class OsxReleasifyCommandRunner { @@ -141,7 +141,7 @@ public class OsxReleasifyCommandRunner // create installer package, sign and notarize if (!options.NoPackage) { - if (SquirrelRuntimeInfo.IsOSX) { + if (VelopackRuntimeInfo.IsOSX) { var pkgPath = Path.Combine(releaseDir.FullName, $"{packId}-Setup-[{options.TargetRuntime.ToDisplay(RidDisplayType.NoVersion)}].pkg"); Dictionary pkgContent = new() { diff --git a/src/Velopack.Packaging.OSX/Commands/OsxReleasifyOptions.cs b/src/Velopack.Packaging.OSX/Commands/OsxReleasifyOptions.cs index cc542e83..505a00c2 100644 --- a/src/Velopack.Packaging.OSX/Commands/OsxReleasifyOptions.cs +++ b/src/Velopack.Packaging.OSX/Commands/OsxReleasifyOptions.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.OSX.Commands; +namespace Velopack.Packaging.OSX.Commands; public class OsxReleasifyOptions { diff --git a/src/Velopack.Packaging.OSX/HelperExe.cs b/src/Velopack.Packaging.OSX/HelperExe.cs index 443b544f..5f4036dc 100644 --- a/src/Velopack.Packaging.OSX/HelperExe.cs +++ b/src/Velopack.Packaging.OSX/HelperExe.cs @@ -5,7 +5,7 @@ using System.Security; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -namespace Squirrel.Packaging.OSX; +namespace Velopack.Packaging.OSX; public class HelperExe : HelperFile { @@ -248,8 +248,8 @@ public class HelperExe : HelperFile { Func chmod; - if (SquirrelRuntimeInfo.IsOSX) chmod = osx_chmod; - else if (SquirrelRuntimeInfo.IsLinux) chmod = nix_chmod; + if (VelopackRuntimeInfo.IsOSX) chmod = osx_chmod; + else if (VelopackRuntimeInfo.IsLinux) chmod = nix_chmod; else return; // no-op on windows, all .exe files can be executed. var filePermissionOctal = Convert.ToInt32("777", 8); diff --git a/src/Velopack.Packaging.OSX/PListParser.cs b/src/Velopack.Packaging.OSX/PListParser.cs index 910df369..8a358c38 100644 --- a/src/Velopack.Packaging.OSX/PListParser.cs +++ b/src/Velopack.Packaging.OSX/PListParser.cs @@ -116,7 +116,7 @@ using System.Text.RegularExpressions; using System.Xml; // ASCIIPropertyListParser.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// @@ -900,7 +900,7 @@ namespace Squirrel.Packaging.OSX } // BinaryPropertyListParser.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// @@ -1467,7 +1467,7 @@ namespace Squirrel.Packaging.OSX } // BinaryPropertyListWriter.AddObjectEqualityComparer.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { internal partial class BinaryPropertyListWriter { @@ -1504,7 +1504,7 @@ namespace Squirrel.Packaging.OSX } // BinaryPropertyListWriter.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// A BinaryPropertyListWriter is a helper class for writing out binary property list files. @@ -1899,7 +1899,7 @@ namespace Squirrel.Packaging.OSX } // BinaryPropertyListWriter.GetObjectEqualityComparer.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { internal partial class BinaryPropertyListWriter { @@ -1938,7 +1938,7 @@ namespace Squirrel.Packaging.OSX } // NSArray.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// Represents an Array. /// @author Daniel Dreibrodt @@ -2065,15 +2065,15 @@ namespace Squirrel.Packaging.OSX /// /// Determines whether the specified is equal to the current - /// . + /// . /// /// /// The to compare with the current - /// . + /// . /// /// /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. /// public override bool Equals(object obj) { @@ -2088,7 +2088,7 @@ namespace Squirrel.Packaging.OSX return false; } - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -2244,16 +2244,16 @@ namespace Squirrel.Packaging.OSX } /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -2273,7 +2273,7 @@ namespace Squirrel.Packaging.OSX } // NSArray.IList.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { partial class NSArray : IList { @@ -2331,7 +2331,7 @@ namespace Squirrel.Packaging.OSX } // NSData.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// NSData objects are wrappers for byte buffers /// @author Daniel Dreibrodt @@ -2390,20 +2390,20 @@ namespace Squirrel.Packaging.OSX /// /// Determines whether the specified is equal to the current - /// . + /// . /// /// /// The to compare with the current - /// . + /// . /// /// /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. /// public override bool Equals(object obj) => obj.GetType().Equals(GetType()) && ArrayEquals(((NSData)obj).Bytes, Bytes); - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -2468,16 +2468,16 @@ namespace Squirrel.Packaging.OSX internal override void ToASCIIGnuStep(StringBuilder ascii, int level) => ToASCII(ascii, level); /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) => obj is NSData data && ArrayEquals(Bytes, data.Bytes); @@ -2488,7 +2488,7 @@ namespace Squirrel.Packaging.OSX } // NSDate.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// Represents a date /// @author Daniel Dreibrodt @@ -2556,19 +2556,19 @@ namespace Squirrel.Packaging.OSX /// /// Determines whether the specified is equal to the current - /// . + /// . /// /// /// The to compare with the current - /// . + /// . /// /// /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. /// public override bool Equals(object obj) => obj.GetType().Equals(GetType()) && Date.Equals(((NSDate)obj).Date); - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -2610,16 +2610,16 @@ namespace Squirrel.Packaging.OSX } /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -2638,7 +2638,7 @@ namespace Squirrel.Packaging.OSX } // NSDictionary.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// @@ -2848,16 +2848,16 @@ namespace Squirrel.Packaging.OSX } /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -2881,7 +2881,7 @@ namespace Squirrel.Packaging.OSX return true; } - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -3083,7 +3083,7 @@ namespace Squirrel.Packaging.OSX /// Where to store the value. public bool TryGetValue(string key, out NSObject value) => dict.TryGetValue(key, out value); - /// Gets or sets the at the specified index. + /// Gets or sets the at the specified index. /// Index. public NSObject this[string index] { @@ -3164,7 +3164,7 @@ namespace Squirrel.Packaging.OSX } // NSNumber.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// A number whose value is either an integer, a real number or bool. /// @author Daniel Dreibrodt @@ -3329,12 +3329,12 @@ namespace Squirrel.Packaging.OSX type = BOOLEAN; } - /// Compares the current to the specified object. + /// Compares the current to the specified object. /// - /// 0 if the numbers are equal, 1 if the current is greater than the + /// 0 if the numbers are equal, 1 if the current is greater than the /// argument and -1 if it is less, or the argument is not a number. /// - /// Object to compare to the current . + /// Object to compare to the current . public int CompareTo(object o) { double x = ToDouble(); @@ -3426,7 +3426,7 @@ namespace Squirrel.Packaging.OSX boolValue == number.boolValue; } - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -3446,9 +3446,9 @@ namespace Squirrel.Packaging.OSX /// /// Returns a that represents the current - /// . + /// . /// - /// A that represents the current . + /// A that represents the current . public override string ToString() => type switch { INTEGER => ToLong().ToString(), @@ -3607,16 +3607,16 @@ namespace Squirrel.Packaging.OSX }; /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -3682,7 +3682,7 @@ namespace Squirrel.Packaging.OSX } // NSObject.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// Abstract interface for any object contained in a property list. @@ -4087,19 +4087,19 @@ namespace Squirrel.Packaging.OSX /// Determines if the specific NSObject is the same as the NSObject overriding this method. /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public abstract bool Equals(NSObject obj); } } // NSSet.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// A set is an interface to an unordered collection of objects. @@ -4260,7 +4260,7 @@ namespace Squirrel.Packaging.OSX /// A Set object. internal List GetSet() => set; - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -4275,15 +4275,15 @@ namespace Squirrel.Packaging.OSX /// /// Determines whether the specified is equal to the current - /// . + /// . /// /// /// The to compare with the current - /// . + /// . /// /// /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. /// public override bool Equals(object obj) { @@ -4443,16 +4443,16 @@ namespace Squirrel.Packaging.OSX } /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -4472,7 +4472,7 @@ namespace Squirrel.Packaging.OSX } // NSString.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// A NSString contains a string. /// @author Daniel Dreibrodt @@ -4508,9 +4508,9 @@ namespace Squirrel.Packaging.OSX /// This NSString as .NET string object. public string Content { get; set; } - /// Compares the current to the specified object. + /// Compares the current to the specified object. /// A 32-bit signed integer that indicates the lexical relationship between the two comparands. - /// Object to compare to the current . + /// Object to compare to the current . public int CompareTo(object o) => o switch { NSString nsString => string.Compare(Content, nsString.Content, StringComparison.Ordinal), @@ -4536,19 +4536,19 @@ namespace Squirrel.Packaging.OSX /// /// Determines whether the specified is equal to the current - /// . + /// . /// /// /// The to compare with the current - /// . + /// . /// /// /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. /// public override bool Equals(object obj) => obj is NSString nsString && Content.Equals(nsString.Content); - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -4682,16 +4682,16 @@ namespace Squirrel.Packaging.OSX } /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) { @@ -4717,7 +4717,7 @@ namespace Squirrel.Packaging.OSX } // PropertyListException.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// The exception that is thrown when an property list file could not be processed correctly. [Serializable] @@ -4767,7 +4767,7 @@ namespace Squirrel.Packaging.OSX // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// A PropertyListFormatException is thrown by the various property list format parsers when an error in the @@ -4784,7 +4784,7 @@ namespace Squirrel.Packaging.OSX } // PropertyListParser.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// /// This class provides methods to parse property lists. It can handle files, input streams and byte arrays. All @@ -5156,7 +5156,7 @@ namespace Squirrel.Packaging.OSX } // UID.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// An UID. Only found in binary property lists that are keyed archives. /// @author Daniel Dreibrodt @@ -5165,7 +5165,7 @@ namespace Squirrel.Packaging.OSX { readonly ulong value; - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// Bytes. public UID(ReadOnlySpan bytes) { @@ -5179,28 +5179,28 @@ namespace Squirrel.Packaging.OSX } /// - /// Initializes a new instance of the class using an unsigned 8-bit + /// Initializes a new instance of the class using an unsigned 8-bit /// number. /// /// Unsigned 8-bit number. public UID(byte number) => value = number; /// - /// Initializes a new instance of the class using an unsigned 16-bit + /// Initializes a new instance of the class using an unsigned 16-bit /// number. /// /// Unsigned 16-bit number. public UID(ushort number) => value = number; /// - /// Initializes a new instance of the class using an unsigned 32-bit + /// Initializes a new instance of the class using an unsigned 32-bit /// number. /// /// Unsigned 32-bit number. public UID(uint number) => value = number; /// - /// Initializes a new instance of the class using an unsigned 64-bit + /// Initializes a new instance of the class using an unsigned 64-bit /// number. /// /// Unsigned 64-bit number. @@ -5306,16 +5306,16 @@ namespace Squirrel.Packaging.OSX internal override void ToASCIIGnuStep(StringBuilder ascii, int level) => ToASCII(ascii, level); /// - /// Determines whether the specified is equal to the current - /// . + /// Determines whether the specified is equal to the current + /// . /// /// - /// The to compare with the current - /// . + /// The to compare with the current + /// . /// /// - /// true if the specified is equal to the current - /// ; otherwise, false. + /// true if the specified is equal to the current + /// ; otherwise, false. /// public override bool Equals(NSObject obj) => Equals((object)obj); @@ -5341,7 +5341,7 @@ namespace Squirrel.Packaging.OSX } // XmlPropertyListParser.cs -namespace Squirrel.Packaging.OSX +namespace Velopack.Packaging.OSX { /// Parses XML property lists. /// @author Daniel Dreibrodt diff --git a/src/Velopack.Packaging.OSX/PlistWriter.cs b/src/Velopack.Packaging.OSX/PlistWriter.cs index 781a6c34..709babea 100644 --- a/src/Velopack.Packaging.OSX/PlistWriter.cs +++ b/src/Velopack.Packaging.OSX/PlistWriter.cs @@ -2,7 +2,7 @@ using System.Xml; using Microsoft.Extensions.Logging; -namespace Squirrel.Packaging.OSX; +namespace Velopack.Packaging.OSX; internal class PlistWriter { diff --git a/src/Velopack.Packaging.OSX/StructureBuilder.cs b/src/Velopack.Packaging.OSX/StructureBuilder.cs index 1112ec85..c083e0fb 100644 --- a/src/Velopack.Packaging.OSX/StructureBuilder.cs +++ b/src/Velopack.Packaging.OSX/StructureBuilder.cs @@ -1,6 +1,6 @@ // https://github.com/egramtel/dotnet-bundle/blob/master/DotNet.Bundle/StructureBuilder.cs -namespace Squirrel.Packaging.OSX; +namespace Velopack.Packaging.OSX; public class StructureBuilder { diff --git a/src/Velopack.Packaging.Windows/AuthenticodeTools.cs b/src/Velopack.Packaging.Windows/AuthenticodeTools.cs index 7d97a767..0c924ecd 100644 --- a/src/Velopack.Packaging.Windows/AuthenticodeTools.cs +++ b/src/Velopack.Packaging.Windows/AuthenticodeTools.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Runtime.Versioning; -namespace Squirrel.Packaging.Windows +namespace Velopack.Packaging.Windows { [SupportedOSPlatform("windows")] [ExcludeFromCodeCoverage] diff --git a/src/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs b/src/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs index 064f44bf..fc8e3dc6 100644 --- a/src/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs +++ b/src/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs @@ -1,10 +1,10 @@ using System.Drawing; using System.Text; using Microsoft.Extensions.Logging; -using Squirrel.NuGet; +using Velopack.NuGet; using FileMode = System.IO.FileMode; -namespace Squirrel.Packaging.Windows.Commands; +namespace Velopack.Packaging.Windows.Commands; public class WindowsPackCommandRunner { diff --git a/src/Velopack.Packaging.Windows/Commands/WindowsPackOptions.cs b/src/Velopack.Packaging.Windows/Commands/WindowsPackOptions.cs index 29453d34..73f94a60 100644 --- a/src/Velopack.Packaging.Windows/Commands/WindowsPackOptions.cs +++ b/src/Velopack.Packaging.Windows/Commands/WindowsPackOptions.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.Windows.Commands; +namespace Velopack.Packaging.Windows.Commands; public class WindowsPackOptions : WindowsReleasifyOptions, INugetPackCommand { diff --git a/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyCommandRunner.cs b/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyCommandRunner.cs index 9ac0f0dd..29067ba6 100644 --- a/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyCommandRunner.cs +++ b/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyCommandRunner.cs @@ -1,9 +1,9 @@ using System.Text; using Microsoft.Extensions.Logging; -using Squirrel.NuGet; -using Squirrel.Windows; +using Velopack.NuGet; +using Velopack.Windows; -namespace Squirrel.Packaging.Windows.Commands; +namespace Velopack.Packaging.Windows.Commands; public class WindowsReleasifyCommandRunner { @@ -61,7 +61,7 @@ public class WindowsReleasifyCommandRunner File.Copy(helper.UpdatePath, updatePath, true); // update icon for Update.exe if requested - if (setupIcon != null && SquirrelRuntimeInfo.IsWindows) { + if (setupIcon != null && VelopackRuntimeInfo.IsWindows) { helper.SetExeIcon(updatePath, setupIcon); } else if (setupIcon != null) { _logger.Warn("Unable to set icon for Update.exe (only supported on windows)."); @@ -150,7 +150,7 @@ public class WindowsReleasifyCommandRunner var targetSetupExe = Path.Combine(targetDir, $"{bundledzp.Id}-Setup-[{options.TargetRuntime.ToDisplay(RidDisplayType.NoVersion)}].exe"); File.Copy(helper.SetupPath, targetSetupExe, true); - if (SquirrelRuntimeInfo.IsWindows) { + if (VelopackRuntimeInfo.IsWindows) { helper.SetPEVersionBlockFromPackageInfo(targetSetupExe, bundledzp, setupIcon); } else { _logger.Warn("Unable to set Setup.exe icon (only supported on windows)"); @@ -190,7 +190,7 @@ public class WindowsReleasifyCommandRunner } // signtool.exe does not work if we're not on windows. - if (!SquirrelRuntimeInfo.IsWindows) return; + if (!VelopackRuntimeInfo.IsWindows) return; if (!string.IsNullOrEmpty(signParams)) { _logger.Info($"Preparing to sign {filePaths.Length} files with embedded signtool.exe with parallelism of {signParallel}"); diff --git a/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyOptions.cs b/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyOptions.cs index 950b2257..73612234 100644 --- a/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyOptions.cs +++ b/src/Velopack.Packaging.Windows/Commands/WindowsReleasifyOptions.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.Windows.Commands; +namespace Velopack.Packaging.Windows.Commands; public class WindowsReleasifyOptions : WindowsSigningOptions { diff --git a/src/Velopack.Packaging.Windows/Commands/WindowsSigningOptions.cs b/src/Velopack.Packaging.Windows/Commands/WindowsSigningOptions.cs index 59365d60..791abe56 100644 --- a/src/Velopack.Packaging.Windows/Commands/WindowsSigningOptions.cs +++ b/src/Velopack.Packaging.Windows/Commands/WindowsSigningOptions.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Packaging.Windows.Commands; +namespace Velopack.Packaging.Windows.Commands; public class WindowsSigningOptions { diff --git a/src/Velopack.Packaging.Windows/HelperExe.cs b/src/Velopack.Packaging.Windows/HelperExe.cs index 6af0ca61..3e2e1cdf 100644 --- a/src/Velopack.Packaging.Windows/HelperExe.cs +++ b/src/Velopack.Packaging.Windows/HelperExe.cs @@ -5,7 +5,7 @@ using System.Text; using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; -namespace Squirrel.Packaging.Windows; +namespace Velopack.Packaging.Windows; public class HelperExe : HelperFile { @@ -94,7 +94,7 @@ public class HelperExe : HelperFile public void SignPEFileWithTemplate(string filePath, string signTemplate) { - if (SquirrelRuntimeInfo.IsWindows && CheckIsAlreadySigned(filePath)) { + if (VelopackRuntimeInfo.IsWindows && CheckIsAlreadySigned(filePath)) { Log.Debug($"'{filePath}' is already signed, and will not be signed again."); return; } diff --git a/src/Velopack.Packaging.Windows/SetupBundle.cs b/src/Velopack.Packaging.Windows/SetupBundle.cs index be5f0d7e..fd39ed5f 100644 --- a/src/Velopack.Packaging.Windows/SetupBundle.cs +++ b/src/Velopack.Packaging.Windows/SetupBundle.cs @@ -2,7 +2,7 @@ using Microsoft.NET.HostModel; using Microsoft.NET.HostModel.AppHost; -namespace Squirrel.Packaging.Windows; +namespace Velopack.Packaging.Windows; public static class SetupBundle { diff --git a/src/Velopack.Packaging/Commands/DeltaGenCommandRunner.cs b/src/Velopack.Packaging/Commands/DeltaGenCommandRunner.cs index ea85a2ff..f3b47781 100644 --- a/src/Velopack.Packaging/Commands/DeltaGenCommandRunner.cs +++ b/src/Velopack.Packaging/Commands/DeltaGenCommandRunner.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -namespace Squirrel.Packaging.Commands +namespace Velopack.Packaging.Commands { public class DeltaGenCommandRunner : ICommand { diff --git a/src/Velopack.Packaging/Commands/DeltaGenOptions.cs b/src/Velopack.Packaging/Commands/DeltaGenOptions.cs index d348c617..be5f8b3f 100644 --- a/src/Velopack.Packaging/Commands/DeltaGenOptions.cs +++ b/src/Velopack.Packaging/Commands/DeltaGenOptions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Packaging.Commands +namespace Velopack.Packaging.Commands { public class DeltaGenOptions { diff --git a/src/Velopack.Packaging/Commands/DeltaPatchCommandRunner.cs b/src/Velopack.Packaging/Commands/DeltaPatchCommandRunner.cs index e9de3e99..915f1247 100644 --- a/src/Velopack.Packaging/Commands/DeltaPatchCommandRunner.cs +++ b/src/Velopack.Packaging/Commands/DeltaPatchCommandRunner.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Squirrel.Compression; +using Velopack.Compression; -namespace Squirrel.Packaging.Commands +namespace Velopack.Packaging.Commands { public class DeltaPatchCommandRunner : ICommand { @@ -25,9 +25,9 @@ namespace Squirrel.Packaging.Commands var helper = new HelperFile(logger); string updateExe; - if (SquirrelRuntimeInfo.IsWindows) + if (VelopackRuntimeInfo.IsWindows) updateExe = helper.UpdatePath; - else if (SquirrelRuntimeInfo.IsOSX) + else if (VelopackRuntimeInfo.IsOSX) updateExe = helper.UpdateMacPath; else throw new NotSupportedException("This platform is not supported."); diff --git a/src/Velopack.Packaging/Commands/DeltaPatchOptions.cs b/src/Velopack.Packaging/Commands/DeltaPatchOptions.cs index 973135b2..bc58264d 100644 --- a/src/Velopack.Packaging/Commands/DeltaPatchOptions.cs +++ b/src/Velopack.Packaging/Commands/DeltaPatchOptions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Packaging.Commands +namespace Velopack.Packaging.Commands { public class DeltaPatchOptions { diff --git a/src/Velopack.Packaging/DeltaPackageBuilder.cs b/src/Velopack.Packaging/DeltaPackageBuilder.cs index 969b7dc8..c39754da 100644 --- a/src/Velopack.Packaging/DeltaPackageBuilder.cs +++ b/src/Velopack.Packaging/DeltaPackageBuilder.cs @@ -1,9 +1,9 @@ using System.Text; -using Squirrel.Compression; +using Velopack.Compression; using Microsoft.Extensions.Logging; using System.IO.MemoryMappedFiles; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; public class DeltaPackageBuilder { diff --git a/src/Velopack.Packaging/HelperFile.cs b/src/Velopack.Packaging/HelperFile.cs index 2b379446..4ab8883f 100644 --- a/src/Velopack.Packaging/HelperFile.cs +++ b/src/Velopack.Packaging/HelperFile.cs @@ -7,7 +7,7 @@ using System.Text; using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; public enum DeltaMode { @@ -84,7 +84,7 @@ public class HelperFile }; string zstdPath; - if (SquirrelRuntimeInfo.IsWindows) { + if (VelopackRuntimeInfo.IsWindows) { zstdPath = FindHelperFile("zstd.exe"); } else { zstdPath = "zstd"; @@ -97,7 +97,7 @@ public class HelperFile public void AssertSystemBinaryExists(string binaryName) { try { - if (SquirrelRuntimeInfo.IsWindows) { + if (VelopackRuntimeInfo.IsWindows) { var output = InvokeAndThrowIfNonZero("where", new[] { binaryName }, null); if (String.IsNullOrWhiteSpace(output) || !File.Exists(output)) throw new ProcessFailedException("", ""); diff --git a/src/Velopack.Packaging/ICommand.cs b/src/Velopack.Packaging/ICommand.cs index f54813b7..dfcebe83 100644 --- a/src/Velopack.Packaging/ICommand.cs +++ b/src/Velopack.Packaging/ICommand.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Squirrel.Packaging +namespace Velopack.Packaging { internal interface ICommand where TOpt : class { diff --git a/src/Velopack.Packaging/MarkdownSharp.cs b/src/Velopack.Packaging/MarkdownSharp.cs index ad89992d..0c3fd69c 100644 --- a/src/Velopack.Packaging/MarkdownSharp.cs +++ b/src/Velopack.Packaging/MarkdownSharp.cs @@ -89,7 +89,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text; using System.Text.RegularExpressions; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; [ExcludeFromCodeCoverage] public class MarkdownOptions diff --git a/src/Velopack.Packaging/NugetConsole.cs b/src/Velopack.Packaging/NugetConsole.cs index c53fc4fa..24feace5 100644 --- a/src/Velopack.Packaging/NugetConsole.cs +++ b/src/Velopack.Packaging/NugetConsole.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging; using NuGet.Commands; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; public interface INugetPackCommand { diff --git a/src/Velopack.Packaging/NugetLoggingWrapper.cs b/src/Velopack.Packaging/NugetLoggingWrapper.cs index 6c34ab70..cd2a79e5 100644 --- a/src/Velopack.Packaging/NugetLoggingWrapper.cs +++ b/src/Velopack.Packaging/NugetLoggingWrapper.cs @@ -4,7 +4,7 @@ using NugetLogLevel = NuGet.Common.LogLevel; using INugetLogMessage = NuGet.Common.ILogMessage; using System.Diagnostics.CodeAnalysis; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; [ExcludeFromCodeCoverage] public class NugetLoggingWrapper : INugetLogger diff --git a/src/Velopack.Packaging/ProcessFailedException.cs b/src/Velopack.Packaging/ProcessFailedException.cs index f6b72b03..d5986778 100644 --- a/src/Velopack.Packaging/ProcessFailedException.cs +++ b/src/Velopack.Packaging/ProcessFailedException.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; [ExcludeFromCodeCoverage] public class ProcessFailedException : Exception diff --git a/src/Velopack.Packaging/ReleasePackageBuilder.cs b/src/Velopack.Packaging/ReleasePackageBuilder.cs index 8b061fd0..b41ad5d7 100644 --- a/src/Velopack.Packaging/ReleasePackageBuilder.cs +++ b/src/Velopack.Packaging/ReleasePackageBuilder.cs @@ -4,10 +4,10 @@ using System.Text; using System.Xml; using Microsoft.Extensions.Logging; using NuGet.Versioning; -using Squirrel.Compression; -using Squirrel.NuGet; +using Velopack.Compression; +using Velopack.NuGet; -namespace Squirrel.Packaging; +namespace Velopack.Packaging; public class ReleasePackageBuilder { diff --git a/src/Velopack.Vpk/Commands/DeltaGenCommand.cs b/src/Velopack.Vpk/Commands/DeltaGenCommand.cs index 07a81731..7034a976 100644 --- a/src/Velopack.Vpk/Commands/DeltaGenCommand.cs +++ b/src/Velopack.Vpk/Commands/DeltaGenCommand.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Octokit; -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands +namespace Velopack.Vpk.Commands { public class DeltaGenCommand : BaseCommand { diff --git a/src/Velopack.Vpk/Commands/DeltaPatchCommand.cs b/src/Velopack.Vpk/Commands/DeltaPatchCommand.cs index 397b3c34..aaeb0ed3 100644 --- a/src/Velopack.Vpk/Commands/DeltaPatchCommand.cs +++ b/src/Velopack.Vpk/Commands/DeltaPatchCommand.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands +namespace Velopack.Vpk.Commands { public class DeltaPatchCommand : BaseCommand { diff --git a/src/Velopack.Vpk/Commands/GitHubBaseCommand.cs b/src/Velopack.Vpk/Commands/GitHubBaseCommand.cs index 5f1b36f6..2bbd1221 100644 --- a/src/Velopack.Vpk/Commands/GitHubBaseCommand.cs +++ b/src/Velopack.Vpk/Commands/GitHubBaseCommand.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public abstract class GitHubBaseCommand : OutputCommand { diff --git a/src/Velopack.Vpk/Commands/GitHubDownloadCommand.cs b/src/Velopack.Vpk/Commands/GitHubDownloadCommand.cs index 16c81ebe..6a2d27b3 100644 --- a/src/Velopack.Vpk/Commands/GitHubDownloadCommand.cs +++ b/src/Velopack.Vpk/Commands/GitHubDownloadCommand.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class GitHubDownloadCommand : GitHubBaseCommand { diff --git a/src/Velopack.Vpk/Commands/GitHubUploadCommand.cs b/src/Velopack.Vpk/Commands/GitHubUploadCommand.cs index 9f93e694..76e0a87b 100644 --- a/src/Velopack.Vpk/Commands/GitHubUploadCommand.cs +++ b/src/Velopack.Vpk/Commands/GitHubUploadCommand.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; -using Squirrel.Deployment; +using Velopack.Deployment; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class GitHubUploadCommand : GitHubBaseCommand { diff --git a/src/Velopack.Vpk/Commands/HttpDownloadCommand.cs b/src/Velopack.Vpk/Commands/HttpDownloadCommand.cs index e25d4666..eab0dd98 100644 --- a/src/Velopack.Vpk/Commands/HttpDownloadCommand.cs +++ b/src/Velopack.Vpk/Commands/HttpDownloadCommand.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class HttpDownloadCommand : OutputCommand { diff --git a/src/Velopack.Vpk/Commands/OsxBundleCommand.cs b/src/Velopack.Vpk/Commands/OsxBundleCommand.cs index 48113f67..3643d7ca 100644 --- a/src/Velopack.Vpk/Commands/OsxBundleCommand.cs +++ b/src/Velopack.Vpk/Commands/OsxBundleCommand.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class OsxBundleCommand : OutputCommand { diff --git a/src/Velopack.Vpk/Commands/OsxReleasifyCommand.cs b/src/Velopack.Vpk/Commands/OsxReleasifyCommand.cs index ea388813..d59fa324 100644 --- a/src/Velopack.Vpk/Commands/OsxReleasifyCommand.cs +++ b/src/Velopack.Vpk/Commands/OsxReleasifyCommand.cs @@ -1,6 +1,6 @@ -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class OsxReleasifyCommand : PlatformCommand { diff --git a/src/Velopack.Vpk/Commands/S3BaseCommand.cs b/src/Velopack.Vpk/Commands/S3BaseCommand.cs index 52b9dfbb..ba55ea6c 100644 --- a/src/Velopack.Vpk/Commands/S3BaseCommand.cs +++ b/src/Velopack.Vpk/Commands/S3BaseCommand.cs @@ -1,5 +1,5 @@  -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class S3BaseCommand : OutputCommand { diff --git a/src/Velopack.Vpk/Commands/S3DownloadCommand.cs b/src/Velopack.Vpk/Commands/S3DownloadCommand.cs index 4c7aabda..4cc796ee 100644 --- a/src/Velopack.Vpk/Commands/S3DownloadCommand.cs +++ b/src/Velopack.Vpk/Commands/S3DownloadCommand.cs @@ -1,5 +1,5 @@  -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class S3DownloadCommand : S3BaseCommand { diff --git a/src/Velopack.Vpk/Commands/S3UploadCommand.cs b/src/Velopack.Vpk/Commands/S3UploadCommand.cs index 41b8acfe..e926feb1 100644 --- a/src/Velopack.Vpk/Commands/S3UploadCommand.cs +++ b/src/Velopack.Vpk/Commands/S3UploadCommand.cs @@ -1,5 +1,5 @@  -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class S3UploadCommand : S3BaseCommand { diff --git a/src/Velopack.Vpk/Commands/SystemCommandLineExtensions.cs b/src/Velopack.Vpk/Commands/SystemCommandLineExtensions.cs index be8e66d0..996cb1a0 100644 --- a/src/Velopack.Vpk/Commands/SystemCommandLineExtensions.cs +++ b/src/Velopack.Vpk/Commands/SystemCommandLineExtensions.cs @@ -1,10 +1,10 @@ using System.Text.RegularExpressions; using NuGet.Common; using NuGet.Versioning; -using Squirrel.NuGet; -using Squirrel.Windows; +using Velopack.NuGet; +using Velopack.Windows; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; internal static class SystemCommandLineExtensions { diff --git a/src/Velopack.Vpk/Commands/WindowsPackCommand.cs b/src/Velopack.Vpk/Commands/WindowsPackCommand.cs index f4f63b47..e085fef7 100644 --- a/src/Velopack.Vpk/Commands/WindowsPackCommand.cs +++ b/src/Velopack.Vpk/Commands/WindowsPackCommand.cs @@ -1,7 +1,7 @@  -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class WindowsPackCommand : WindowsReleasifyCommand, INugetPackCommand { diff --git a/src/Velopack.Vpk/Commands/WindowsReleasifyCommand.cs b/src/Velopack.Vpk/Commands/WindowsReleasifyCommand.cs index 6094cb25..efca55c5 100644 --- a/src/Velopack.Vpk/Commands/WindowsReleasifyCommand.cs +++ b/src/Velopack.Vpk/Commands/WindowsReleasifyCommand.cs @@ -1,6 +1,6 @@ -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class WindowsReleasifyCommand : WindowsSigningCommand { diff --git a/src/Velopack.Vpk/Commands/WindowsSigningCommand.cs b/src/Velopack.Vpk/Commands/WindowsSigningCommand.cs index 481f42b0..7bbc70a8 100644 --- a/src/Velopack.Vpk/Commands/WindowsSigningCommand.cs +++ b/src/Velopack.Vpk/Commands/WindowsSigningCommand.cs @@ -1,7 +1,7 @@  -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class WindowsSigningCommand : PlatformCommand { @@ -24,7 +24,7 @@ public class WindowsSigningCommand : PlatformCommand AddOption((v) => SignSkipDll = v, "--signSkipDll") .SetDescription("Only signs EXE files, and skips signing DLL files."); - if (SquirrelRuntimeInfo.IsWindows) { + if (VelopackRuntimeInfo.IsWindows) { var signParams = AddOption((v) => SignParameters = v, "--signParams", "-n") .SetDescription("Sign files via signtool.exe using these parameters.") .SetArgumentHelpName("PARAMS"); diff --git a/src/Velopack.Vpk/Commands/_BaseCommand.cs b/src/Velopack.Vpk/Commands/_BaseCommand.cs index b8c24a18..a38fc5d9 100644 --- a/src/Velopack.Vpk/Commands/_BaseCommand.cs +++ b/src/Velopack.Vpk/Commands/_BaseCommand.cs @@ -1,4 +1,4 @@ -namespace Squirrel.Csq.Commands; +namespace Velopack.Vpk.Commands; public class BaseCommand : CliCommand { diff --git a/src/Velopack.Vpk/Commands/_OutputCommand.cs b/src/Velopack.Vpk/Commands/_OutputCommand.cs index 6731b965..e210487f 100644 --- a/src/Velopack.Vpk/Commands/_OutputCommand.cs +++ b/src/Velopack.Vpk/Commands/_OutputCommand.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Csq.Commands +namespace Velopack.Vpk.Commands { public class OutputCommand : BaseCommand { diff --git a/src/Velopack.Vpk/Commands/_PlatformCommand.cs b/src/Velopack.Vpk/Commands/_PlatformCommand.cs index d6288976..7bb074c2 100644 --- a/src/Velopack.Vpk/Commands/_PlatformCommand.cs +++ b/src/Velopack.Vpk/Commands/_PlatformCommand.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Csq.Commands +namespace Velopack.Vpk.Commands { public class PlatformCommand : OutputCommand { @@ -14,7 +14,7 @@ namespace Squirrel.Csq.Commands protected PlatformCommand(string name, string description) : base(name, description) { - TargetRuntime = SquirrelRuntimeInfo.SystemOs.GetOsShortName(); + TargetRuntime = VelopackRuntimeInfo.SystemOs.GetOsShortName(); AddOption((v) => TargetRuntime = v, "-r", "--runtime") .SetDescription("The target runtime to build packages for.") @@ -26,7 +26,7 @@ namespace Squirrel.Csq.Commands .AcceptExistingOnly(); } - public RID GetRid() => RID.Parse(TargetRuntime ?? SquirrelRuntimeInfo.SystemOs.GetOsShortName()); + public RID GetRid() => RID.Parse(TargetRuntime ?? VelopackRuntimeInfo.SystemOs.GetOsShortName()); public RuntimeOs GetRuntimeOs() => GetRid().BaseRID; } diff --git a/src/Velopack.Vpk/Compat/EmbeddedRunner.cs b/src/Velopack.Vpk/Compat/EmbeddedRunner.cs index 7f749295..957d20df 100644 --- a/src/Velopack.Vpk/Compat/EmbeddedRunner.cs +++ b/src/Velopack.Vpk/Compat/EmbeddedRunner.cs @@ -1,11 +1,11 @@ using System.Runtime.Versioning; -using Squirrel.Csq.Commands; -using Squirrel.Deployment; -using Squirrel.Packaging.Commands; -using Squirrel.Packaging.OSX.Commands; -using Squirrel.Packaging.Windows.Commands; +using Velopack.Vpk.Commands; +using Velopack.Deployment; +using Velopack.Packaging.Commands; +using Velopack.Packaging.OSX.Commands; +using Velopack.Packaging.Windows.Commands; -namespace Squirrel.Csq.Compat; +namespace Velopack.Vpk.Compat; public class EmbeddedRunner : ICommandRunner { diff --git a/src/Velopack.Vpk/Compat/ICommandRunner.cs b/src/Velopack.Vpk/Compat/ICommandRunner.cs index 8f3cd0cf..e8b6ff8d 100644 --- a/src/Velopack.Vpk/Compat/ICommandRunner.cs +++ b/src/Velopack.Vpk/Compat/ICommandRunner.cs @@ -1,7 +1,7 @@ using System.Runtime.Versioning; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.Csq.Compat; +namespace Velopack.Vpk.Compat; public interface ICommandRunner { diff --git a/src/Velopack.Vpk/Compat/RunnerFactory.cs b/src/Velopack.Vpk/Compat/RunnerFactory.cs index dd2b8717..9a9a7ae7 100644 --- a/src/Velopack.Vpk/Compat/RunnerFactory.cs +++ b/src/Velopack.Vpk/Compat/RunnerFactory.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.Configuration; -using Squirrel.Csq.Commands; -using Squirrel.Csq.Updates; +using Velopack.Vpk.Commands; +using Velopack.Vpk.Updates; -namespace Squirrel.Csq.Compat; +namespace Velopack.Vpk.Compat; public class RunnerFactory { @@ -44,7 +44,7 @@ public class RunnerFactory var version = new SquirrelVersionLocator(_logger).Search(solutionDir, CLOWD_PACKAGE_NAME); if (version.Major == 4) { - var myVer = SquirrelRuntimeInfo.SquirrelNugetVersion; + var myVer = VelopackRuntimeInfo.SquirrelNugetVersion; if (version != myVer) { _logger.Warn($"Installed SDK is {version}, while csq is {myVer}, this is not recommended."); } diff --git a/src/Velopack.Vpk/Compat/SquirrelVersionLocator.cs b/src/Velopack.Vpk/Compat/SquirrelVersionLocator.cs index c67ba5ee..21fbe176 100644 --- a/src/Velopack.Vpk/Compat/SquirrelVersionLocator.cs +++ b/src/Velopack.Vpk/Compat/SquirrelVersionLocator.cs @@ -2,7 +2,7 @@ using Microsoft.Build.Construction; using NuGet.Versioning; -namespace Squirrel.Csq.Compat; +namespace Velopack.Vpk.Compat; public class SquirrelVersionLocator { diff --git a/src/Velopack.Vpk/Compat/V2CompatRunner.cs b/src/Velopack.Vpk/Compat/V2CompatRunner.cs index 6e07aeb9..977eaa52 100644 --- a/src/Velopack.Vpk/Compat/V2CompatRunner.cs +++ b/src/Velopack.Vpk/Compat/V2CompatRunner.cs @@ -1,7 +1,7 @@ using System.Diagnostics; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.Csq.Compat; +namespace Velopack.Vpk.Compat; public class V2CompatRunner : EmbeddedRunner { @@ -17,7 +17,7 @@ public class V2CompatRunner : EmbeddedRunner public override async Task ExecutePackWindows(WindowsPackCommand command) { - if (!SquirrelRuntimeInfo.IsWindows || command.GetRuntimeOs() != RuntimeOs.Windows) { + if (!VelopackRuntimeInfo.IsWindows || command.GetRuntimeOs() != RuntimeOs.Windows) { throw new NotSupportedException("Squirrel v2.x is only supported on/for Windows."); } @@ -48,7 +48,7 @@ public class V2CompatRunner : EmbeddedRunner public override async Task ExecuteReleasifyWindows(WindowsReleasifyCommand command) { - if (!SquirrelRuntimeInfo.IsWindows || command.GetRuntimeOs() != RuntimeOs.Windows) { + if (!VelopackRuntimeInfo.IsWindows || command.GetRuntimeOs() != RuntimeOs.Windows) { throw new NotSupportedException("Squirrel v2.x is only supported on/for Windows."); } diff --git a/src/Velopack.Vpk/Program.cs b/src/Velopack.Vpk/Program.cs index d972f88c..aaa5c3a4 100644 --- a/src/Velopack.Vpk/Program.cs +++ b/src/Velopack.Vpk/Program.cs @@ -2,13 +2,13 @@ using Serilog.Events; using Serilog; using Microsoft.Extensions.Configuration; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; using Microsoft.Extensions.DependencyInjection; -using Squirrel.Csq.Updates; -using Squirrel.Csq.Compat; +using Velopack.Vpk.Updates; +using Velopack.Vpk.Compat; using System.CommandLine.Help; -namespace Squirrel.Csq; +namespace Velopack.Vpk; public class Program { @@ -51,11 +51,11 @@ public class Program Runner = new RunnerFactory(logger, host.Services.GetRequiredService()); CliRootCommand rootCommand = new CliRootCommand( - $"Squirrel {SquirrelRuntimeInfo.SquirrelDisplayVersion} for creating and distributing Squirrel releases.") { + $"Squirrel {VelopackRuntimeInfo.SquirrelDisplayVersion} for creating and distributing Squirrel releases.") { VerboseOption, }; - switch (SquirrelRuntimeInfo.SystemOs) { + switch (VelopackRuntimeInfo.SystemOs) { case RuntimeOs.Windows: Add(rootCommand, new WindowsPackCommand(), nameof(ICommandRunner.ExecutePackWindows)); Add(rootCommand, new WindowsReleasifyCommand(), nameof(ICommandRunner.ExecuteReleasifyWindows)); @@ -65,7 +65,7 @@ public class Program Add(rootCommand, new OsxReleasifyCommand(), nameof(ICommandRunner.ExecuteReleasifyOsx)); break; default: - throw new NotSupportedException("Unsupported OS platform: " + SquirrelRuntimeInfo.SystemOs.GetOsLongName()); + throw new NotSupportedException("Unsupported OS platform: " + VelopackRuntimeInfo.SystemOs.GetOsLongName()); } CliCommand downloadCommand = new CliCommand("download", "Download's the latest release from a remote update source."); diff --git a/src/Velopack.Vpk/Updates/NugetDownloader.cs b/src/Velopack.Vpk/Updates/NugetDownloader.cs index ddc32633..60ea4ecd 100644 --- a/src/Velopack.Vpk/Updates/NugetDownloader.cs +++ b/src/Velopack.Vpk/Updates/NugetDownloader.cs @@ -5,7 +5,7 @@ using NuGet.Protocol.Core.Types; using NuGet.Versioning; using NugetLogger = NuGet.Common.ILogger; -namespace Squirrel.Csq.Updates; +namespace Velopack.Vpk.Updates; public class NugetDownloader { diff --git a/src/Velopack.Vpk/Updates/NullNugetLogger.cs b/src/Velopack.Vpk/Updates/NullNugetLogger.cs index 5afd4e0d..2b09af1f 100644 --- a/src/Velopack.Vpk/Updates/NullNugetLogger.cs +++ b/src/Velopack.Vpk/Updates/NullNugetLogger.cs @@ -2,7 +2,7 @@ using NugetLogger = NuGet.Common.ILogger; using NugetMessage = NuGet.Common.ILogMessage; -namespace Squirrel.Csq.Updates; +namespace Velopack.Vpk.Updates; class NullNugetLogger : NugetLogger { diff --git a/src/Velopack.Vpk/Updates/UpdateChecker.cs b/src/Velopack.Vpk/Updates/UpdateChecker.cs index 17ae279b..e75e64be 100644 --- a/src/Velopack.Vpk/Updates/UpdateChecker.cs +++ b/src/Velopack.Vpk/Updates/UpdateChecker.cs @@ -1,7 +1,7 @@ using System.Threading; -using Squirrel.Packaging; +using Velopack.Packaging; -namespace Squirrel.Csq.Updates; +namespace Velopack.Vpk.Updates; public class UpdateChecker { @@ -16,7 +16,7 @@ public class UpdateChecker { try { var cancel = new CancellationTokenSource(3000); - var myVer = SquirrelRuntimeInfo.SquirrelNugetVersion; + var myVer = VelopackRuntimeInfo.SquirrelNugetVersion; var dl = new NugetDownloader(new NugetLoggingWrapper(_logger)); var package = await dl.GetPackageMetadata("csq", (myVer.IsPrerelease || myVer.HasMetadata) ? "pre" : "latest", cancel.Token).ConfigureAwait(false); if (package.Identity.Version > myVer) diff --git a/src/Velopack/Compression/BZip2Stream.cs b/src/Velopack/Compression/BZip2Stream.cs index ec045204..6962ecf3 100644 --- a/src/Velopack/Compression/BZip2Stream.cs +++ b/src/Velopack/Compression/BZip2Stream.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.IO.Compression; -namespace Squirrel.Compression +namespace Velopack.Compression { [ExcludeFromCodeCoverage] internal sealed class BZip2Stream : Stream diff --git a/src/Velopack/Compression/BinaryPatchUtility.cs b/src/Velopack/Compression/BinaryPatchUtility.cs index 9580a0fb..8755e495 100644 --- a/src/Velopack/Compression/BinaryPatchUtility.cs +++ b/src/Velopack/Compression/BinaryPatchUtility.cs @@ -6,7 +6,7 @@ using System.Threading; // Adapted from https://github.com/LogosBible/bsdiff.net/blob/master/src/bsdiff/BinaryPatchUtility.cs -namespace Squirrel.Compression +namespace Velopack.Compression { /* The original bsdiff.c source code (http://www.daemonology.net/bsdiff/) is diff --git a/src/Velopack/Compression/ChecksumFailedException.cs b/src/Velopack/Compression/ChecksumFailedException.cs index 4003c4e4..2d1f2f98 100644 --- a/src/Velopack/Compression/ChecksumFailedException.cs +++ b/src/Velopack/Compression/ChecksumFailedException.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Squirrel.Compression +namespace Velopack.Compression { /// /// Represents an error that occurs when a package does not match it's expected SHA checksum diff --git a/src/Velopack/Compression/DeltaPackage.cs b/src/Velopack/Compression/DeltaPackage.cs index 7eeb37d8..4742e3d7 100644 --- a/src/Velopack/Compression/DeltaPackage.cs +++ b/src/Velopack/Compression/DeltaPackage.cs @@ -7,12 +7,12 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; -using Squirrel.Locators; +using Velopack.Locators; // https://dev.to/emrahsungu/how-to-compare-two-files-using-net-really-really-fast-2pd9 // https://github.com/SnowflakePowered/vcdiff -namespace Squirrel.Compression +namespace Velopack.Compression { internal class DeltaPackage { @@ -121,7 +121,7 @@ namespace Squirrel.Compression } else if (relativeFilePath.EndsWith(".diff", StringComparison.InvariantCultureIgnoreCase)) { _log.Trace($"Applying msdiff to {relativeFilePath}"); - if (SquirrelRuntimeInfo.IsWindows) { + if (VelopackRuntimeInfo.IsWindows) { MsDeltaCompression.ApplyDelta(inputFile, finalTarget, tempTargetFile); } else { throw new InvalidOperationException("msdiff is not supported on non-windows platforms."); diff --git a/src/Velopack/Compression/EasyZip.cs b/src/Velopack/Compression/EasyZip.cs index b6cf036b..55a8f215 100644 --- a/src/Velopack/Compression/EasyZip.cs +++ b/src/Velopack/Compression/EasyZip.cs @@ -2,7 +2,7 @@ using System.IO.Compression; using Microsoft.Extensions.Logging; -namespace Squirrel.Compression +namespace Velopack.Compression { internal static class EasyZip { diff --git a/src/Velopack/Compression/MsDeltaCompression.cs b/src/Velopack/Compression/MsDeltaCompression.cs index 58292972..5f88a80b 100644 --- a/src/Velopack/Compression/MsDeltaCompression.cs +++ b/src/Velopack/Compression/MsDeltaCompression.cs @@ -6,7 +6,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Runtime.Versioning; -namespace Squirrel.Compression +namespace Velopack.Compression { [ExcludeFromCodeCoverage] [SupportedOSPlatform("windows")] diff --git a/src/Velopack/Internal/Disposable.cs b/src/Velopack/Internal/Disposable.cs index 284dd367..24051429 100644 --- a/src/Velopack/Internal/Disposable.cs +++ b/src/Velopack/Internal/Disposable.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; -namespace Squirrel +namespace Velopack { [ExcludeFromCodeCoverage] internal static class Disposable diff --git a/src/Velopack/Internal/EnumerableExtensions.cs b/src/Velopack/Internal/EnumerableExtensions.cs index 109c00ea..d84afeb4 100644 --- a/src/Velopack/Internal/EnumerableExtensions.cs +++ b/src/Velopack/Internal/EnumerableExtensions.cs @@ -4,11 +4,8 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Squirrel +namespace Velopack { - /// - /// Useful enumerable extensions used by Squirrel - /// [ExcludeFromCodeCoverage] internal static class EnumerableExtensions { diff --git a/src/Velopack/Internal/LoggerExtensions.cs b/src/Velopack/Internal/LoggerExtensions.cs index 73ec7db0..6fbafd84 100644 --- a/src/Velopack/Internal/LoggerExtensions.cs +++ b/src/Velopack/Internal/LoggerExtensions.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Logging; -namespace Squirrel +namespace Velopack { [ExcludeFromCodeCoverage] internal static class LoggerExtensions diff --git a/src/Velopack/Internal/ProcessExtensions.cs b/src/Velopack/Internal/ProcessExtensions.cs index 78c26940..c87cc8e6 100644 --- a/src/Velopack/Internal/ProcessExtensions.cs +++ b/src/Velopack/Internal/ProcessExtensions.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using Microsoft.Extensions.Logging; -namespace Squirrel +namespace Velopack { [ExcludeFromCodeCoverage] internal static class ProcessStartExtensions diff --git a/src/Velopack/Internal/SimpleJson.cs b/src/Velopack/Internal/SimpleJson.cs index 9bdd3930..3adb2396 100644 --- a/src/Velopack/Internal/SimpleJson.cs +++ b/src/Velopack/Internal/SimpleJson.cs @@ -68,12 +68,12 @@ using System.Runtime.Serialization; using System.Text; #if !NET5_0_OR_GREATER -using Squirrel.Json.Reflection; +using Velopack.Json.Reflection; #endif #if NET5_0_OR_GREATER -namespace Squirrel.Json +namespace Velopack.Json { [ExcludeFromCodeCoverage] internal static class SimpleJson @@ -90,7 +90,7 @@ namespace Squirrel.Json // ReSharper disable LoopCanBeConvertedToQuery // ReSharper disable RedundantExplicitArrayCreation // ReSharper disable SuggestUseVarKeywordEvident -namespace Squirrel.Json +namespace Velopack.Json { /// /// Represents the json array. @@ -505,7 +505,7 @@ namespace Squirrel.Json } } -namespace Squirrel.Json +namespace Velopack.Json { /// /// This class encodes and decodes JSON strings. diff --git a/src/Velopack/Internal/Utility.cs b/src/Velopack/Internal/Utility.cs index 98a139c9..77a1a695 100644 --- a/src/Velopack/Internal/Utility.cs +++ b/src/Velopack/Internal/Utility.cs @@ -10,9 +10,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Squirrel.NuGet; +using Velopack.NuGet; -namespace Squirrel +namespace Velopack { internal static class Utility { @@ -101,22 +101,22 @@ namespace Squirrel public static bool FullPathEquals(string path1, string path2) { - return NormalizePath(path1).Equals(NormalizePath(path2), SquirrelRuntimeInfo.PathStringComparison); + return NormalizePath(path1).Equals(NormalizePath(path2), VelopackRuntimeInfo.PathStringComparison); } public static bool PathPartEquals(string part1, string part2) { - return part1.Equals(part2, SquirrelRuntimeInfo.PathStringComparison); + return part1.Equals(part2, VelopackRuntimeInfo.PathStringComparison); } public static bool PathPartStartsWith(string part1, string startsWith) { - return part1.StartsWith(startsWith, SquirrelRuntimeInfo.PathStringComparison); + return part1.StartsWith(startsWith, VelopackRuntimeInfo.PathStringComparison); } public static bool PathPartEndsWith(string part1, string endsWith) { - return part1.EndsWith(endsWith, SquirrelRuntimeInfo.PathStringComparison); + return part1.EndsWith(endsWith, VelopackRuntimeInfo.PathStringComparison); } public static bool FileHasExtension(string filePath, string extension) @@ -137,7 +137,7 @@ namespace Squirrel { var normalizedDir = NormalizePath(directory) + Path.DirectorySeparatorChar; var normalizedFile = NormalizePath(file); - return normalizedFile.StartsWith(normalizedDir, SquirrelRuntimeInfo.PathStringComparison); + return normalizedFile.StartsWith(normalizedDir, VelopackRuntimeInfo.PathStringComparison); } public static IEnumerable GetAllFilesRecursively(this DirectoryInfo rootPath) @@ -270,15 +270,15 @@ namespace Squirrel { string tempDir; - if (SquirrelRuntimeInfo.IsOSX) { - tempDir = "/tmp/clowd.squirrel"; - } else if (SquirrelRuntimeInfo.IsWindows) { - tempDir = Path.Combine(Path.GetTempPath(), "Clowd.Squirrel"); + if (VelopackRuntimeInfo.IsOSX) { + tempDir = "/tmp/velopack"; + } else if (VelopackRuntimeInfo.IsWindows) { + tempDir = Path.Combine(Path.GetTempPath(), "Velopack"); } else { throw new NotSupportedException(); } - if (Environment.GetEnvironmentVariable("CLOWD_SQUIRREL_TEMP") is var squirrlTmp + if (Environment.GetEnvironmentVariable("VELOPACK_TEMP") is var squirrlTmp && !string.IsNullOrWhiteSpace(squirrlTmp)) tempDir = squirrlTmp; @@ -409,7 +409,7 @@ namespace Squirrel private static void DeleteFsiVeryHard(FileSystemInfo fileSystemInfo, ILogger logger) { // don't try to delete the running process - if (FullPathEquals(fileSystemInfo.FullName, SquirrelRuntimeInfo.EntryExePath)) + if (FullPathEquals(fileSystemInfo.FullName, VelopackRuntimeInfo.EntryExePath)) return; // try to remove "ReadOnly" attributes @@ -481,7 +481,7 @@ namespace Squirrel public static string GetAppUserModelId(string packageId, string exeName) { - return String.Format("com.squirrel.{0}.{1}", packageId.Replace(" ", ""), + return String.Format("com.velopack.{0}.{1}", packageId.Replace(" ", ""), exeName.Replace(".exe", "").Replace(" ", "")); } diff --git a/src/Velopack/Locators/ISquirrelLocator.cs b/src/Velopack/Locators/IVelopackLocator.cs similarity index 94% rename from src/Velopack/Locators/ISquirrelLocator.cs rename to src/Velopack/Locators/IVelopackLocator.cs index b0906911..154c6082 100644 --- a/src/Velopack/Locators/ISquirrelLocator.cs +++ b/src/Velopack/Locators/IVelopackLocator.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using NuGet.Versioning; -namespace Squirrel.Locators +namespace Velopack.Locators { /// - /// An interface describing where Squirrel can find key folders and files. + /// An interface describing where Velopack can find key folders and files. /// - public interface ISquirrelLocator + public interface IVelopackLocator { /// The unique application Id. This is used in various app paths. public string AppId { get; } diff --git a/src/Velopack/Locators/OsxSquirrelLocator.cs b/src/Velopack/Locators/OsxVelopackLocator.cs similarity index 85% rename from src/Velopack/Locators/OsxSquirrelLocator.cs rename to src/Velopack/Locators/OsxVelopackLocator.cs index 78ebe71a..623715db 100644 --- a/src/Velopack/Locators/OsxSquirrelLocator.cs +++ b/src/Velopack/Locators/OsxVelopackLocator.cs @@ -3,16 +3,16 @@ using System.IO; using System.Runtime.Versioning; using Microsoft.Extensions.Logging; using NuGet.Versioning; -using Squirrel.NuGet; +using Velopack.NuGet; -namespace Squirrel.Locators +namespace Velopack.Locators { /// /// The default for OSX. All application files will remain in the '.app'. /// All additional files (log, etc) will be placed in a temporary directory. /// [SupportedOSPlatform("osx")] - public class OsxSquirrelLocator : SquirrelLocator + public class OsxVelopackLocator : VelopackLocator { /// public override string AppId { get; } @@ -36,19 +36,19 @@ namespace Squirrel.Locators public override string PackagesDir => CreateSubDirIfDoesNotExist(AppTempDir, "packages"); /// - /// Creates a new and auto-detects the + /// Creates a new and auto-detects the /// app information from metadata embedded in the .app. /// - public OsxSquirrelLocator(ILogger logger) + public OsxVelopackLocator(ILogger logger) : base(logger) { - if (!SquirrelRuntimeInfo.IsOSX) + if (!VelopackRuntimeInfo.IsOSX) throw new NotSupportedException("Cannot instantiate OsxLocator on a non-osx system."); - Log.Info("Initialising OsxSquirrelLocator"); + Log.Info($"Initialising {nameof(OsxVelopackLocator)}"); // are we inside a .app? - var ourPath = SquirrelRuntimeInfo.EntryExePath; + var ourPath = VelopackRuntimeInfo.EntryExePath; var ix = ourPath.IndexOf(".app/", StringComparison.InvariantCultureIgnoreCase); if (ix <= 0) { Log.Warn($"Unable to locate .app root from '{ourPath}'"); diff --git a/src/Velopack/Locators/TestSquirrelLocator.cs b/src/Velopack/Locators/TestVelopackLocator.cs similarity index 85% rename from src/Velopack/Locators/TestSquirrelLocator.cs rename to src/Velopack/Locators/TestVelopackLocator.cs index fc6172d9..2009f8ba 100644 --- a/src/Velopack/Locators/TestSquirrelLocator.cs +++ b/src/Velopack/Locators/TestVelopackLocator.cs @@ -7,15 +7,15 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using NuGet.Versioning; -namespace Squirrel.Locators +namespace Velopack.Locators { /// - /// Provides a mock / test implementation of . This can be used to verify that + /// Provides a mock / test implementation of . This can be used to verify that /// your application is able to find and prepare updates from your chosen update source without actually - /// having an installed Squirrel application. This could be used in a CI/CD pipeline, or unit tests etc. + /// having an installed application. This could be used in a CI/CD pipeline, or unit tests etc. /// [ExcludeFromCodeCoverage] - public class TestSquirrelLocator : SquirrelLocator + public class TestVelopackLocator : VelopackLocator { /// public override string AppId { @@ -83,14 +83,14 @@ namespace Squirrel.Locators private readonly string _root; private readonly string _appContent; - /// - public TestSquirrelLocator(string appId, string version, string packagesDir, ILogger logger = null) + /// + public TestVelopackLocator(string appId, string version, string packagesDir, ILogger logger = null) : this(appId, version, packagesDir, null, null, null, logger) { } - /// - public TestSquirrelLocator(string appId, string version, string packagesDir, string appDir, + /// + public TestVelopackLocator(string appId, string version, string packagesDir, string appDir, string rootDir, string updateExe, ILogger logger = null) : base(logger) { diff --git a/src/Velopack/Locators/SquirrelLocator.cs b/src/Velopack/Locators/VelopackLocator.cs similarity index 71% rename from src/Velopack/Locators/SquirrelLocator.cs rename to src/Velopack/Locators/VelopackLocator.cs index 2792c179..d5fbfd94 100644 --- a/src/Velopack/Locators/SquirrelLocator.cs +++ b/src/Velopack/Locators/VelopackLocator.cs @@ -8,32 +8,32 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using NuGet.Versioning; -namespace Squirrel.Locators +namespace Velopack.Locators { /// - /// A base class describing where Squirrel can find key folders and files. + /// A base class describing where Velopack can find key folders and files. /// - public abstract class SquirrelLocator : ISquirrelLocator + public abstract class VelopackLocator : IVelopackLocator { - private static SquirrelLocator _current; + private static VelopackLocator _current; /// /// Auto-detect the platform from the current operating system. /// - public static SquirrelLocator GetDefault(ILogger logger) + public static VelopackLocator GetDefault(ILogger logger) { var log = logger ?? NullLogger.Instance; if (_current != null) return _current; - if (SquirrelRuntimeInfo.IsWindows) - return _current ??= new WindowsSquirrelLocator(log); + if (VelopackRuntimeInfo.IsWindows) + return _current ??= new WindowsVelopackLocator(log); - if (SquirrelRuntimeInfo.IsOSX) - return _current ??= new OsxSquirrelLocator(log); + if (VelopackRuntimeInfo.IsOSX) + return _current ??= new OsxVelopackLocator(log); - throw new NotSupportedException($"OS platform '{SquirrelRuntimeInfo.SystemOs.GetOsLongName()}' is not supported."); + throw new NotSupportedException($"OS platform '{VelopackRuntimeInfo.SystemOs.GetOsLongName()}' is not supported."); } /// @@ -46,7 +46,7 @@ namespace Squirrel.Locators public abstract string PackagesDir { get; } /// - public virtual string AppTempDir => CreateSubDirIfDoesNotExist(PackagesDir, "SquirrelClowdTemp"); + public virtual string AppTempDir => CreateSubDirIfDoesNotExist(PackagesDir, "VelopackTemp"); /// public abstract string UpdateExePath { get; } @@ -57,7 +57,7 @@ namespace Squirrel.Locators /// public virtual string ThisExeRelativePath { get { - var path = SquirrelRuntimeInfo.EntryExePath; + var path = VelopackRuntimeInfo.EntryExePath; if (path.StartsWith(AppContentDir, StringComparison.OrdinalIgnoreCase)) { return path.Substring(AppContentDir.Length + 1); } else { @@ -72,8 +72,8 @@ namespace Squirrel.Locators /// The log interface to use for diagnostic messages. protected ILogger Log { get; } - /// - protected SquirrelLocator(ILogger logger) + /// + protected VelopackLocator(ILogger logger) { Log = logger; } @@ -147,27 +147,5 @@ namespace Squirrel.Locators return null; } } - - // /// - // /// Starts Update.exe with the correct arguments to restart this process. - // /// Update.exe will wait for this process to exit, and apply any pending version updates - // /// before re-launching the latest version. - // /// - // public virtual Process StartRestartingProcess(string exeToStart = null, string arguments = null) - // { - // exeToStart = exeToStart ?? Path.GetFileName(SquirrelRuntimeInfo.EntryExePath); - // - // List args = new() { - // "--processStartAndWait", - // exeToStart, - // }; - // - // if (arguments != null) { - // args.Add("-a"); - // args.Add(arguments); - // } - // - // return PlatformUtil.StartProcessNonBlocking(UpdateExePath, args, Path.GetDirectoryName(UpdateExePath)); - // } } } \ No newline at end of file diff --git a/src/Velopack/Locators/WindowsSquirrelLocator.cs b/src/Velopack/Locators/WindowsVelopackLocator.cs similarity index 91% rename from src/Velopack/Locators/WindowsSquirrelLocator.cs rename to src/Velopack/Locators/WindowsVelopackLocator.cs index 0465bc4f..5d5f2955 100644 --- a/src/Velopack/Locators/WindowsSquirrelLocator.cs +++ b/src/Velopack/Locators/WindowsVelopackLocator.cs @@ -4,15 +4,15 @@ using System.Runtime.Versioning; using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using NuGet.Versioning; -using Squirrel.NuGet; +using Velopack.NuGet; -namespace Squirrel.Locators +namespace Velopack.Locators { /// /// An implementation for Windows which uses the Squirrel default paths. /// [SupportedOSPlatform("windows")] - public class WindowsSquirrelLocator : SquirrelLocator + public class WindowsVelopackLocator : VelopackLocator { /// public override string AppId { get; } @@ -32,18 +32,18 @@ namespace Squirrel.Locators /// public override string PackagesDir => CreateSubDirIfDoesNotExist(RootAppDir, "packages"); - /// - public WindowsSquirrelLocator(ILogger logger) : this(SquirrelRuntimeInfo.EntryExePath, logger) + /// + public WindowsVelopackLocator(ILogger logger) : this(VelopackRuntimeInfo.EntryExePath, logger) { } /// /// Internal use only. Auto detect app details from the specified EXE path. /// - internal WindowsSquirrelLocator(string ourExePath, ILogger logger) + internal WindowsVelopackLocator(string ourExePath, ILogger logger) : base(logger) { - if (!SquirrelRuntimeInfo.IsWindows) + if (!VelopackRuntimeInfo.IsWindows) throw new NotSupportedException("Cannot instantiate WindowsLocator on a non-Windows system."); // We try various approaches here. Firstly, if Update.exe is in the parent directory, @@ -58,7 +58,7 @@ namespace Squirrel.Locators var possibleUpdateExe = Path.GetFullPath(Path.Combine(myDirPath, "..\\Update.exe")); var ixCurrent = ourExePath.LastIndexOf("/current/", StringComparison.InvariantCultureIgnoreCase); - Log.Info("Initialising WindowsSquirrelLocator"); + Log.Info($"Initialising {nameof(WindowsVelopackLocator)}"); if (File.Exists(possibleUpdateExe)) { Log.Info("Update.exe found in parent directory"); diff --git a/src/Velopack/NuGet/ContentType.cs b/src/Velopack/NuGet/ContentType.cs index 998b2586..c7f264e1 100644 --- a/src/Velopack/NuGet/ContentType.cs +++ b/src/Velopack/NuGet/ContentType.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Xml; -namespace Squirrel.NuGet +namespace Velopack.NuGet { internal static class ContentType { diff --git a/src/Velopack/NuGet/IPackage.cs b/src/Velopack/NuGet/IPackage.cs index 353a4e31..748f75a5 100644 --- a/src/Velopack/NuGet/IPackage.cs +++ b/src/Velopack/NuGet/IPackage.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using NuGet.Versioning; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public interface IPackage { diff --git a/src/Velopack/NuGet/IPackageFile.cs b/src/Velopack/NuGet/IPackageFile.cs index 11d6b826..0e57c3e1 100644 --- a/src/Velopack/NuGet/IPackageFile.cs +++ b/src/Velopack/NuGet/IPackageFile.cs @@ -1,7 +1,7 @@ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public interface IPackageFile { diff --git a/src/Velopack/NuGet/IZipPackage.cs b/src/Velopack/NuGet/IZipPackage.cs index f4341d18..3d831b4d 100644 --- a/src/Velopack/NuGet/IZipPackage.cs +++ b/src/Velopack/NuGet/IZipPackage.cs @@ -1,7 +1,7 @@ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System.Collections.Generic; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public interface IZipPackage : IPackage { diff --git a/src/Velopack/NuGet/NugetUtil.cs b/src/Velopack/NuGet/NugetUtil.cs index c6262edb..3af2adfc 100644 --- a/src/Velopack/NuGet/NugetUtil.cs +++ b/src/Velopack/NuGet/NugetUtil.cs @@ -7,7 +7,7 @@ using System.Xml; using System.Xml.Linq; using NuGet.Versioning; -namespace Squirrel.NuGet +namespace Velopack.NuGet { internal static class NugetUtil { diff --git a/src/Velopack/NuGet/NuspecManifest.cs b/src/Velopack/NuGet/NuspecManifest.cs index 27e99b56..61aaea11 100644 --- a/src/Velopack/NuGet/NuspecManifest.cs +++ b/src/Velopack/NuGet/NuspecManifest.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Xml.Linq; using NuGet.Versioning; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public class NuspecManifest : IPackage { diff --git a/src/Velopack/NuGet/PackageDependency.cs b/src/Velopack/NuGet/PackageDependency.cs index d4e4e0a0..f8c2a31b 100644 --- a/src/Velopack/NuGet/PackageDependency.cs +++ b/src/Velopack/NuGet/PackageDependency.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Globalization; using System.Linq; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public class PackageDependency { diff --git a/src/Velopack/NuGet/ZipPackage.cs b/src/Velopack/NuGet/ZipPackage.cs index e4d210ab..31ae08bd 100644 --- a/src/Velopack/NuGet/ZipPackage.cs +++ b/src/Velopack/NuGet/ZipPackage.cs @@ -9,7 +9,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public class ZipPackage : NuspecManifest, IZipPackage { diff --git a/src/Velopack/NuGet/ZipPackageFile.cs b/src/Velopack/NuGet/ZipPackageFile.cs index e42af1ff..43c4daea 100644 --- a/src/Velopack/NuGet/ZipPackageFile.cs +++ b/src/Velopack/NuGet/ZipPackageFile.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Squirrel.NuGet +namespace Velopack.NuGet { public class ZipPackageFile : IPackageFile, IEquatable { diff --git a/src/Velopack/RID.cs b/src/Velopack/RID.cs index 95a7e0e2..99b2fa62 100644 --- a/src/Velopack/RID.cs +++ b/src/Velopack/RID.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Text; -namespace Squirrel +namespace Velopack { /// /// A Version class that also supports a single integer (major only) diff --git a/src/Velopack/ReleaseEntry.cs b/src/Velopack/ReleaseEntry.cs index 101bac6f..8f8725fd 100644 --- a/src/Velopack/ReleaseEntry.cs +++ b/src/Velopack/ReleaseEntry.cs @@ -9,9 +9,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using NuGet.Versioning; -using Squirrel.NuGet; +using Velopack.NuGet; -namespace Squirrel +namespace Velopack { /// /// Describes the requested release notes text format. diff --git a/src/Velopack/ReleaseEntryName.cs b/src/Velopack/ReleaseEntryName.cs index ab5eec8b..d2f6002e 100644 --- a/src/Velopack/ReleaseEntryName.cs +++ b/src/Velopack/ReleaseEntryName.cs @@ -4,7 +4,7 @@ using System.IO; using System.Text.RegularExpressions; using NuGet.Versioning; -namespace Squirrel +namespace Velopack { /// /// Represents the information that can be parsed from a release entry filename. diff --git a/src/Velopack/Sources/GithubSource.cs b/src/Velopack/Sources/GithubSource.cs index ec9eed71..753e4b1f 100644 --- a/src/Velopack/Sources/GithubSource.cs +++ b/src/Velopack/Sources/GithubSource.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Runtime.Serialization; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Squirrel.Json; +using Velopack.Json; -namespace Squirrel.Sources +namespace Velopack.Sources { /// Describes a GitHub release, including attached assets. [DataContract] diff --git a/src/Velopack/Sources/GitlabSource.cs b/src/Velopack/Sources/GitlabSource.cs index 2d196827..d2e05430 100644 --- a/src/Velopack/Sources/GitlabSource.cs +++ b/src/Velopack/Sources/GitlabSource.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Runtime.Serialization; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Squirrel.Json; +using Velopack.Json; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// Describes a Gitlab release, plus any assets that are attached. diff --git a/src/Velopack/Sources/HttpClientFileDownloader.cs b/src/Velopack/Sources/HttpClientFileDownloader.cs index 39c7561e..76491dc5 100644 --- a/src/Velopack/Sources/HttpClientFileDownloader.cs +++ b/src/Velopack/Sources/HttpClientFileDownloader.cs @@ -6,7 +6,7 @@ using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; -namespace Squirrel.Sources +namespace Velopack.Sources { /// @@ -15,7 +15,7 @@ namespace Squirrel.Sources /// /// The User-Agent sent with Squirrel requests /// - public static ProductInfoHeaderValue UserAgent => new("Squirrel", SquirrelRuntimeInfo.SquirrelNugetVersion.ToFullString()); + public static ProductInfoHeaderValue UserAgent => new("Squirrel", VelopackRuntimeInfo.SquirrelNugetVersion.ToFullString()); /// public virtual async Task DownloadFile(string url, string targetFile, Action progress, string authorization, string accept) diff --git a/src/Velopack/Sources/IFileDownloader.cs b/src/Velopack/Sources/IFileDownloader.cs index 0f32244a..882ec3d2 100644 --- a/src/Velopack/Sources/IFileDownloader.cs +++ b/src/Velopack/Sources/IFileDownloader.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// A simple abstractable file downloader diff --git a/src/Velopack/Sources/IUpdateSource.cs b/src/Velopack/Sources/IUpdateSource.cs index f8bbe3ea..1cb44089 100644 --- a/src/Velopack/Sources/IUpdateSource.cs +++ b/src/Velopack/Sources/IUpdateSource.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// Abstraction for finding and downloading updates from a package source / repository. diff --git a/src/Velopack/Sources/SimpleFileSource.cs b/src/Velopack/Sources/SimpleFileSource.cs index a7d24517..76742d9c 100644 --- a/src/Velopack/Sources/SimpleFileSource.cs +++ b/src/Velopack/Sources/SimpleFileSource.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// Retrieves available updates from a local or network-attached disk. The directory diff --git a/src/Velopack/Sources/SimpleWebSource.cs b/src/Velopack/Sources/SimpleWebSource.cs index 41d3735d..e64c21c2 100644 --- a/src/Velopack/Sources/SimpleWebSource.cs +++ b/src/Velopack/Sources/SimpleWebSource.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// Retrieves updates from a static file host or other web server. @@ -38,13 +38,13 @@ namespace Squirrel.Sources var uri = Utility.AppendPathToUri(BaseUri, GetReleasesFileName()); var args = new Dictionary(); - if (SquirrelRuntimeInfo.SystemArch != RuntimeCpu.Unknown) { - args.Add("arch", SquirrelRuntimeInfo.SystemArch.ToString()); + if (VelopackRuntimeInfo.SystemArch != RuntimeCpu.Unknown) { + args.Add("arch", VelopackRuntimeInfo.SystemArch.ToString()); } - if (SquirrelRuntimeInfo.SystemOs != RuntimeOs.Unknown) { - args.Add("os", SquirrelRuntimeInfo.SystemOs.GetOsShortName()); - args.Add("rid", SquirrelRuntimeInfo.SystemRid); + if (VelopackRuntimeInfo.SystemOs != RuntimeOs.Unknown) { + args.Add("os", VelopackRuntimeInfo.SystemOs.GetOsShortName()); + args.Add("rid", VelopackRuntimeInfo.SystemRid); } if (latestLocalRelease != null) { diff --git a/src/Velopack/Sources/SourceBase.cs b/src/Velopack/Sources/SourceBase.cs index 83887a5b..99c23735 100644 --- a/src/Velopack/Sources/SourceBase.cs +++ b/src/Velopack/Sources/SourceBase.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -namespace Squirrel.Sources +namespace Velopack.Sources { /// /// A base class to provide some common functionality for classes that implement . diff --git a/src/Velopack/UpdateInfo.cs b/src/Velopack/UpdateInfo.cs index 6a52aeac..86f430d6 100644 --- a/src/Velopack/UpdateInfo.cs +++ b/src/Velopack/UpdateInfo.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; -namespace Squirrel +namespace Velopack { /// /// Holds information about the current version and pending updates, such as how many there are, and access to release notes. diff --git a/src/Velopack/UpdateManager.cs b/src/Velopack/UpdateManager.cs index 9b377c4c..a7728fae 100644 --- a/src/Velopack/UpdateManager.cs +++ b/src/Velopack/UpdateManager.cs @@ -8,11 +8,11 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using NuGet.Versioning; -using Squirrel.Compression; -using Squirrel.Locators; -using Squirrel.Sources; +using Velopack.Compression; +using Velopack.Locators; +using Velopack.Sources; -namespace Squirrel +namespace Velopack { /// /// Provides functionality for checking for updates, downloading updates, and applying updates to the current application. @@ -46,7 +46,7 @@ namespace Squirrel protected ILogger Log { get; } /// The locator to use when searching for local file paths. - protected ISquirrelLocator Locator { get; } + protected IVelopackLocator Locator { get; } /// /// Creates a new UpdateManager instance using the specified URL or file path to the releases feed, and the specified channel name. @@ -54,9 +54,9 @@ namespace Squirrel /// A basic URL or file path to use when checking for updates. /// Search for releases in the feed of a specific channel name. If null, it will search the default channel. /// The logger to use for diagnostic messages. - /// This should usually be left null. Providing an allows you to mock up certain application paths. - /// For example, if you wanted to test that updates are working in a unit test, you could provide an instance of . - public UpdateManager(string urlOrPath, string channel = null, ILogger logger = null, ISquirrelLocator locator = null) + /// This should usually be left null. Providing an allows you to mock up certain application paths. + /// For example, if you wanted to test that updates are working in a unit test, you could provide an instance of . + public UpdateManager(string urlOrPath, string channel = null, ILogger logger = null, IVelopackLocator locator = null) : this(CreateSimpleSource(urlOrPath, channel, logger), logger, locator) { } @@ -67,9 +67,9 @@ namespace Squirrel /// The source describing where to search for updates. This can be a custom source, if you are integrating with some private resource, /// or it could be one of the predefined sources. (eg. or , etc). /// The logger to use for diagnostic messages. - /// This should usually be left null. Providing an allows you to mock up certain application paths. - /// For example, if you wanted to test that updates are working in a unit test, you could provide an instance of . - public UpdateManager(IUpdateSource source, ILogger logger = null, ISquirrelLocator locator = null) + /// This should usually be left null. Providing an allows you to mock up certain application paths. + /// For example, if you wanted to test that updates are working in a unit test, you could provide an instance of . + public UpdateManager(IUpdateSource source, ILogger logger = null, IVelopackLocator locator = null) : this(logger, locator) { if (source == null) { @@ -78,10 +78,10 @@ namespace Squirrel Source = source; } - internal UpdateManager(ILogger logger, ISquirrelLocator locator) + internal UpdateManager(ILogger logger, IVelopackLocator locator) { Log = logger ?? NullLogger.Instance; - Locator = locator ?? SquirrelLocator.GetDefault(Log); + Locator = locator ?? VelopackLocator.GetDefault(Log); } /// @@ -227,7 +227,7 @@ namespace Squirrel } } catch (Exception ex) { Log.Warn(ex, "Unable to apply delta updates, falling back to full update."); - if (SquirrelRuntimeInfo.InUnitTestRunner) { + if (VelopackRuntimeInfo.InUnitTestRunner) { throw; } } diff --git a/src/Velopack/SquirrelApp.cs b/src/Velopack/VelopackApp.cs similarity index 85% rename from src/Velopack/SquirrelApp.cs rename to src/Velopack/VelopackApp.cs index 1674eaf8..5b0d8de6 100644 --- a/src/Velopack/SquirrelApp.cs +++ b/src/Velopack/VelopackApp.cs @@ -8,47 +8,47 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using NuGet.Versioning; -using Squirrel.Locators; +using Velopack.Locators; -namespace Squirrel +namespace Velopack { /// - /// A delegate type for handling Squirrel startup events + /// A delegate type for handling Velopack startup events /// /// The currently executing version of this application - public delegate void SquirrelHook(SemanticVersion version); + public delegate void VelopackHook(SemanticVersion version); /// - /// SquirrelApp helps you to handle Squirrel app activation events correctly. + /// VelopackApp helps you to handle app activation events correctly. /// This should be used as early as possible in your application startup code. /// (eg. the beginning of Main() in Program.cs) /// - public sealed class SquirrelApp + public sealed class VelopackApp { - ISquirrelLocator _locator; - SquirrelHook _install; - SquirrelHook _update; - SquirrelHook _obsolete; - SquirrelHook _uninstall; - SquirrelHook _firstrun; - SquirrelHook _restarted; + IVelopackLocator _locator; + VelopackHook _install; + VelopackHook _update; + VelopackHook _obsolete; + VelopackHook _uninstall; + VelopackHook _firstrun; + VelopackHook _restarted; string[] _args; bool _autoApply = true; - private SquirrelApp() + private VelopackApp() { } /// /// Creates and returns a new Squirrel application builder. /// - public static SquirrelApp Build() => new SquirrelApp(); + public static VelopackApp Build() => new VelopackApp(); /// /// Override the command line arguments used to determine the Squirrel hook to run. /// If this is not set, the command line arguments passed to the application will be used. /// - public SquirrelApp SetArgs(string[] args) + public VelopackApp SetArgs(string[] args) { _args = args; return this; @@ -57,16 +57,16 @@ namespace Squirrel /// /// Set whether to automatically apply downloaded updates on startup. This is ON by default. /// - public SquirrelApp SetAutoApplyOnStartup(bool autoApply) + public VelopackApp SetAutoApplyOnStartup(bool autoApply) { _autoApply = autoApply; return this; } /// - /// Override the default used to search for application paths. + /// Override the default used to search for application paths. /// - public SquirrelApp SetLocator(ISquirrelLocator locator) + public VelopackApp SetLocator(IVelopackLocator locator) { _locator = locator; return this; @@ -75,7 +75,7 @@ namespace Squirrel /// /// This hook is triggered when the application is started for the first time after installation. /// - public SquirrelApp WithFirstRun(SquirrelHook hook) + public VelopackApp WithFirstRun(VelopackHook hook) { _firstrun = hook; return this; @@ -84,7 +84,7 @@ namespace Squirrel /// /// This hook is triggered when the application is restarted by Squirrel after installing updates. /// - public SquirrelApp WithRestarted(SquirrelHook hook) + public VelopackApp WithRestarted(VelopackHook hook) { _restarted = hook; return this; @@ -97,7 +97,7 @@ namespace Squirrel /// Only supported on windows; On other operating systems, this will never be called. /// [SupportedOSPlatform("windows")] - public SquirrelApp WithAfterInstallFastCallback(SquirrelHook hook) + public VelopackApp WithAfterInstallFastCallback(VelopackHook hook) { _install = hook; return this; @@ -110,7 +110,7 @@ namespace Squirrel /// Only supported on windows; On other operating systems, this will never be called. /// [SupportedOSPlatform("windows")] - public SquirrelApp WithAfterUpdateFastCallback(SquirrelHook hook) + public VelopackApp WithAfterUpdateFastCallback(VelopackHook hook) { _update = hook; return this; @@ -123,7 +123,7 @@ namespace Squirrel /// Only supported on windows; On other operating systems, this will never be called. /// [SupportedOSPlatform("windows")] - public SquirrelApp WithBeforeUpdateFastCallback(SquirrelHook hook) + public VelopackApp WithBeforeUpdateFastCallback(VelopackHook hook) { _obsolete = hook; return this; @@ -136,7 +136,7 @@ namespace Squirrel /// Only supported on windows; On other operating systems, this will never be called. /// [SupportedOSPlatform("windows")] - public SquirrelApp WithBeforeUninstallFastCallback(SquirrelHook hook) + public VelopackApp WithBeforeUninstallFastCallback(VelopackHook hook) { _uninstall = hook; return this; @@ -150,11 +150,11 @@ namespace Squirrel { var args = _args ?? Environment.GetCommandLineArgs().Skip(1).ToArray(); var log = logger ?? NullLogger.Instance; - var locator = _locator ?? SquirrelLocator.GetDefault(log); + var locator = _locator ?? VelopackLocator.GetDefault(log); // internal hook run by the Squirrel tooling to check everything is working if (args.Length >= 1 && args[0].Equals("--squirrel-version", StringComparison.OrdinalIgnoreCase)) { - Console.WriteLine(SquirrelRuntimeInfo.SquirrelNugetVersion); + Console.WriteLine(VelopackRuntimeInfo.SquirrelNugetVersion); Exit(0); return; } @@ -162,7 +162,7 @@ namespace Squirrel log.Info("Starting Squirrel App (Run)."); // first, we run any fast exit hooks - SquirrelHook defaultBlock = ((v) => { }); + VelopackHook defaultBlock = ((v) => { }); var fastExitlookup = new[] { new { Key = "--squirrel-install", Value = _install ?? defaultBlock }, new { Key = "--squirrel-updated", Value = _update ?? defaultBlock }, @@ -236,7 +236,7 @@ namespace Squirrel private void Exit(int code) { - if (!SquirrelRuntimeInfo.InUnitTestRunner) { + if (!VelopackRuntimeInfo.InUnitTestRunner) { Environment.Exit(code); } } diff --git a/src/Velopack/SquirrelRuntimeInfo.cs b/src/Velopack/VelopackRuntimeInfo.cs similarity index 99% rename from src/Velopack/SquirrelRuntimeInfo.cs rename to src/Velopack/VelopackRuntimeInfo.cs index f224e757..07406591 100644 --- a/src/Velopack/SquirrelRuntimeInfo.cs +++ b/src/Velopack/VelopackRuntimeInfo.cs @@ -38,7 +38,7 @@ namespace System.Runtime.CompilerServices } #endif -namespace Squirrel +namespace Velopack { // constants from winnt.h /// The Runtime CPU Architecture @@ -77,7 +77,7 @@ namespace Squirrel /// Convenience class which provides runtime information about the current executing process, /// in a way that is safe in older and newer versions of the framework. /// - public static class SquirrelRuntimeInfo + public static class VelopackRuntimeInfo { /// The current compiled Squirrel display version. public static string SquirrelDisplayVersion { get; } @@ -128,7 +128,7 @@ namespace Squirrel public static StringComparison PathStringComparison => IsWindows ? StringComparison.InvariantCultureIgnoreCase : StringComparison.InvariantCulture; - static SquirrelRuntimeInfo() + static VelopackRuntimeInfo() { EntryExePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName; BaseDirectory = AppContext.BaseDirectory; diff --git a/src/Velopack/Windows/RuntimeInfo.cs b/src/Velopack/Windows/RuntimeInfo.cs index fea9cac7..539f6194 100644 --- a/src/Velopack/Windows/RuntimeInfo.cs +++ b/src/Velopack/Windows/RuntimeInfo.cs @@ -10,9 +10,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Win32; using NuGet.Versioning; -using Squirrel.Sources; +using Velopack.Sources; -namespace Squirrel.Windows +namespace Velopack.Windows { public static partial class Runtimes { @@ -226,15 +226,15 @@ namespace Squirrel.Windows // TODO use IsWindowsVersionOrGreater function to verify it can be installed on this machine // arm64 windows supports everything - if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.arm64) + if (VelopackRuntimeInfo.SystemArch == RuntimeCpu.arm64) return Task.FromResult(true); // if the desired architecture is same as system - if (SquirrelRuntimeInfo.SystemArch == CpuArchitecture) + if (VelopackRuntimeInfo.SystemArch == CpuArchitecture) return Task.FromResult(true); // x64 also supports x86 - if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86) + if (VelopackRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86) return Task.FromResult(true); return Task.FromResult(false); @@ -258,7 +258,7 @@ namespace Squirrel.Windows [SupportedOSPlatform("windows")] private static string GetDotnetBaseDir(RuntimeCpu runtime) { - var system = SquirrelRuntimeInfo.SystemArch; + var system = VelopackRuntimeInfo.SystemArch; var pf86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86); if (runtime == RuntimeCpu.x86) @@ -464,15 +464,15 @@ namespace Squirrel.Windows // TODO use IsWindowsVersionOrGreater function to verify it can be installed on this machine // arm64 windows supports everything - if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.arm64) + if (VelopackRuntimeInfo.SystemArch == RuntimeCpu.arm64) return Task.FromResult(true); // if the desired architecture is same as system - if (SquirrelRuntimeInfo.SystemArch == CpuArchitecture) + if (VelopackRuntimeInfo.SystemArch == CpuArchitecture) return Task.FromResult(true); // x64 also supports x86 - if (SquirrelRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86) + if (VelopackRuntimeInfo.SystemArch == RuntimeCpu.x64 && CpuArchitecture == RuntimeCpu.x86) return Task.FromResult(true); return Task.FromResult(false); diff --git a/src/Velopack/Windows/Runtimes.cs b/src/Velopack/Windows/Runtimes.cs index 13584189..51087d6c 100644 --- a/src/Velopack/Windows/Runtimes.cs +++ b/src/Velopack/Windows/Runtimes.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Runtime.Versioning; using NuGet.Versioning; -namespace Squirrel.Windows +namespace Velopack.Windows { /// /// Contains static properties to access common supported runtimes, and a function to search for a runtime by name diff --git a/src/Velopack/Windows/ShellLink.cs b/src/Velopack/Windows/ShellLink.cs index 3b77b5d1..288be2e9 100644 --- a/src/Velopack/Windows/ShellLink.cs +++ b/src/Velopack/Windows/ShellLink.cs @@ -7,7 +7,7 @@ using System.Text; // All of this code is from http://vbaccelerator.com/home/NET/Code/Libraries/Shell_Projects/Creating_and_Modifying_Shortcuts/article.asp -namespace Squirrel.Windows +namespace Velopack.Windows { /// /// Summary description for ShellLink. diff --git a/src/Velopack/Windows/Shortcuts.cs b/src/Velopack/Windows/Shortcuts.cs index ed2125c5..b2941c43 100644 --- a/src/Velopack/Windows/Shortcuts.cs +++ b/src/Velopack/Windows/Shortcuts.cs @@ -5,10 +5,10 @@ using System.IO; using System.Linq; using System.Runtime.Versioning; using Microsoft.Extensions.Logging; -using Squirrel.Locators; -using Squirrel.NuGet; +using Velopack.Locators; +using Velopack.NuGet; -namespace Squirrel.Windows +namespace Velopack.Windows { /// /// Specifies several common places where shortcuts can be installed on a user's system @@ -52,10 +52,10 @@ namespace Squirrel.Windows protected ILogger Log { get; } /// Locator to use for finding important application paths - protected ISquirrelLocator Locator { get; } + protected IVelopackLocator Locator { get; } /// - public Shortcuts(ILogger logger, ISquirrelLocator locator) + public Shortcuts(ILogger logger, IVelopackLocator locator) { Log = logger; Locator = locator; diff --git a/test/TestApp/Program.cs b/test/TestApp/Program.cs index 6f7c705a..a64da1e7 100644 --- a/test/TestApp/Program.cs +++ b/test/TestApp/Program.cs @@ -1,14 +1,14 @@ #pragma warning disable CA1416 // Validate platform compatibility using System.Diagnostics; using System.Reflection.Metadata; -using Squirrel; -using Squirrel.Locators; +using Velopack; +using Velopack.Locators; try { bool shouldExit = false; bool shouldAutoUpdate = args.Any(a => a.Equals("--autoupdate", StringComparison.OrdinalIgnoreCase)); - SquirrelApp.Build() + VelopackApp.Build() .SetAutoApplyOnStartup(shouldAutoUpdate) .WithFirstRun((v) => { debugFile("firstrun", v.ToString()); @@ -36,7 +36,7 @@ try { } if (args.Length == 1 && args[0] == "version") { - var locator = SquirrelLocator.GetDefault(new ConsoleLogger()); + var locator = VelopackLocator.GetDefault(new ConsoleLogger()); Console.WriteLine(locator.CurrentlyInstalledVersion?.ToString() ?? "unknown_version"); return 0; } diff --git a/test/Velopack.CommandLine.Tests/BaseCommandTests.cs b/test/Velopack.CommandLine.Tests/BaseCommandTests.cs index 5f5d68d7..91d08dc7 100644 --- a/test/Velopack.CommandLine.Tests/BaseCommandTests.cs +++ b/test/Velopack.CommandLine.Tests/BaseCommandTests.cs @@ -1,6 +1,6 @@ -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.CommandLine.Tests; +namespace Velopack.CommandLine.Tests; public abstract class BaseCommandTests : TempFileTestBase where T : BaseCommand, new() diff --git a/test/Velopack.CommandLine.Tests/Commands/GitHubCommandTests.cs b/test/Velopack.CommandLine.Tests/Commands/GitHubCommandTests.cs index e901ab53..274fbbbf 100644 --- a/test/Velopack.CommandLine.Tests/Commands/GitHubCommandTests.cs +++ b/test/Velopack.CommandLine.Tests/Commands/GitHubCommandTests.cs @@ -1,7 +1,7 @@ using System.CommandLine; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.CommandLine.Tests.Commands; +namespace Velopack.CommandLine.Tests.Commands; public abstract class GitHubCommandTests : BaseCommandTests where T : GitHubBaseCommand, new() diff --git a/test/Velopack.CommandLine.Tests/Commands/HttpDownloadCommandTests.cs b/test/Velopack.CommandLine.Tests/Commands/HttpDownloadCommandTests.cs index 878bb798..5948b007 100644 --- a/test/Velopack.CommandLine.Tests/Commands/HttpDownloadCommandTests.cs +++ b/test/Velopack.CommandLine.Tests/Commands/HttpDownloadCommandTests.cs @@ -1,8 +1,8 @@  using System.CommandLine; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.CommandLine.Tests.Commands; +namespace Velopack.CommandLine.Tests.Commands; public class HttpDownloadCommandTests : BaseCommandTests { diff --git a/test/Velopack.CommandLine.Tests/Commands/S3CommandTests.cs b/test/Velopack.CommandLine.Tests/Commands/S3CommandTests.cs index 9d90e5df..0ea16620 100644 --- a/test/Velopack.CommandLine.Tests/Commands/S3CommandTests.cs +++ b/test/Velopack.CommandLine.Tests/Commands/S3CommandTests.cs @@ -1,7 +1,7 @@ using System.CommandLine; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.CommandLine.Tests.Commands; +namespace Velopack.CommandLine.Tests.Commands; public abstract class S3CommandTests : BaseCommandTests where T : S3BaseCommand, new() diff --git a/test/Velopack.CommandLine.Tests/Commands/WindowsCommandTests.cs b/test/Velopack.CommandLine.Tests/Commands/WindowsCommandTests.cs index 8ae57a4b..ec6cdc01 100644 --- a/test/Velopack.CommandLine.Tests/Commands/WindowsCommandTests.cs +++ b/test/Velopack.CommandLine.Tests/Commands/WindowsCommandTests.cs @@ -1,8 +1,8 @@  using System.CommandLine; -using Squirrel.Csq.Commands; +using Velopack.Vpk.Commands; -namespace Squirrel.CommandLine.Tests.Commands; +namespace Velopack.CommandLine.Tests.Commands; public abstract class ReleaseCommandTests : BaseCommandTests where T : WindowsReleasifyCommand, new() diff --git a/test/Velopack.CommandLine.Tests/TempFileTestBase.cs b/test/Velopack.CommandLine.Tests/TempFileTestBase.cs index 8b0918df..8cf8ac38 100644 --- a/test/Velopack.CommandLine.Tests/TempFileTestBase.cs +++ b/test/Velopack.CommandLine.Tests/TempFileTestBase.cs @@ -1,7 +1,7 @@ using System.Threading; using Xunit.Sdk; -namespace Squirrel.CommandLine.Tests; +namespace Velopack.CommandLine.Tests; public abstract class TempFileTestBase : IDisposable { diff --git a/test/Velopack.CommandLine.Tests/WindowsOnlyFact.cs b/test/Velopack.CommandLine.Tests/WindowsOnlyFact.cs index 28b03e72..c300e633 100644 --- a/test/Velopack.CommandLine.Tests/WindowsOnlyFact.cs +++ b/test/Velopack.CommandLine.Tests/WindowsOnlyFact.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Squirrel.CommandLine.Tests; +namespace Velopack.CommandLine.Tests; public class WindowsOnlyFactAttribute : FactAttribute { diff --git a/test/Velopack.CommandLine.Tests/WindowsOnlyTheoryAttribute.cs b/test/Velopack.CommandLine.Tests/WindowsOnlyTheoryAttribute.cs index 0a3a5bf4..cb162050 100644 --- a/test/Velopack.CommandLine.Tests/WindowsOnlyTheoryAttribute.cs +++ b/test/Velopack.CommandLine.Tests/WindowsOnlyTheoryAttribute.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Squirrel.CommandLine.Tests; +namespace Velopack.CommandLine.Tests; public class WindowsOnlyTheoryAttribute : TheoryAttribute { diff --git a/test/Velopack.Packaging.Tests/Init.cs b/test/Velopack.Packaging.Tests/Init.cs index 1ffad5dc..99417436 100644 --- a/test/Velopack.Packaging.Tests/Init.cs +++ b/test/Velopack.Packaging.Tests/Init.cs @@ -1,12 +1,12 @@ using System.IO; using System.Reflection; -using Squirrel.Packaging; +using Velopack.Packaging; using Xunit.Abstractions; using Xunit.Sdk; [assembly: TestFramework("Squirrel.Packaging.Tests.TestsInit", "Squirrel.Packaging.Tests")] -namespace Squirrel.Packaging.Tests +namespace Velopack.Packaging.Tests { public class TestsInit : XunitTestFramework { diff --git a/test/Velopack.Packaging.Tests/WindowsPackTests.cs b/test/Velopack.Packaging.Tests/WindowsPackTests.cs index 0cb26dda..b220db04 100644 --- a/test/Velopack.Packaging.Tests/WindowsPackTests.cs +++ b/test/Velopack.Packaging.Tests/WindowsPackTests.cs @@ -10,11 +10,11 @@ using System.Xml.Linq; using Microsoft.Extensions.Logging; using Microsoft.Win32; using NuGet.Packaging; -using Squirrel.Compression; -using Squirrel.Packaging; -using Squirrel.Packaging.Windows.Commands; +using Velopack.Compression; +using Velopack.Packaging; +using Velopack.Packaging.Windows.Commands; -namespace Squirrel.Packaging.Tests; +namespace Velopack.Packaging.Tests; [SupportedOSPlatform("windows")] public class WindowsPackTests @@ -29,7 +29,7 @@ public class WindowsPackTests [SkippableFact] public void PackBuildValidPackageMostOptions() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); @@ -94,7 +94,7 @@ public class WindowsPackTests [SkippableFact] public void PackBuildMultipleChannels() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); @@ -159,7 +159,7 @@ public class WindowsPackTests [SkippableFact] public void PackBuildRefuseChannelMultipleRids() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); @@ -197,7 +197,7 @@ public class WindowsPackTests [SkippableFact] public void PackBuildsPackageWhichIsInstallable() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); @@ -269,7 +269,7 @@ public class WindowsPackTests [SkippableFact] public void TestAppAutoUpdatesWhenLocalIsAvailable() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); using var _1 = Utility.GetTempDirectory(out var releaseDir); using var _2 = Utility.GetTempDirectory(out var installDir); @@ -304,7 +304,7 @@ public class WindowsPackTests [SkippableFact] public void TestAllApplicationHooks() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); using var _1 = Utility.GetTempDirectory(out var releaseDir); using var _2 = Utility.GetTempDirectory(out var installDir); @@ -353,7 +353,7 @@ public class WindowsPackTests [SkippableFact] public void TestPackedAppCanDeltaUpdateToLatest() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); using var logger = _output.BuildLoggerFor(); using var _1 = Utility.GetTempDirectory(out var releaseDir); using var _2 = Utility.GetTempDirectory(out var installDir); diff --git a/test/Velopack.Tests/ContentTypeTests.cs b/test/Velopack.Tests/ContentTypeTests.cs index ef498354..76331341 100644 --- a/test/Velopack.Tests/ContentTypeTests.cs +++ b/test/Velopack.Tests/ContentTypeTests.cs @@ -4,12 +4,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml; -using Squirrel; -using Squirrel.NuGet; -using Squirrel.Tests.TestHelpers; +using Velopack; +using Velopack.NuGet; +using Velopack.Tests.TestHelpers; using Xunit; -namespace Squirrel.Tests +namespace Velopack.Tests { public class ContentTypeTests { diff --git a/test/Velopack.Tests/OldSquirrel/ReleaseEntry.cs b/test/Velopack.Tests/OldSquirrel/ReleaseEntry.cs index 24115d19..195b1094 100644 --- a/test/Velopack.Tests/OldSquirrel/ReleaseEntry.cs +++ b/test/Velopack.Tests/OldSquirrel/ReleaseEntry.cs @@ -10,7 +10,7 @@ using System.Runtime.Serialization; using System.Threading.Tasks; using System.Collections.Concurrent; -namespace Squirrel.Tests.OldSquirrel +namespace Velopack.Tests.OldSquirrel { [DataContract] public class ReleaseEntry diff --git a/test/Velopack.Tests/OldSquirrel/ReleaseExtensions.cs b/test/Velopack.Tests/OldSquirrel/ReleaseExtensions.cs index 76baebd6..2335f5c7 100644 --- a/test/Velopack.Tests/OldSquirrel/ReleaseExtensions.cs +++ b/test/Velopack.Tests/OldSquirrel/ReleaseExtensions.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -namespace Squirrel.Tests.OldSquirrel +namespace Velopack.Tests.OldSquirrel { public static class VersionExtensions { diff --git a/test/Velopack.Tests/OldSquirrel/SemanticVersion.cs b/test/Velopack.Tests/OldSquirrel/SemanticVersion.cs index 7454106e..ed6a277a 100644 --- a/test/Velopack.Tests/OldSquirrel/SemanticVersion.cs +++ b/test/Velopack.Tests/OldSquirrel/SemanticVersion.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Globalization; using System.Text.RegularExpressions; -namespace Squirrel.Tests.OldSquirrel +namespace Velopack.Tests.OldSquirrel { /// /// A hybrid implementation of SemVer that supports semantic versioning as described at http://semver.org while not strictly enforcing it to diff --git a/test/Velopack.Tests/OldSquirrel/Utility.cs b/test/Velopack.Tests/OldSquirrel/Utility.cs index 637ea0a7..cf73b259 100644 --- a/test/Velopack.Tests/OldSquirrel/Utility.cs +++ b/test/Velopack.Tests/OldSquirrel/Utility.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Tests.OldSquirrel +namespace Velopack.Tests.OldSquirrel { internal static class Utility { diff --git a/test/Velopack.Tests/ReleaseEntryTests.cs b/test/Velopack.Tests/ReleaseEntryTests.cs index a3d1bc32..110a557e 100644 --- a/test/Velopack.Tests/ReleaseEntryTests.cs +++ b/test/Velopack.Tests/ReleaseEntryTests.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using NuGet.Versioning; -using Squirrel.Tests.TestHelpers; +using Velopack.Tests.TestHelpers; using Xunit; -using OldReleaseEntry = Squirrel.Tests.OldSquirrel.ReleaseEntry; -using OldSemanticVersion = Squirrel.Tests.OldSquirrel.SemanticVersion; +using OldReleaseEntry = Velopack.Tests.OldSquirrel.ReleaseEntry; +using OldSemanticVersion = Velopack.Tests.OldSquirrel.SemanticVersion; -namespace Squirrel.Tests +namespace Velopack.Tests { public class ReleaseEntryTests { diff --git a/test/Velopack.Tests/RuntimeTests.cs b/test/Velopack.Tests/RuntimeTests.cs index 9d98db6a..ad13650d 100644 --- a/test/Velopack.Tests/RuntimeTests.cs +++ b/test/Velopack.Tests/RuntimeTests.cs @@ -2,9 +2,9 @@ using System.Net.Http; using System.Threading.Tasks; using Xunit; -using Squirrel.Windows; +using Velopack.Windows; -namespace Squirrel.Tests +namespace Velopack.Tests { public class RuntimeTests { diff --git a/test/Velopack.Tests/TestHelpers/AssertExtensions.cs b/test/Velopack.Tests/TestHelpers/AssertExtensions.cs index e507fef2..30ecfe2d 100644 --- a/test/Velopack.Tests/TestHelpers/AssertExtensions.cs +++ b/test/Velopack.Tests/TestHelpers/AssertExtensions.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.IO; using Xunit; -namespace Squirrel.Tests.TestHelpers +namespace Velopack.Tests.TestHelpers { public static class AssertExtensions { diff --git a/test/Velopack.Tests/TestHelpers/ExposedClass.cs b/test/Velopack.Tests/TestHelpers/ExposedClass.cs index 055dae5d..2e02a6d1 100644 --- a/test/Velopack.Tests/TestHelpers/ExposedClass.cs +++ b/test/Velopack.Tests/TestHelpers/ExposedClass.cs @@ -6,7 +6,7 @@ using System.Reflection; // Lovingly stolen from http://exposedobject.codeplex.com/ -namespace Squirrel.Tests.TestHelpers +namespace Velopack.Tests.TestHelpers { public class ExposedClass : DynamicObject { diff --git a/test/Velopack.Tests/TestHelpers/ExposedObject.cs b/test/Velopack.Tests/TestHelpers/ExposedObject.cs index 13496151..49420527 100644 --- a/test/Velopack.Tests/TestHelpers/ExposedObject.cs +++ b/test/Velopack.Tests/TestHelpers/ExposedObject.cs @@ -7,7 +7,7 @@ using System.Reflection; // Lovingly stolen from http://exposedobject.codeplex.com/ -namespace Squirrel.Tests.TestHelpers +namespace Velopack.Tests.TestHelpers { public class ExposedObject : DynamicObject { diff --git a/test/Velopack.Tests/TestHelpers/ExposedObjectHelper.cs b/test/Velopack.Tests/TestHelpers/ExposedObjectHelper.cs index 36e82e37..8ad02824 100644 --- a/test/Velopack.Tests/TestHelpers/ExposedObjectHelper.cs +++ b/test/Velopack.Tests/TestHelpers/ExposedObjectHelper.cs @@ -6,7 +6,7 @@ using System.Dynamic; // Lovingly stolen from http://exposedobject.codeplex.com/ -namespace Squirrel.Tests.TestHelpers +namespace Velopack.Tests.TestHelpers { internal class ExposedObjectHelper { diff --git a/test/Velopack.Tests/TestHelpers/FakeDownloader.cs b/test/Velopack.Tests/TestHelpers/FakeDownloader.cs index 4a2d7b9e..3679a017 100644 --- a/test/Velopack.Tests/TestHelpers/FakeDownloader.cs +++ b/test/Velopack.Tests/TestHelpers/FakeDownloader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Tests +namespace Velopack.Tests { public class FakeDownloader : Sources.IFileDownloader { diff --git a/test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs b/test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs index 701a83b8..954e4498 100644 --- a/test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs +++ b/test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Squirrel.Tests.TestHelpers +namespace Velopack.Tests.TestHelpers { internal class FakeFixtureRepository : Sources.IFileDownloader { diff --git a/test/Velopack.Tests/TestHelpers/StaticHttpServer.cs b/test/Velopack.Tests/TestHelpers/StaticHttpServer.cs index b622ae00..88f9635e 100644 --- a/test/Velopack.Tests/TestHelpers/StaticHttpServer.cs +++ b/test/Velopack.Tests/TestHelpers/StaticHttpServer.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace Squirrel.Tests +namespace Velopack.Tests { public sealed class StaticHttpServer : IDisposable { diff --git a/test/Velopack.Tests/UpdateManagerTests.cs b/test/Velopack.Tests/UpdateManagerTests.cs index 28abe2e6..19149c59 100644 --- a/test/Velopack.Tests/UpdateManagerTests.cs +++ b/test/Velopack.Tests/UpdateManagerTests.cs @@ -6,11 +6,11 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using NuGet.Versioning; -using Squirrel.Locators; -using Squirrel.Sources; -using Squirrel.Tests.TestHelpers; +using Velopack.Locators; +using Velopack.Sources; +using Velopack.Tests.TestHelpers; -namespace Squirrel.Tests +namespace Velopack.Tests { public class UpdateManagerTests { @@ -30,7 +30,7 @@ namespace Squirrel.Tests 3a2eadd15dd984e4559f2b4d790ec8badaeb6a39 MyCoolApp-1.1.0.nupkg 1040561 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """); - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var um = new UpdateManager(tempPath, null, logger, locator); var info = um.CheckForUpdates(); Assert.NotNull(info); @@ -47,7 +47,7 @@ namespace Squirrel.Tests 3a2eadd15dd984e4559f2b4d790ec8badaeb6a39 MyCoolApp-1.1.0.nupkg 1040561 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """); - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var um = new UpdateManager(tempPath, "osx-x64", logger, locator); var info = um.CheckForUpdates(); Assert.NotNull(info); @@ -65,7 +65,7 @@ namespace Squirrel.Tests 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """; var downloader = new FakeDownloader() { MockedResponseBytes = Encoding.UTF8.GetBytes(releases) }; - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var um = new UpdateManager(new SimpleWebSource("http://any.com", "hello", downloader, logger), logger, locator); var info = um.CheckForUpdates(); Assert.NotNull(info); @@ -86,7 +86,7 @@ namespace Squirrel.Tests 14db31d2647c6d2284882a2e101924a9c409ee67 MyCoolApp-1.1.0-delta.nupkg 80396 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """); - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var um = new UpdateManager(tempPath, null, logger, locator); var info = um.CheckForUpdates(); Assert.NotNull(info); @@ -100,7 +100,7 @@ namespace Squirrel.Tests // https://github.com/caesay/SquirrelCustomLauncherTestApp using var logger = _output.BuildLoggerFor(); using var _1 = Utility.GetTempDirectory(out var tempPath); - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var source = new GithubSource("https://github.com/caesay/SquirrelCustomLauncherTestApp", null, false); var um = new UpdateManager(source, logger, locator); var info = um.CheckForUpdates(); @@ -115,7 +115,7 @@ namespace Squirrel.Tests // https://github.com/caesay/SquirrelCustomLauncherTestApp using var logger = _output.BuildLoggerFor(); using var _1 = Utility.GetTempDirectory(out var tempPath); - var locator = new TestSquirrelLocator("MyCoolApp", "1.0.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger); var source = new GithubSource("https://github.com/caesay/SquirrelCustomLauncherTestApp", null, false, "hello"); var um = new UpdateManager(source, logger, locator); Assert.Throws(() => um.CheckForUpdates()); @@ -130,7 +130,7 @@ namespace Squirrel.Tests 3a2eadd15dd984e4559f2b4d790ec8badaeb6a39 MyCoolApp-1.1.0.nupkg 1040561 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """); - var locator = new TestSquirrelLocator("MyCoolApp", "1.1.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.1.0", tempPath, logger); var um = new UpdateManager(tempPath, null, logger, locator); var info = um.CheckForUpdates(); Assert.Null(info); @@ -145,7 +145,7 @@ namespace Squirrel.Tests 3a2eadd15dd984e4559f2b4d790ec8badaeb6a39 MyCoolApp-1.1.0.nupkg 1040561 94689fede03fed7ab59c24337673a27837f0c3ec MyCoolApp-1.0.0.nupkg 1004502 """); - var locator = new TestSquirrelLocator("MyCoolApp", "1.2.0", tempPath, logger); + var locator = new TestVelopackLocator("MyCoolApp", "1.2.0", tempPath, logger); var um = new UpdateManager(tempPath, null, logger, locator); var info = um.CheckForUpdates(); Assert.Null(info); @@ -160,7 +160,7 @@ namespace Squirrel.Tests using var _1 = Utility.GetTempDirectory(out var packagesDir); var repo = new FakeFixtureRepository(id, false); var source = new SimpleWebSource("http://any.com", null, repo, logger); - var locator = new TestSquirrelLocator(id, "1.0.0", packagesDir, logger); + var locator = new TestVelopackLocator(id, "1.0.0", packagesDir, logger); var um = new UpdateManager(source, logger, locator); var info = um.CheckForUpdates(); @@ -190,7 +190,7 @@ namespace Squirrel.Tests var basePkgPath = Path.Combine(packagesDir, basePkg.OriginalFilename); File.Copy(basePkgFixturePath, basePkgPath); - var locator = new TestSquirrelLocator(id, fromVersion, + var locator = new TestVelopackLocator(id, fromVersion, packagesDir, null, null, PathHelper.GetRustAsset("update.exe"), logger); var um = new UpdateManager(source, logger, locator); diff --git a/test/Velopack.Tests/UtilityTests.cs b/test/Velopack.Tests/UtilityTests.cs index 6c259793..34175006 100644 --- a/test/Velopack.Tests/UtilityTests.cs +++ b/test/Velopack.Tests/UtilityTests.cs @@ -4,16 +4,16 @@ using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; -using Squirrel; -using Squirrel.Tests.TestHelpers; +using Velopack; +using Velopack.Tests.TestHelpers; using Xunit; -using Squirrel.Windows; +using Velopack.Windows; using System.Collections.Generic; using Xunit.Abstractions; using System.Threading.Tasks; using System.Runtime.Versioning; -namespace Squirrel.Tests +namespace Velopack.Tests { public class UtilityTests { @@ -33,7 +33,7 @@ namespace Squirrel.Tests [InlineData("C:/AnApp/file/", "C:\\AnApp\\file")] public void PathIsNormalized(string input, string expected) { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); var exp = Path.GetFullPath(expected); var normal = Utility.NormalizePath(input); Assert.Equal(exp, normal); @@ -51,7 +51,7 @@ namespace Squirrel.Tests [InlineData("AnAppThree", "AnAppThree\\file.exe", true)] public void FileIsInDirectory(string directory, string file, bool isIn) { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); var fileInDir = Utility.IsFileInDirectory(file, directory); Assert.Equal(isIn, fileInDir); } @@ -60,7 +60,7 @@ namespace Squirrel.Tests [SupportedOSPlatform("windows")] public void SetAppIdOnShortcutTest() { - Skip.IfNot(SquirrelRuntimeInfo.IsWindows); + Skip.IfNot(VelopackRuntimeInfo.IsWindows); var sl = new ShellLink() { Target = @"C:\Windows\Notepad.exe", Description = "It's Notepad", diff --git a/test/Velopack.Tests/ZipPackageTests.cs b/test/Velopack.Tests/ZipPackageTests.cs index eaa6f69e..c240435f 100644 --- a/test/Velopack.Tests/ZipPackageTests.cs +++ b/test/Velopack.Tests/ZipPackageTests.cs @@ -6,12 +6,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using NuGet.Versioning; -using Squirrel.NuGet; -using Squirrel.Tests.TestHelpers; +using Velopack.NuGet; +using Velopack.Tests.TestHelpers; using Xunit; -using ZipPackage = Squirrel.NuGet.ZipPackage; +using ZipPackage = Velopack.NuGet.ZipPackage; -namespace Squirrel.Tests +namespace Velopack.Tests { public class ZipPackageTests {