From cedb12266d2228870bd205983653924e5cc91c04 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Fri, 8 Aug 2014 13:01:25 +0200 Subject: [PATCH] Rename classes to get rid of naming conflict --- Squirrel.sln | 1 + src/Squirrel/IUpdateManager.cs | 2 +- src/Squirrel/UpdateManager.ApplyReleases.cs | 9 ++------- src/Squirrel/UpdateManager.CheckForUpdates.cs | 4 ++-- src/Squirrel/UpdateManager.DownloadReleases.cs | 4 ++-- src/Squirrel/UpdateManager.cs | 8 ++++---- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Squirrel.sln b/Squirrel.sln index 1f2218f8..31b35dc5 100644 --- a/Squirrel.sln +++ b/Squirrel.sln @@ -34,6 +34,7 @@ Global {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU {98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|Any CPU.Build.0 = Release|Any CPU {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.ActiveCfg = CIBuild|Win32 + {C1D40624-A484-438A-B846-052F321C89D1}.CIBuild|Any CPU.Build.0 = CIBuild|Win32 {C1D40624-A484-438A-B846-052F321C89D1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C1D40624-A484-438A-B846-052F321C89D1}.Debug|Any CPU.Build.0 = Debug|Win32 {C1D40624-A484-438A-B846-052F321C89D1}.Release|Any CPU.ActiveCfg = Release|Win32 diff --git a/src/Squirrel/IUpdateManager.cs b/src/Squirrel/IUpdateManager.cs index e7878ac6..b64368c6 100644 --- a/src/Squirrel/IUpdateManager.cs +++ b/src/Squirrel/IUpdateManager.cs @@ -48,7 +48,7 @@ namespace Squirrel /// Completely uninstalls the targeted app /// /// Completion - async Task FullUninstall(); + Task FullUninstall(); } public static class EasyModeMixin diff --git a/src/Squirrel/UpdateManager.ApplyReleases.cs b/src/Squirrel/UpdateManager.ApplyReleases.cs index 1b6003ce..04b41c0f 100644 --- a/src/Squirrel/UpdateManager.ApplyReleases.cs +++ b/src/Squirrel/UpdateManager.ApplyReleases.cs @@ -13,14 +13,14 @@ namespace Squirrel { public sealed partial class UpdateManager { - class ApplyReleases : IEnableLogger + class ApplyReleasesImpl : IEnableLogger { // TODO: Kill this entire concept readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45; readonly string rootAppDirectory; - public ApplyReleases(string rootAppDirectory) + public ApplyReleasesImpl(string rootAppDirectory) { this.rootAppDirectory = rootAppDirectory; } @@ -331,11 +331,6 @@ namespace Squirrel .ToArray(); } - static string getLocalAppDataDirectory() - { - return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); - } - DirectoryInfo getDirectoryForRelease(Version releaseVersion) { return new DirectoryInfo(Path.Combine(rootAppDirectory, "app-" + releaseVersion)); diff --git a/src/Squirrel/UpdateManager.CheckForUpdates.cs b/src/Squirrel/UpdateManager.CheckForUpdates.cs index b18128f7..e47e7276 100644 --- a/src/Squirrel/UpdateManager.CheckForUpdates.cs +++ b/src/Squirrel/UpdateManager.CheckForUpdates.cs @@ -11,14 +11,14 @@ namespace Squirrel { public sealed partial class UpdateManager { - class CheckForUpdates : IEnableLogger + class CheckForUpdateImpl : IEnableLogger { readonly string rootAppDirectory; // TODO: rip this out readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45; - public CheckForUpdates(string rootAppDirectory) + public CheckForUpdateImpl(string rootAppDirectory) { this.rootAppDirectory = rootAppDirectory; } diff --git a/src/Squirrel/UpdateManager.DownloadReleases.cs b/src/Squirrel/UpdateManager.DownloadReleases.cs index 679bc927..023cbdaf 100644 --- a/src/Squirrel/UpdateManager.DownloadReleases.cs +++ b/src/Squirrel/UpdateManager.DownloadReleases.cs @@ -10,11 +10,11 @@ namespace Squirrel { public sealed partial class UpdateManager { - class DownloadReleases : IEnableLogger + class DownloadReleasesImpl : IEnableLogger { readonly string rootAppDirectory; - public DownloadReleases(string rootAppDirectory) + public DownloadReleasesImpl(string rootAppDirectory) { this.rootAppDirectory = rootAppDirectory; } diff --git a/src/Squirrel/UpdateManager.cs b/src/Squirrel/UpdateManager.cs index 6054e319..575b20fc 100644 --- a/src/Squirrel/UpdateManager.cs +++ b/src/Squirrel/UpdateManager.cs @@ -43,7 +43,7 @@ namespace Squirrel public async Task CheckForUpdate(bool ignoreDeltaUpdates, Action progress = null) { - var checkForUpdate = new CheckForUpdates(rootAppDirectory); + var checkForUpdate = new CheckForUpdateImpl(rootAppDirectory); await acquireUpdateLock(); return await checkForUpdate.CheckForUpdate(Utility.LocalReleaseFileForAppDir(rootAppDirectory), updateUrlOrPath, ignoreDeltaUpdates, progress, urlDownloader); @@ -51,7 +51,7 @@ namespace Squirrel public async Task DownloadReleases(IEnumerable releasesToDownload, Action progress = null) { - var downloadReleases = new DownloadReleases(rootAppDirectory); + var downloadReleases = new DownloadReleasesImpl(rootAppDirectory); await acquireUpdateLock(); await downloadReleases.DownloadReleases(updateUrlOrPath, releasesToDownload, progress, urlDownloader); @@ -59,7 +59,7 @@ namespace Squirrel public async Task ApplyReleases(UpdateInfo updateInfo, Action progress = null) { - var applyReleases = new ApplyReleases(rootAppDirectory); + var applyReleases = new ApplyReleasesImpl(rootAppDirectory); await acquireUpdateLock(); await applyReleases.ApplyReleases(updateInfo, progress); @@ -67,7 +67,7 @@ namespace Squirrel public async Task FullUninstall() { - var applyReleases = new ApplyReleases(rootAppDirectory); + var applyReleases = new ApplyReleasesImpl(rootAppDirectory); await acquireUpdateLock(); await applyReleases.FullUninstall();