Rename classes and namespaces

This commit is contained in:
Caelan Sayler
2023-12-31 11:09:44 +00:00
parent eff71d9b3f
commit 1d20f014d6
132 changed files with 454 additions and 479 deletions

View File

@@ -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;
}

View File

@@ -1,6 +1,6 @@
using Squirrel.Csq.Commands;
using Velopack.Vpk.Commands;
namespace Squirrel.CommandLine.Tests;
namespace Velopack.CommandLine.Tests;
public abstract class BaseCommandTests<T> : TempFileTestBase
where T : BaseCommand, new()

View File

@@ -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<T> : BaseCommandTests<T>
where T : GitHubBaseCommand, new()

View File

@@ -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<HttpDownloadCommand>
{

View File

@@ -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<T> : BaseCommandTests<T>
where T : S3BaseCommand, new()

View File

@@ -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<T> : BaseCommandTests<T>
where T : WindowsReleasifyCommand, new()

View File

@@ -1,7 +1,7 @@
using System.Threading;
using Xunit.Sdk;
namespace Squirrel.CommandLine.Tests;
namespace Velopack.CommandLine.Tests;
public abstract class TempFileTestBase : IDisposable
{

View File

@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
namespace Squirrel.CommandLine.Tests;
namespace Velopack.CommandLine.Tests;
public class WindowsOnlyFactAttribute : FactAttribute
{

View File

@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
namespace Squirrel.CommandLine.Tests;
namespace Velopack.CommandLine.Tests;
public class WindowsOnlyTheoryAttribute : TheoryAttribute
{

View File

@@ -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
{

View File

@@ -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<WindowsPackTests>();
@@ -94,7 +94,7 @@ public class WindowsPackTests
[SkippableFact]
public void PackBuildMultipleChannels()
{
Skip.IfNot(SquirrelRuntimeInfo.IsWindows);
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
@@ -159,7 +159,7 @@ public class WindowsPackTests
[SkippableFact]
public void PackBuildRefuseChannelMultipleRids()
{
Skip.IfNot(SquirrelRuntimeInfo.IsWindows);
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
@@ -197,7 +197,7 @@ public class WindowsPackTests
[SkippableFact]
public void PackBuildsPackageWhichIsInstallable()
{
Skip.IfNot(SquirrelRuntimeInfo.IsWindows);
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
@@ -269,7 +269,7 @@ public class WindowsPackTests
[SkippableFact]
public void TestAppAutoUpdatesWhenLocalIsAvailable()
{
Skip.IfNot(SquirrelRuntimeInfo.IsWindows);
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
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<WindowsPackTests>();
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<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var installDir);

View File

@@ -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
{

View File

@@ -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

View File

@@ -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
{

View File

@@ -4,7 +4,7 @@ using System.ComponentModel;
using System.Globalization;
using System.Text.RegularExpressions;
namespace Squirrel.Tests.OldSquirrel
namespace Velopack.Tests.OldSquirrel
{
/// <summary>
/// A hybrid implementation of SemVer that supports semantic versioning as described at http://semver.org while not strictly enforcing it to

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -4,7 +4,7 @@ using System.Globalization;
using System.IO;
using Xunit;
namespace Squirrel.Tests.TestHelpers
namespace Velopack.Tests.TestHelpers
{
public static class AssertExtensions
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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<UpdateManagerTests>();
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<UpdateManagerTests>();
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<ArgumentException>(() => 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);

View File

@@ -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",

View File

@@ -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
{